Permalink
Browse files

Updating Form Factor theme

  • Loading branch information...
1 parent 7242f7f commit 011ed9fda0fa404aa47301808a53a0e131b4ed49 Patrick Malley committed Apr 27, 2010
View
102 theme/formfactor/config.php
@@ -8,7 +8,7 @@
////////////////////////////////////////////////////
-$THEME->parents = array('base');
+$THEME->parents = array('base', 'canvas');
/////////////////////////////////////////////////////
// Which existing theme(s) in the /theme/ directory
@@ -21,7 +21,7 @@
////////////////////////////////////////////////////
-$THEME->sheets = array('pagelayout', 'core', 'selected');
+$THEME->sheets = array('core', 'course', 'selected');
////////////////////////////////////////////////////
// Name of the stylesheet(s) you've including in
@@ -43,6 +43,104 @@
// body of the editor.
////////////////////////////////////////////////////
+$THEME->layouts = array(
+ 'base' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'general.php',
+ 'regions' => array('side-pre', 'side-post'),
+ 'defaultregion' => 'side-post',
+ ),
+ 'general' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'general.php',
+ 'regions' => array('side-pre', 'side-post'),
+ 'defaultregion' => 'side-post',
+ ),
+ 'course' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'general.php',
+ 'regions' => array('side-pre', 'side-post'),
+ 'defaultregion' => 'side-post'
+ ),
+ 'coursecategory' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'general.php',
+ 'regions' => array('side-pre', 'side-post'),
+ 'defaultregion' => 'side-post',
+ ),
+ 'incourse' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'general.php',
+ 'regions' => array('side-pre', 'side-post'),
+ 'defaultregion' => 'side-post',
+ ),
+ 'frontpage' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'frontpage.php',
+ 'regions' => array('side-pre', 'side-post'),
+ 'defaultregion' => 'side-post',
+ ),
+ 'admin' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'general.php',
+ 'regions' => array('side-pre'),
+ 'defaultregion' => 'side-pre',
+ ),
+ 'mydashboard' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'general.php',
+ 'regions' => array('side-pre', 'side-post'),
+ 'defaultregion' => 'side-post',
+ 'options' => array('langmenu'=>true),
+ ),
+ 'mypublic' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'general.php',
+ 'regions' => array('side-pre', 'side-post'),
+ 'defaultregion' => 'side-post',
+ ),
+ 'login' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'general.php',
+ 'regions' => array(),
+ 'options' => array('langmenu'=>true),
+ ),
+ 'popup' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'general.php',
+ 'regions' => array(),
+ 'options' => array('nofooter'=>true),
+ ),
+ 'frametop' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'general.php',
+ 'regions' => array(),
+ 'options' => array('nofooter'=>true),
+ ),
+ 'maintenance' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'general.php',
+ 'regions' => array(),
+ 'options' => array('nofooter'=>true, 'nonavbar'=>true),
+ ),
+ 'embedded' => array(
+ 'theme' => 'formfactor',
+ 'file' => 'embedded.php',
+ 'regions' => array(),
+ 'options' => array('nofooter'=>true, 'nonavbar'=>true),
+ ),
+
+);
+
+///////////////////////////////////////////////////////////////
+// These are all of the possible layouts in Moodle. The
+// simplest way to do this is to keep the theme and file
+// variables the same for every layout. Including them
+// all in this way allows some flexibility down the road
+// if you want to add a different layout template to a
+// specific page.
+///////////////////////////////////////////////////////////////
+
// $THEME->csspostprocess
////////////////////////////////////////////////////
View
68 theme/formfactor/style/core.css
@@ -1,53 +1,5 @@
-/* Text Elements
---------------------------*/
-
-body { font-size: 85%; line-height:1.4;}
-
body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; }
-h1,h2,h3,h4,h5,h6 { font-weight: bold; }
-
-h1 { font-size: 2.25em; line-height: 1; margin-bottom: 0.5em; }
-h2 { font-size: 1.75em; margin-bottom: 0.5em; }
-h3 { font-size: 1.5em; line-height: 1; margin-bottom: 1em; }
-h4 { font-size: 1.2em; line-height: 1.25; margin-bottom: 1em; }
-h5 { font-size: 1em; margin-bottom: 1.5em; }
-h6 { font-size: 1em; }
-
-p { margin: 0 0 1em; }
-
-ul, ol { margin: 0 1.5em 1.5em 1.5em; }
-ul { list-style-type: circle; }
-ol { list-style-type: decimal; }
-
-dl { margin: 0 0 1.5em 0; }
-dl dt { font-weight: bold; }
-dl dd { margin-left: 1.5em; }
-
-abbr, acronym { border-bottom: 1px dotted #000; }
-address { margin-top: 1.5em; font-style: italic; }
-del { color: #000; }
-
-a { text-decoration: none; }
-
-blockquote { margin: 1.5em; }
-strong { font-weight: bold; }
-em, dfn { font-style: italic; }
-dfn { font-weight: bold; }
-pre, code { margin: 1.5em 0; white-space: pre; }
-pre, code, tt { font: 1.2em monospace; line-height: 1.5; }
-tt { display: block; margin: 1.5em 0; line-height: 1.5; }
-
-.small { font-size: .8em; margin-bottom: 1.875em; line-height: 1.875em; }
-.large { font-size: 1.25em; line-height:1.5em; margin-bottom: 1em; }
-.quiet { color: #999; }
-
-.hide { display: none; }
-.highlight { background: #ffc; }
-
-.top { margin-top: 0; padding-top: 0; }
-.bottom { margin-bottom: 0; padding-bottom: 0; }
-
/* Header
-------------------------*/
@@ -69,13 +21,25 @@ tt { display: block; margin: 1.5em 0; line-height: 1.5; }
/* Content
---------------------------*/
-#page-content-wrapper { margin:0 4%; }
+#page-content-wrapper { margin:10px 4%; }
/* Sideblocks
---------------------------*/
.sideblock { border-width:1px 0 0;border-color:#ccc;border-style:solid;background:url([[pix:theme|gradient-sb]]) repeat-x 0 0;}
-.sideblock .header { padding:3px 10px; }
+.sideblock .header { border-width:0 1px;border-style:solid;border-color:#eee;;padding:3px 10px; }
.sideblock .header h2 { color:#333;font-size:1.2em; }
-.sideblock .content { padding:5px 10px; }
-.block_login { border:1px solid #ccc;background:#fcffc8; }
+.sideblock .content { padding:5px 10px;border-color:#eee;border-width:0 1px 1px;border-style:solid; }
+.block_login { border:1px solid #ccc;background:#fcffc8; }
+
+/* Forum
+---------------------------*/
+
+.forumpost { border:none; }
+.forumpost .left { background:none; }
+.forumpost .topic { background:#eee;border-color:#aaa;border-width:0 0 2px 0;padding-left:7px; }
+.forumpost .topic .subject { font-size:1.25em; }
+.forumpost .topic .author { font-style:italic;color:#444;font-size:0.95em; }
+.forumpost .content { border-bottom:5px solid #aaa;padding:5px 7px 10px 7px; }
+.forumpost .content .commands,
+.forumpost .content .link { font-size:0.9em; }
View
6 theme/formfactor/style/course.css
@@ -0,0 +1,6 @@
+.coursebox { border-color:#ddd;border-width:0 0 1px;border-style:solid; }
+.coursebox .name { font-size:1.1em; }
+.coursebox .teachers { margin:0 0 0 0.75em; }
+
+.categorybox { border:none; }
+.categorybox .categorylist td { padding:2px; }
View
3 theme/formfactor/style/selected.css
@@ -1,12 +1,15 @@
a:link,
a:visited { color: #bf3503; }
+
a:hover,
a:active { color:#3f5c10; }
#page-header { background:#333 url([[pix:theme|header]]) 0 0;color:#fff; }
#page-navigation { background:#bf3503; }
+
#page-navigation a:link,
#page-navigation a:visited { color:#fff; }
+
#page-navigation a:hover,
#page-navigation a:active { background:#922803; }

0 comments on commit 011ed9f

Please sign in to comment.