Skip to content

Commit

Permalink
MDL-31269 theme_magazine: fixes login pagelayout in theme_magazine
Browse files Browse the repository at this point in the history
  • Loading branch information
Mary Evans authored and Sam Hemelryk committed Jan 23, 2012
1 parent 8772dd9 commit a141bd9
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 63 deletions.
36 changes: 13 additions & 23 deletions theme/magazine/config.php
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
// the directory in which this file resides. // the directory in which this file resides.
//////////////////////////////////////////////////// ////////////////////////////////////////////////////


$THEME->parents = array('canvas','base');


$THEME->parents = array('base','canvas');
$THEME->parents_exclude_sheets = array('base'=>array('pagelayout'),'canvas'=>array('pagelayout') );
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
// Which existing theme(s) in the /theme/ directory // Which existing theme(s) in the /theme/ directory
// do you want this theme to extend. A theme can // do you want this theme to extend. A theme can
Expand All @@ -22,14 +21,19 @@
// changes you want to your theme. // changes you want to your theme.
//////////////////////////////////////////////////// ////////////////////////////////////////////////////



$THEME->sheets = array('layout','core','colors','css3'); $THEME->sheets = array('layout','core','colors','css3');


//////////////////////////////////////////////////// ////////////////////////////////////////////////////
// Name of the stylesheet(s) you've including in // Name of the stylesheet(s) you've including in
// this theme's /styles/ directory. // this theme's /styles/ directory.
//////////////////////////////////////////////////// ////////////////////////////////////////////////////


$THEME->parents_exclude_sheets = array('base'=>array('pagelayout'),'canvas'=>array('pagelayout') );

////////////////////////////////////////////////////
// An array of stylesheets not to inherit from the
// themes parents
////////////////////////////////////////////////////


$THEME->enable_dock = true; $THEME->enable_dock = true;


Expand Down Expand Up @@ -137,7 +141,8 @@
// if you want to add a different layout template to a // if you want to add a different layout template to a
// specific page. // specific page.
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
//$THEME->csspostprocess = 'simplespace_process_css';
$THEME->csspostprocess = 'magazine_process_css';


//////////////////////////////////////////////////// ////////////////////////////////////////////////////
// Allows the user to provide the name of a function // Allows the user to provide the name of a function
Expand All @@ -159,39 +164,26 @@
// As above but will be included in the page footer. // As above but will be included in the page footer.
//////////////////////////////////////////////////// ////////////////////////////////////////////////////


//$THEME->larrow = "&#60"; // $THEME->larrow = "&#60";


//////////////////////////////////////////////////// ////////////////////////////////////////////////////
// Overrides the left arrow image used throughout // Overrides the left arrow image used throughout
// Moodle // Moodle
//////////////////////////////////////////////////// ////////////////////////////////////////////////////


//$THEME->rarrow = "&#62"; // $THEME->rarrow = "&#62";


//////////////////////////////////////////////////// ////////////////////////////////////////////////////
// Overrides the right arrow image used throughout Moodle // Overrides the right arrow image used throughout Moodle
//////////////////////////////////////////////////// ////////////////////////////////////////////////////


// $THEME->layouts

////////////////////////////////////////////////////
// An array setting the layouts for the theme
////////////////////////////////////////////////////

// $THEME->parents_exclude_javascripts // $THEME->parents_exclude_javascripts


//////////////////////////////////////////////////// ////////////////////////////////////////////////////
// An array of JavaScript files NOT to inherit from // An array of JavaScript files NOT to inherit from
// the themes parents // the themes parents
//////////////////////////////////////////////////// ////////////////////////////////////////////////////


// $THEME->parents_exclude_sheets

////////////////////////////////////////////////////
// An array of stylesheets not to inherit from the
// themes parents
////////////////////////////////////////////////////

// $THEME->plugins_exclude_sheets // $THEME->plugins_exclude_sheets


//////////////////////////////////////////////////// ////////////////////////////////////////////////////
Expand All @@ -200,10 +192,8 @@
//////////////////////////////////////////////////// ////////////////////////////////////////////////////


// $THEME->rendererfactory // $THEME->rendererfactory
//$THEME->rendererfactory = 'theme_simplespace_renderer_factory';
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
// Sets a custom render factory to use with the // Sets a custom render factory to use with the
// theme, used when working with custom renderers. // theme, used when working with custom renderers.
//////////////////////////////////////////////////// ////////////////////////////////////////////////////

$THEME->csspostprocess = 'magazine_process_css';
7 changes: 3 additions & 4 deletions theme/magazine/style/colors.css
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ html a:hover,body a:hover {
/** header and dock, default #002f2f and #092323 **/ /** header and dock, default #002f2f and #092323 **/


#page-header, #dock { #page-header, #dock {
background: [[setting:maincolor]]; background-color: [[setting:maincolor]];
border-bottom: 1px solid [[setting:maincoloraccent]]; border-bottom: 1px solid [[setting:maincoloraccent]];
} }


Expand All @@ -40,8 +40,8 @@ td.category.number, .yui-module.yui-overlay.yui-panel div.hd, #navigation li a:l
} }


div.dockedtitle { div.dockedtitle {
border-bottom: 1px solid [[setting:maincoloraccent]] !important;
border-top: 1px solid #333333 !important; border-top: 1px solid #333333 !important;
border-bottom: 1px solid [[setting:maincoloraccent]] !important;
} }


/** main headings and forum post subject default color #4e0000 **/ /** main headings and forum post subject default color #4e0000 **/
Expand All @@ -59,10 +59,9 @@ div.dockedtitle {
/** table header background color, default is #002f2f **/ /** table header background color, default is #002f2f **/


td.maincalendar table.calendartable th, table.rolecap .header,.generaltable .header,.forumheaderlist .header,.files .header,.editcourse .header,.logtable .header,#attempts .header,table#categoryquestions th { td.maincalendar table.calendartable th, table.rolecap .header,.generaltable .header,.forumheaderlist .header,.files .header,.editcourse .header,.logtable .header,#attempts .header,table#categoryquestions th {
background: [[setting:maincolor]] !important; background-color: [[setting:maincolor]] !important;
} }



/** dock item hover, default is #4e0000 **/ /** dock item hover, default is #4e0000 **/


div.dockeditem_container div.dockeditem:hover { div.dockeditem_container div.dockeditem:hover {
Expand Down
39 changes: 3 additions & 36 deletions theme/magazine/style/core.css
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -17,15 +17,11 @@ div.yui3-widget-bd a, .tabtree li a, .block div.content a, .unlist a, .categoryb
} }


a:active { a:active {
outline: 0; outline: 0; /* for browsers that understand */

/* for browsers that understand */
} }


a:focus { a:focus {
outline: 0; outline: 0; /* for browsers that understand */

/* for browsers that understand */
} }


/**header divs **/ /**header divs **/
Expand Down Expand Up @@ -870,7 +866,7 @@ div.categorybox {


td.category.name a { td.category.name a {
padding-left: 20px; padding-left: 20px;
background-image: url([[pix:theme|jcourse]]) no-repeat 0 50%; background: url([[pix:theme|jcourse]]) no-repeat 0 50%;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;
} }
Expand Down Expand Up @@ -1119,35 +1115,6 @@ div.course-content div.availabilityinfo {
margin-bottom: 10px; margin-bottom: 10px;
} }


/** login form **/

.twocolumns div.loginpanel {
border-right: 1px dashed #dadada !important;
}

div.forgetpass {
clear: both;
}

div.loginform {
width: 50% !important;
}

div.loginform div.form-input input {
width: 90px !important;
}

div.loginform label {
line-height: 20px;
}

div.signuppanel {
float: right !important;
width: 40% !important;
margin-left: 0px;
padding-left: 0px;
}

div.singlebutton.forumaddnew { div.singlebutton.forumaddnew {
text-align: center; text-align: center;
} }
Expand Down

0 comments on commit a141bd9

Please sign in to comment.