Merge branch 'MDL-40314_M26' of git://github.com/lazydaisy/moodle

This commit is contained in:
Eloy Lafuente (stronk7)
2013-07-02 19:41:44 +02:00
10 changed files with 298 additions and 246 deletions
+8 -84
View File
@@ -49,22 +49,26 @@ $THEME->parents = array('canvas','base');
////////////////////////////////////////////////////
$THEME->sheets = array('selected', 'core', 'course', 'mods', 'blocks');
$THEME->sheets = array(
'selected',
'core',
'course',
'mods',
'blocks'
);
////////////////////////////////////////////////////
// Name of the stylesheet(s) you've including in
// this theme's /styles/ directory.
////////////////////////////////////////////////////
$THEME->enable_dock = false;
////////////////////////////////////////////////////
// Do you want to use the new navigation dock?
////////////////////////////////////////////////////
// $THEME->editor_sheets = array('editor');
$THEME->editor_sheets = array('editor');
////////////////////////////////////////////////////
// An array of stylesheets to include within the
@@ -151,83 +155,3 @@ $THEME->layouts = array(
),
);
///////////////////////////////////////////////////////////////
// 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
////////////////////////////////////////////////////
// Allows the user to provide the name of a function
// that all CSS should be passed to before being
// delivered.
////////////////////////////////////////////////////
// $THEME->javascripts
////////////////////////////////////////////////////
// An array containing the names of JavaScript files
// located in /javascript/ to include in the theme.
// (gets included in the head)
////////////////////////////////////////////////////
// $THEME->javascripts_footer
////////////////////////////////////////////////////
// As above but will be included in the page footer.
////////////////////////////////////////////////////
// $THEME->larrow
////////////////////////////////////////////////////
// Overrides the left arrow image used throughout
// Moodle
////////////////////////////////////////////////////
// $THEME->rarrow
////////////////////////////////////////////////////
// Overrides the right arrow image used throughout Moodle
////////////////////////////////////////////////////
// $THEME->layouts
////////////////////////////////////////////////////
// An array setting the layouts for the theme
////////////////////////////////////////////////////
// $THEME->parents_exclude_javascripts
////////////////////////////////////////////////////
// An array of JavaScript files NOT to inherit from
// the themes parents
////////////////////////////////////////////////////
// $THEME->parents_exclude_sheets
////////////////////////////////////////////////////
// An array of stylesheets not to inherit from the
// themes parents
////////////////////////////////////////////////////
// $THEME->plugins_exclude_sheets
////////////////////////////////////////////////////
// An array of plugin sheets to ignore and not
// include.
////////////////////////////////////////////////////
// $THEME->rendererfactory
////////////////////////////////////////////////////
// Sets a custom render factory to use with the
// theme, used when working with custom renderers.
////////////////////////////////////////////////////
$THEME->editor_sheets = array('editor');
@@ -25,4 +25,4 @@
$string['pluginname'] = 'FormFactor';
$string['region-side-post'] = 'Right';
$string['region-side-pre'] = 'Left';
$string['choosereadme'] = '<div class="clearfix"><div class="theme_screenshot"><h2>FormFactor</h2><img src="formfactor/pix/screenshot.jpg" /><h3>Theme Discussion Forum:</h3><p><a href="http://moodle.org/mod/forum/view.php?id=46">http://moodle.org/mod/forum/view.php?id=46</a></p><h3>Theme Credits</h3><p><a href="http://docs.moodle.org/en/Theme_credits">http://docs.moodle.org/en/Theme_credits</a></p><h3>Theme Documentation:</h3><p><a href="http://docs.moodle.org/en/Themes">http://docs.moodle.org/en/Themes</a></p><h3>Report a bug:</h3><p><a href="http://tracker.moodle.org">http://tracker.moodle.org</a></p></div><div class="theme_description"><h2>About</h2><p>FormFactor is a fluid-width, three-column theme for Moodle 2.0 that was created by Patrick Malley.<h2>Tweaks</h2><p>This theme is built upon both Base and Canvas, two parent themes included in the Moodle core. If you want to modify this theme, we recommend that you first duplicate it then rename it before making your changes. This will prevent your customized theme from being overwritten by future Moodle upgrades, and you\'ll still have the original files if you make a mess. More information on modifying themes can be found in the <a href="http://docs.moodle.org/en/Theme">MoodleDocs</a>.</p><h2>Credits</h2> <p>This theme was coded and is maintained by Patrick Malley of NewSchool Learning. He can be contacted by email at [email protected]. </p><h2>License</h2><p>This, and all other themes included in the Moodle core, are licensed under the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>.</div></div>';
$string['choosereadme'] = '<div class="clearfix"><div class="theme_screenshot"><h2>FormFactor</h2><img src="formfactor/pix/screenshot.jpg" /><h3>Theme Discussion Forum:</h3><p><a href="http://moodle.org/mod/forum/view.php?id=46">http://moodle.org/mod/forum/view.php?id=46</a></p><h3>Theme Credits</h3><p><a href="http://docs.moodle.org/en/Theme_credits">http://docs.moodle.org/en/Theme_credits</a></p><h3>Theme Documentation:</h3><p><a href="http://docs.moodle.org/en/Themes">http://docs.moodle.org/en/Themes</a></p><h3>Report a bug:</h3><p><a href="http://tracker.moodle.org">http://tracker.moodle.org</a></p></div><div class="theme_description"><h2>About</h2><p>FormFactor is a fluid-width, three-column theme for Moodle 2.0 that was created by Patrick Malley.<h2>Tweaks</h2><p>This theme is built upon both Base and Canvas, two parent themes included in the Moodle core. If you want to modify this theme, we recommend that you first duplicate it then rename it before making your changes. This will prevent your customized theme from being overwritten by future Moodle upgrades, and you\'ll still have the original files if you make a mess. More information on modifying themes can be found in the <a href="http://docs.moodle.org/en/Theme">MoodleDocs</a>.</p><h2>Credits</h2> <p>This theme was coded and is maintained by Patrick Malley of NewSchool Learning. He can be contacted by email at [email protected]. </p><h2>License</h2><p>This, and all other themes included in the Moodle core, are licensed under the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>.</div></div>';
+1 -1
View File
@@ -20,4 +20,4 @@
</div>
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
</html>
</html>
+52 -14
View File
@@ -1,14 +1,52 @@
.block { border-width:1px 0 0;border-color:#ccc;border-style:solid;background:url([[pix:theme|gradient-sb]]) repeat-x 0 0;}
.block .header { border-width:0 1px;border-style:solid;border-color:#eee;;padding:3px 10px; }
.block .header h2 { color:#333;font-size:1.2em; }
.block .content { padding:5px 10px;border-color:#eee;border-width:0 1px 1px;border-style:solid; }
.block_login { border:1px solid #ccc;background:#fcffc8; }
.block_login label { font-size:0.85em;display:block; }
.block_login .fld input { margin:1px 0 5px;padding:2px;width:95%; }
.block_login .btn { padding:4px 0; }
.block_login .footer { font-size:0.9em;padding:5px 0 3px; }
.block_calendar_month .content { padding: 5px }
.block_course_summary .content { padding:10px; }
/* Blocks
-------------------------*/
.block {
border-width: 1px 0 0;
border-color: #ccc;
border-style: solid;
background-image: url([[pix:theme|gradient-sb]]);
background-repeat: repeat-x;
background-position: left top;
}
.block .header {
border-width: 0 1px;
border-style: solid;
border-color: #eee;
padding: 3px 10px;
}
.block .header h2 {
color: #333;
font-size: 1.2em;
}
.block .content {
padding: 5px 10px;
border-width: 0 1px 1px;
border-style:solid;
border-color: #eee;
}
.block_login {
border: 1px solid #ccc;
background-color: #fcffc8;
}
.block_login label {
font-size: 0.85em;
display: block;
}
.block_login .fld input {
margin: 1px 0 5px;
padding: 2px;
width: 95%;
}
.block_login .btn {
padding: 4px 0;
}
.block_login .footer {
font-size: 0.9em;
padding: 5px 0 3px;
}
.block_calendar_month .content {
padding: 5px
}
.block_course_summary .content {
padding: 10px;
}
+121 -80
View File
@@ -1,122 +1,163 @@
body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; }
/* Header
/* Core
-------------------------*/
#page-header-wrapper { margin:0 50px; }
#page-header { float:none; }
#page-header .headermain { margin:0.75em 0;font-size:2em; }
#page-header .headermenu a:hover { color:#fff; }
#page-site-index .headermain { margin:0.85em 0;font-size:2.5em; }
#course-header { margin:0 50px; }
/* Menu Navigation
--------------------------*/
#page-navigation { margin:0;padding:0 40px;font-size:1.1em; }
#page-navigation li { list-style:none;float:left; }
#page-navigation a { display:block;padding:5px 10px; }
/* Breadcrumb
---------------------------*/
.navbar { padding:3px 50px; }
.navbar .breadcrumb { font-size:0.8em;color:#555; }
/* Content
---------------------------*/
#page-content-wrapper { margin:10px 50px; }
/* Tabs
---------------------------*/
.tabtree .tabrow0 li.here a { background:#fff url([[pix:theme|gradient-sb]]) repeat-x 0 0; }
.tabtree .tabrow0 .tabrow1 li a {background: none !important;}
/* User
---------------------------*/
.userinfobox .content {border-width: 2px;background: url([[pix:theme|gradient-sb]]) repeat-x 0 0; }
/* Forms
------------------------*/
.mform fieldset {border-color: #ddd;}
.mform legend {border: 1px solid #ddd;padding: 2px 7px;background: url([[pix:theme|gradient-sb]]) repeat-x 0 -25%;}
.mform .btn-cancel { color: #BF3503; text-decoration: none; }
.mform .btn-cancel:hover, .mform .btn-cancel:focus { color: #3f5c10; text-decoration: none; }
/* Footer
--------------------------*/
#page-footer { margin:25px 0; }
#page-footer .logininfo { margin: 1em 0; }
#course-footer { margin:0 50px; }
/* custum menu */
#custommenu {
margin:0 50px;
body, h1, h2, h3, h4, h5, h6, p, ul, ol, dl, input, textarea {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}
/* Header
-------------------------*/
#page-header-wrapper {
margin: 0 50px;
}
#page-header {
float: none;
}
#page-header .headermain {
margin: 0.75em 0;
font-size: 2em;
}
#page-header .headermenu a:hover {
color: #fff;
}
#page-site-index .headermain {
margin: 0.85em 0;
font-size: 2.5em;
}
#course-header {
margin: 0 50px;
}
/* Page Navigation
--------------------------*/
#page-navigation {
margin: 0;
padding: 0 40px;
font-size: 1.1em;
}
#page-navigation li {
list-style: none;
float: left; }
#page-navigation a {
display: block;
padding: 5px 10px;
}
/* Breadcrumb
---------------------------*/
.navbar {
padding: 3px 50px;
}
.navbar .breadcrumb {
font-size: 0.8em;
color: #555;
}
/* Content
---------------------------*/
#page-content-wrapper {
margin: 10px 50px;
}
/* Tabs
---------------------------*/
.tabtree .tabrow0 li.here a {
background-color: #fff;
background-image: url([[pix:theme|gradient-sb]]);
background-repeat: repeat-x;
background-position: left top;
}
.tabtree .tabrow0 .tabrow1 li a {
background-image: none;
}
/* User
---------------------------*/
.userinfobox .content {
border-width: 2px;
background-image: url([[pix:theme|gradient-sb]]);
background-repeat: repeat-x;
background-position: left top;
}
/* Forms
------------------------*/
.mform fieldset {
border-color: #ddd;
}
.mform legend {
border: 1px solid #ddd;
padding: 2px 7px;
background-image: url([[pix:theme|gradient-sb]]);
background-repeat: repeat-x;
background-position: 0 -25%;
}
.mform .btn-cancel {
color: #bf3503;
text-decoration: none;
}
.mform .btn-cancel:hover,
.mform .btn-cancel:focus {
color: #3f5c10;
text-decoration: none;
}
/* Footer
--------------------------*/
#page-footer {
margin: 25px 0;
}
#page-footer .logininfo {
margin: 1em 0;
}
#course-footer {
margin: 0 50px;
}
/* Custum menu
-------------------------*/
#custommenu {
margin: 0 50px;
}
#custommenu,
#custommenu .yui3-menu,
#custommenu .yui3-menu-content {
border-width:0;
border-width: 0;
}
#custommenu {
background:url([[pix:theme|gradient-sb]]) repeat-x 0 30%;
background-image: url([[pix:theme|gradient-sb]]);
background-repeat: repeat-x;
background-position: 0 30%;
padding-top: 4px;
padding-bottom: 4px;
border-right: 1px solid #eee;
border-bottom: 1px solid #ccc;
border-left: 1px solid #eee;
border-right: 1px solid #eee;
}
#custommenu .yui3-menu-label,
#custommenu .yui3-menuitem-content {
border-width:0;
border-width: 0;
}
#custommenu .yui3-menu-content .yui3-menu-content {
border: 1px solid #ccc;
border-top-width: 0;
margin-top: 3px;
}
#custommenu .yui3-menu-content .yui3-menu-content .yui3-menu-content {
border-top: 1px solid #ccc;
}
#custommenu .yui3-menu-content .yui3-menu-content .yui3-menuitem-content,
#custommenu .yui3-menu-content .yui3-menu-content .yui3-menu-label {
padding-top: 5px;
}
#custommenu .yui3-menu-label,
#custommenu .yui3-menuitem-content {
color:#BF3503;
color: #bf3503;
}
#custommenu .yui3-menu .yui3-menuitem-active,
#custommenu .yui3-menu-label-menuvisible,
#custommenu .yui3-menu-label-active,
#custommenu .yui3-menuitem-active .yui3-menuitem-content {
background-color: #BF3503;
background-color: #bf3503;
}
#custommenu .yui3-menu-label-active,
#custommenu .yui3-menu-label-menuvisible,
#custommenu .yui3-menuitem-active .yui3-menuitem-content {
color:#FFF;
color: #fff;
}
#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content {
border-width:0;
border-width: 0;
}
+13 -3
View File
@@ -1,3 +1,13 @@
.path-course-view .course-content .section.main { background: #f5f5f5;border: 1px solid #ddd }
.course_category_tree .category > .info .name { line-height:1.4; font-size:1em;}
.coursebox.collapsed {border-bottom: none;}
/* Course
-------------------------*/
.path-course-view .course-content .section.main {
background-color: #f5f5f5;
border: 1px solid #ddd;
}
.course_category_tree .category > .info .name {
line-height: 1.4;
font-size: 1em;
}
.coursebox.collapsed {
border-bottom: 0 none;
}
+30 -11
View File
@@ -1,11 +1,30 @@
body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; }
.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; }
body, h1, h2, h3, h4, h5, h6, p, ul, ol, dl, input, textarea {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}
.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;
}
+36 -12
View File
@@ -1,19 +1,43 @@
/* Intro
-------------------------*/
#intro,
#pageintro { background:#f7f7f7; }
#pageintro {
background-color: #f7f7f7;
}
/* Forum
---------------------------*/
.path-mod-forum .forumheaderlist th {background: url([[pix:theme|gradient-sb]]) repeat-x 0 0}
.path-mod-forum .forumheaderlist .r1 td { background:#f5f5f5; }
.forumpost .topic { background:#eee;border-bottom:2px solid #AAA;padding-left:7px; }
.forumpost .topic .subject { font-size:1.25em; }
.forumpost .topic .author { font-style:italic;color:#444;font-size:0.95em; }
.forumpost .content .posting { padding:5px 7px 10px 7px; }
.forumpost .options { border-bottom:5px solid #aaa;}
/* Assignments
.path-mod-forum .forumheaderlist th {
background-image: url([[pix:theme|gradient-sb]]);
background-repeat: repeat-x;
background-position: left top;
}
.path-mod-forum .forumheaderlist .r1 td {
background-color: #f5f5f5;
}
.forumpost .topic {
background-color: #eee;
border-bottom: 2px solid #aaa;
padding-left: 7px;
}
.forumpost .topic .subject {
font-size: 1.25em;
}
.forumpost .topic .author {
font-style: italic;
color: #444;
font-size: 0.95em;
}
.forumpost .content .posting {
padding: 5px 7px 10px 7px;
}
.forumpost .options {
border-bottom: 5px solid #aaa;
}
/* Assignments
--------------------------*/
.path-mod-assignment #dates table .c0 { background:#f5f5f5; }
.path-mod-assignment #dates table .c0 {
background-color: #f5f5f5;
}
+14 -28
View File
@@ -5,53 +5,39 @@
|-----------------------------------------------------------------------------------*/
#page-content #region-main-box {
left: 210px; /* Width of left sideblock */
left: 210px; /* Width of left sideblock */
}
#page-content #region-main-box #region-post-box {
margin-left: -420px; /* Twice width of left sideblock */
padding-top: 5px;
margin-left: -420px; /* Twice width of left sideblock */
padding-top: 5px;
}
#page-content #region-main-box #region-post-box #region-main-wrap #region-main {
margin-left: 420px; /* Twice width of left sideblock */
padding: 0 15px; /* Padding around middle column */
margin-left: 420px; /* Twice width of left sideblock */
padding: 0 15px; /* Padding around middle column */
}
#page-content #region-main-box #region-post-box #region-pre {
left: 210px; /* Width of left sideblock */
width: 210px; /* Width of left sideblock */
left: 210px; /* Width of left sideblock */
width: 210px; /* Width of left sideblock */
}
#page-content #region-main-box #region-post-box #region-post {
width: 210px; /* Width of right sideblock */
width: 210px; /* Width of right sideblock */
}
#page-content #region-main-box .region-content {
padding: 0;
padding: 0;
}
/** Only side pre **/
.side-pre-only #page-content #region-main-box #region-post-box {
margin-left: -210px;
margin-left: -210px;
}
.side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
margin-left: 210px;
margin-left: 210px;
}
/** Only side post **/
/** Only side post **/
.side-post-only #page-content #region-main-box #region-post-box {
margin-left: -210px;
margin-left: -210px;
}
.side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
margin-left: 210px;
margin-left: 210px;
}
.has_dock.side-post-only .page-middle #region-main-box #region-post-box #region-main-wrap #region-main {
margin-left: 210px;
}
+22 -12
View File
@@ -1,19 +1,29 @@
a:link,
a:visited { color: #bf3503; }
a:visited {
color: #bf3503;
}
a:hover,
a:active { color:#3f5c10; }
#page-header { background:#333 url([[pix:theme|header]]) 0 0;color:#fff; }
a:active {
color: #3f5c10;
}
#page-header {
background-color: #333;
background-image: url([[pix:theme|header]]);
color: #fff; }
.path-course-view .course-content .section.main.current,
#page-navigation { background:#bf3503 }
#page-navigation {
background-color: #bf3503
}
#page-navigation a:link,
#page-navigation a:visited,
.path-course-view .course-content .current .left { color:#fff; }
.path-course-view .course-content .current .left {
color: #fff;
}
#page-navigation a:hover,
#page-navigation a:active { background:#922803; }
.path-course-view .section .content { background: #fff; }
#page-navigation a:active {
background-color: #922803;
}
.path-course-view .section .content {
background-color: #fff;
}