diff --git a/README.txt b/README.txt index 931c2d67..e3a8c25a 100644 --- a/README.txt +++ b/README.txt @@ -21,8 +21,11 @@ New in 2.7.4 - FIX: Issue #58. Add font colour setting. - FIX: Issue #63. Slider caption overlap. - FIX: Issue #66. Link Colour Not Working. +- FIX: Issue #85. Header logo location in RTL. - FIX: Reverted icons back to #999. - FIX: Alternative colour sets all now have the same CSS, docking fixed and consistent with settings. +- FIX: Moved all RTL to separate sheet from main CSS. Sheet 'essential-rtl' uses 'flipped' technology whilst 'rtl' sheet has manual styles. +- FIX: Issue #78. Category icon issue in RTL. - NEW: Alternative colour sets have text and link colour settings. - NEW: Optimised svg's to be smaller. - NEW: Warning about IE8 as M2.6 does not support it - http://docs.moodle.org/dev/Moodle_2.6_release_notes#Requirements. diff --git a/config.php b/config.php index cac3f670..dcca7bfe 100644 --- a/config.php +++ b/config.php @@ -33,7 +33,14 @@ $THEME->doctype = 'html5'; $THEME->yuicssmodules = array(); $THEME->parents = array('bootstrapbase'); -$THEME->sheets = array('fontawesome', 'essential', 'custom'); +$THEME->sheets = array('fontawesome'); +if ('ltr' === get_string('thisdirection', 'langconfig')) { + $THEME->sheets[] = 'essential'; +} else { + $THEME->sheets[] = 'essential-rtl'; + $THEME->sheets[] = 'rtl'; +} +$THEME->sheets[] = 'custom'; $THEME->supportscssoptimisation = false; if ($CFG->version >= 2014051200.10 ) { @@ -42,11 +49,7 @@ $THEME->editor_sheets = array(); -$THEME->plugins_exclude_sheets = array( - 'block' => array( - 'html', - ), -); +$THEME->plugins_exclude_sheets = array(); $THEME->layouts = array( // Most backwards compatible layout without the blocks - this is the layout used by default. diff --git a/layout/includes/header.php b/layout/includes/header.php index a441d3b5..32f93a7a 100755 --- a/layout/includes/header.php +++ b/layout/includes/header.php @@ -34,7 +34,7 @@
-
+

shortname; ?>

@@ -43,20 +43,20 @@
-
+

firstname; ?>

  • user_picture($USER); ?>
    • -
+
-
+

    theme->settings->oldnavbar; diff --git a/style/essential-rtl.css b/style/essential-rtl.css index 642d93a5..c9541ee9 100644 --- a/style/essential-rtl.css +++ b/style/essential-rtl.css @@ -47,11 +47,6 @@ a { z-index: 100; } -.dir-rtl a.logo { - display: block; - float: left; -} - .moodle-actionmenu[data-enhanced].show .menu { box-shadow: none; } @@ -1003,48 +998,10 @@ table#greyboxleft h2 { background: red; } -/* @group DIR-RTL */ - -.dir-rtl .block_login .content { - padding-bottom: 125px; -} - -.dir-rtl .block_login .content .footer { - height: 60px; - width: 70%; - padding: 0 10px 10px 50px; -} - -.dir-rtl .block_login .content .footer div { - float: left; - clear: left; -} - -.dir-rtl .block_login .content .footer a { - float: left; - margin: 0; -} - -.dir-rtl .block_login .content .footer a { - margin-bottom: 10px; -} - -.dir-rtl .block_login .header .title h2:before { - float: left; - clear: left; - text-align: left; -} - -/* @end */ - /* @end */ /* @group Block Icons */ -.dir-rtl .collapsed .tree_item.branch:before { - content: " \f053"; -} - .block_news_items .header .title h2:before { content: "\f0a1"; } @@ -1861,38 +1818,6 @@ table.calendarmonth.calendartable { /* @end */ -/* @group RTL Fixes */ - -.dir-rtl .block .footer { - float: left; - text-align: left; -} - -.dir-rtl .block_login input[type="submit"], -.dir-rtl .block_login .footer a { - float: left; -} - -.dir-rtl .block .header .title h2:before { - margin-right: 0.3em; -} - -.dir-rtl .block #icon { - margin-right: 5px; -} - -.dir-rtl .course_category_tree .category > .info > .categoryname { - background-repeat: no-repeat; -} - -/* @navigation */ - -.dir-rlt .tree_item.branch:before { - margin-right: 5px; -} - -/* @end */ - @media screen and (min-width: 960px) { .side-regions-with-max-width #block-region-side-pre { width: 285px; @@ -2212,7 +2137,7 @@ body.frontpageslidercaptionbelow #essentialCarousel.carousel .carousel-inner .ca .course_category_tree .category.with_children.collapsed > .info > .categoryname, .course_category_tree .category.with_children > .info > .categoryname, .course_category_tree .category > .info > .categoryname { - background: none; + background-image: none; padding: 0; margin: 0; } @@ -2325,12 +2250,6 @@ body.has_dock.dir-ltr footer { margin-right: 42px; } -body.has_dock.dir-rtl header, -body.has_dock.dir-rtl > section, -body.has_dock.dir-rtl footer { - margin-left: 42px; -} - .dockbutton:hover, .dockbutton:focus, .dockbutton.disabled, @@ -2352,7 +2271,7 @@ body.has_dock.dir-rtl footer { .dockbutton:focus { color: #7b8a8b; text-decoration: none; - background-position: 100% -15px; + background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; @@ -2499,7 +2418,7 @@ body.has_dock div#dock { #dock .dockedtitle:focus { color: #7b8a8b; text-decoration: none; - background-position: 100% -15px; + background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; @@ -2671,30 +2590,6 @@ body.has_dock div#dock { display: none; } -.dir-rtl #dockeditempanel { - left: 100%; -} - -.dir-rtl #dockeditempanel .dockeditempanel_hd .commands { - text-align: right; -} - -.dir-rtl #dock { - left: 0; - right: auto; -} - -.dir-rtl #dock .dockedtitle { - cursor: pointer; - border-top: 1px solid #EEE; - border-bottom: 1px solid #EEE; -} - -body.dir-rtl.has_dock { - margin-left: 40px; - margin-right: 0; -} - .dockeditempanel_content { width: 300px; } @@ -2938,10 +2833,6 @@ a:hover { color: [[setting:themecolor]]; } -.dir-rtl a.logo { - background: url([[setting:logo]]) no-repeat 100% 0; -} - /* @group Custom */ .bor { diff --git a/style/essential.css b/style/essential.css index f84e8713..e05d800f 100644 --- a/style/essential.css +++ b/style/essential.css @@ -39,10 +39,6 @@ a { #dndupload-status { z-index: 100; } -.dir-rtl a.logo { - display: block; - float: right; -} .moodle-actionmenu[data-enhanced].show .menu { box-shadow: none; } @@ -815,37 +811,8 @@ table#greyboxleft h2 { .block_login .content .footer div a:hover { background: red; } -/* @group DIR-RTL */ -.dir-rtl .block_login .content { - padding-bottom: 125px; -} -.dir-rtl .block_login .content .footer { - height: 60px; - width: 70%; - padding: 0 50px 10px 10px; -} -.dir-rtl .block_login .content .footer div { - float: right; - clear: right; -} -.dir-rtl .block_login .content .footer a { - float: right; - margin: 0; -} -.dir-rtl .block_login .content .footer a { - margin-bottom: 10px; -} -.dir-rtl .block_login .header .title h2:before { - float: right; - clear: right; - text-align: right; -} -/* @end */ /* @end */ /* @group Block Icons */ -.dir-rtl .collapsed .tree_item.branch:before { - content: " \f053"; -} .block_news_items .header .title h2:before { content: "\f0a1"; } @@ -1511,29 +1478,6 @@ table.calendarmonth.calendartable { color: #fff !important; } /* @end */ -/* @group RTL Fixes */ -.dir-rtl .block .footer { - float: right; - text-align: right; -} -.dir-rtl .block_login input[type="submit"], -.dir-rtl .block_login .footer a { - float: right; -} -.dir-rtl .block .header .title h2:before { - margin-left: 0.3em; -} -.dir-rtl .block #icon { - margin-left: 5px; -} -.dir-rtl .course_category_tree .category > .info > .categoryname { - background-repeat: no-repeat; -} -/* @navigation */ -.dir-rlt .tree_item.branch:before { - margin-left: 5px; -} -/* @end */ @media screen and (min-width: 960px) { .side-regions-with-max-width #block-region-side-pre { width: 285px; @@ -1791,7 +1735,7 @@ body.frontpageslidercaptionbelow #essentialCarousel.carousel .carousel-inner .ca .course_category_tree .category.with_children.collapsed > .info > .categoryname, .course_category_tree .category.with_children > .info > .categoryname, .course_category_tree .category > .info > .categoryname { - background: none; + background-image: none; padding: 0; margin: 0; } @@ -1885,11 +1829,6 @@ body.has_dock.dir-ltr > section, body.has_dock.dir-ltr footer { margin-left: 42px; } -body.has_dock.dir-rtl header, -body.has_dock.dir-rtl > section, -body.has_dock.dir-rtl footer { - margin-right: 42px; -} .dockbutton:hover, .dockbutton:focus, .dockbutton.disabled, @@ -2177,25 +2116,6 @@ body.has_dock div#dock { #dockeditempanel.dockitempanel_hidden { display: none; } -.dir-rtl #dockeditempanel { - right: 100%; -} -.dir-rtl #dockeditempanel .dockeditempanel_hd .commands { - text-align: left; -} -.dir-rtl #dock { - right: 0; - left: auto; -} -.dir-rtl #dock .dockedtitle { - cursor: pointer; - border-top: 1px solid #EEE; - border-bottom: 1px solid #EEE; -} -body.dir-rtl.has_dock { - margin-right: 40px; - margin-left: 0; -} .dockeditempanel_content { width: 300px; } @@ -2399,9 +2319,6 @@ a:hover { .color { color: [[setting:themecolor]]; } -.dir-rtl a.logo { - background: url([[setting:logo]]) no-repeat 100% 0; -} /* @group Custom */ .bor { background: url([[pix:theme|bg/dot]]) repeat-x; diff --git a/style/rtl.css b/style/rtl.css new file mode 100644 index 00000000..3cd4d102 --- /dev/null +++ b/style/rtl.css @@ -0,0 +1,93 @@ +/* + * @author Gareth J Barnard + * @package theme_essential + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +.dir-rtl #headerlogo { + float: right; + margin-left: 0px; + margin-right: 10px; + padding-left: 0px; + padding-right: 10px; +} +.dir-rtl .block_login .content { + padding-bottom: 125px; +} +.dir-rtl .block_login .content .footer { + height: 60px; + width: 70%; + padding: 0 50px 10px 10px; +} +.dir-rtl .block_login .content .footer div { + float: right; + clear: right; +} +.dir-rtl .block_login .content .footer a { + float: right; + margin: 0; + margin-bottom: 10px; +} +.dir-rtl .block_login .header .title h2:before { + float: right; + clear: right; + text-align: right; +} +.dir-rtl .block_login input[type="submit"], +.dir-rtl .block_login .footer a { + float: right; +} +.dir-rtl .collapsed .tree_item.branch:before { + content: " \f053"; +} +.dir-rtl a.logo { + display: block; + float: right; + background-position: right center; +} +.dir-rtl .block .footer { + float: right; + text-align: right; +} +.dir-rtl .block .header .title h2:before { + margin-left: 0.3em; +} +.dir-rtl .block #icon { + margin-left: 5px; +} +/* Hide icon 'collapsed' because it makes no sense here */ +.dir-rtl .course_category_tree .category.with_children.collapsed > .info > .categoryname, +.dir-rtl .course_category_tree .category.with_children > .info > .categoryname, +.dir-rtl .course_category_tree .category > .info > .categoryname { + background-image: none; + background-repeat: no-repeat; + padding: 0; + margin: 0; +} +/* @navigation */ +.dir-rtl .tree_item.branch:before { + margin-left: 5px; +} +.dir-rtl a.logo { + background: url([[setting:logo]]) no-repeat 100% 0; +} +margin-left:0 body.has_dock.dir-rtl header, +margin-left:0 body.has_dock.dir-rtl > section, +margin-left:0 body.has_dock.dir-rtl footer { + margin-right: 42px; +} +body.dir-rtl #dockeditempanel { + right: 100%; +} +body.dir-rtl #dockeditempanel .dockeditempanel_hd .commands { + text-align: left; +} +body.dir-rtl #dock { + right: 0; + left: auto; +} +body.dir-rtl #dock .dockedtitle { + cursor: pointer; + border-top: 1px solid #EEE; + border-bottom: 1px solid #EEE; +} +/*# sourceMappingURL=/theme/essential/style/rtl.treasure.map */ \ No newline at end of file diff --git a/version.php b/version.php index c3fdf0ad..f9519dc2 100644 --- a/version.php +++ b/version.php @@ -26,9 +26,9 @@ defined('MOODLE_INTERNAL') || die; -$plugin->version = 2014072600; // YYYYMMDDVV. +$plugin->version = 2014072601; // YYYYMMDDVV. $plugin->maturity = MATURITY_RC; // this version's maturity level. -$plugin->release = '2.7.4a (Build: 2014072600)'; +$plugin->release = '2.7.4b (Build: 2014072600)'; $plugin->requires = 2013101800; // Requires Moodle 2.6. $plugin->component = 'theme_essential'; $plugin->dependencies = array(