diff --git a/theme/magazine/config.php b/theme/magazine/config.php index 99b27cf6f05..cc138f2f770 100644 --- a/theme/magazine/config.php +++ b/theme/magazine/config.php @@ -9,9 +9,8 @@ $THEME->name = 'magazine'; // 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 // do you want this theme to extend. A theme can @@ -22,7 +21,6 @@ $THEME->parents_exclude_sheets = array('base'=>array('pagelayout'),'canvas'=>arr // changes you want to your theme. //////////////////////////////////////////////////// - $THEME->sheets = array('layout','core','colors','css3'); //////////////////////////////////////////////////// @@ -30,6 +28,12 @@ $THEME->sheets = array('layout','core','colors','css3'); // 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; @@ -137,7 +141,8 @@ $THEME->layouts = array( // if you want to add a different layout template to a // specific page. /////////////////////////////////////////////////////////////// -//$THEME->csspostprocess = 'simplespace_process_css'; + +$THEME->csspostprocess = 'magazine_process_css'; //////////////////////////////////////////////////// // Allows the user to provide the name of a function @@ -159,25 +164,19 @@ $THEME->layouts = array( // As above but will be included in the page footer. //////////////////////////////////////////////////// -//$THEME->larrow = "<"; +// $THEME->larrow = "<"; //////////////////////////////////////////////////// // Overrides the left arrow image used throughout // Moodle //////////////////////////////////////////////////// - //$THEME->rarrow = ">"; +// $THEME->rarrow = ">"; //////////////////////////////////////////////////// // Overrides the right arrow image used throughout Moodle //////////////////////////////////////////////////// -// $THEME->layouts - -//////////////////////////////////////////////////// -// An array setting the layouts for the theme -//////////////////////////////////////////////////// - // $THEME->parents_exclude_javascripts //////////////////////////////////////////////////// @@ -185,13 +184,6 @@ $THEME->layouts = array( // the themes parents //////////////////////////////////////////////////// -// $THEME->parents_exclude_sheets - -//////////////////////////////////////////////////// -// An array of stylesheets not to inherit from the -// themes parents -//////////////////////////////////////////////////// - // $THEME->plugins_exclude_sheets //////////////////////////////////////////////////// @@ -200,10 +192,8 @@ $THEME->layouts = array( //////////////////////////////////////////////////// // $THEME->rendererfactory -//$THEME->rendererfactory = 'theme_simplespace_renderer_factory'; + //////////////////////////////////////////////////// // Sets a custom render factory to use with the // theme, used when working with custom renderers. -//////////////////////////////////////////////////// - -$THEME->csspostprocess = 'magazine_process_css'; \ No newline at end of file +//////////////////////////////////////////////////// \ No newline at end of file diff --git a/theme/magazine/style/colors.css b/theme/magazine/style/colors.css index ee1f866729b..c26efa969fe 100644 --- a/theme/magazine/style/colors.css +++ b/theme/magazine/style/colors.css @@ -15,7 +15,7 @@ html a:hover,body a:hover { /** header and dock, default #002f2f and #092323 **/ #page-header, #dock { - background: [[setting:maincolor]]; + background-color: [[setting:maincolor]]; border-bottom: 1px solid [[setting:maincoloraccent]]; } @@ -40,8 +40,8 @@ td.category.number, .yui-module.yui-overlay.yui-panel div.hd, #navigation li a:l } div.dockedtitle { - border-bottom: 1px solid [[setting:maincoloraccent]] !important; border-top: 1px solid #333333 !important; + border-bottom: 1px solid [[setting:maincoloraccent]] !important; } /** main headings and forum post subject default color #4e0000 **/ @@ -59,10 +59,9 @@ div.dockedtitle { /** 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 { - background: [[setting:maincolor]] !important; + background-color: [[setting:maincolor]] !important; } - /** dock item hover, default is #4e0000 **/ div.dockeditem_container div.dockeditem:hover { diff --git a/theme/magazine/style/core.css b/theme/magazine/style/core.css index 322a18e4c74..a617287ccfc 100644 --- a/theme/magazine/style/core.css +++ b/theme/magazine/style/core.css @@ -17,15 +17,11 @@ div.yui3-widget-bd a, .tabtree li a, .block div.content a, .unlist a, .categoryb } a:active { - outline: 0; - -/* for browsers that understand */ + outline: 0; /* for browsers that understand */ } a:focus { - outline: 0; - -/* for browsers that understand */ + outline: 0; /* for browsers that understand */ } /**header divs **/ @@ -870,7 +866,7 @@ div.categorybox { td.category.name a { 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-size: 16px; } @@ -1119,35 +1115,6 @@ div.course-content div.availabilityinfo { 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 { text-align: center; }