From f3002381490f2cf1c6fb12012f86d8e41f9ffa4f Mon Sep 17 00:00:00 2001 From: Gareth J Barnard Date: Sat, 26 Jul 2014 18:18:59 +0100 Subject: [PATCH 1/5] 2.7.4a --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.txt b/README.txt index 4c82e978..4343283b 100644 --- a/README.txt +++ b/README.txt @@ -15,7 +15,7 @@ Cool things to know about the theme. - The entire colour scheme can be modified with theme settings - The homepage main area is just a label. The theme will ship with custom classes that you can set for tables and links to modify their formatting. No knowledge of code is needed as you can use the text editor to do this. Documentation will be provided outlining what the additional classes are. -New in 2.7.3.1 +New in 2.7.4 ======================== - FIX: Issue #68. Expand all not showing on Edit course settings. - FIX: Issue #58. Add font colour setting. From 2f5839063faaa4b72cc19aad255d416b232a589a Mon Sep 17 00:00:00 2001 From: Gareth J Barnard Date: Sun, 27 Jul 2014 16:39:11 +0100 Subject: [PATCH 2/5] Fix for #78. Migrated manual RTL CSS to own sheet. Fixed header RTL logic. --- Gruntfile.js | 12 ++++ README.txt | 2 + config.php | 9 ++- layout/includes/header.php | 4 +- layout/includes/pagesettings.php | 6 +- less/essential/categories.less | 6 +- less/essential/dock-rtl.less | 33 +++++++++ less/essential/dock.less | 29 -------- less/essential/essential.less | 66 ------------------ less/essential/general-rtl.less | 80 +++++++++++++++++++++ less/essential/settings-rtl.less | 9 +++ less/essential/settings.less | 4 -- less/rtlall.less | 9 +++ package.json | 2 +- style/essential-rtl.css | 115 +------------------------------ style/essential.css | 85 +---------------------- version.php | 4 +- 17 files changed, 168 insertions(+), 307 deletions(-) create mode 100644 less/essential/dock-rtl.less create mode 100644 less/essential/general-rtl.less create mode 100644 less/essential/settings-rtl.less create mode 100644 less/rtlall.less diff --git a/Gruntfile.js b/Gruntfile.js index 0791748c..07e636c6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -152,6 +152,18 @@ module.exports = function(grunt) { }, src: 'less/fontawesome.less', dest: 'style/fontawesome.css' + }, + rtl: { + options: { + compress: false, + paths: "./less", + report: 'min', + sourceMap: true, + sourceMapRootpath: MOODLEURLPREFIX + '/theme/' + THEMEDIR, + sourceMapFilename: 'style/rtl.treasure.map' + }, + src: 'less/rtlall.less', + dest: 'style/rtl.css' } }, exec: { diff --git a/README.txt b/README.txt index 4343283b..ad21194b 100644 --- a/README.txt +++ b/README.txt @@ -23,6 +23,8 @@ New in 2.7.4 - FIX: Issue #66. Link Colour Not Working. - 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..27dc9ec3 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 ) { diff --git a/layout/includes/header.php b/layout/includes/header.php index a441d3b5..7b9dc001 100755 --- a/layout/includes/header.php +++ b/layout/includes/header.php @@ -34,7 +34,7 @@
-
+

shortname; ?>

@@ -43,7 +43,7 @@
-
+

firstname; ?>

  • diff --git a/layout/includes/pagesettings.php b/layout/includes/pagesettings.php index 3826b8e4..e6b30cf7 100644 --- a/layout/includes/pagesettings.php +++ b/layout/includes/pagesettings.php @@ -71,11 +71,11 @@ $logoclass = 'span12'; if (($hassocialnetworks || $hasmobileapps) && $hasprofilepic) { - $logoclass = 'span6'; + $logoclass = 'span6'; } else if (!($hassocialnetworks || $hasmobileapps) && $hasprofilepic) { - $logoclass = 'span11'; + $logoclass = 'span11'; } else if (($hassocialnetworks || $hasmobileapps) && !$hasprofilepic) { - $logoclass = 'span7'; + $logoclass = 'span7'; } $oldnavbar = $PAGE->theme->settings->oldnavbar; diff --git a/less/essential/categories.less b/less/essential/categories.less index 151be1ba..5b5aaadb 100644 --- a/less/essential/categories.less +++ b/less/essential/categories.less @@ -31,8 +31,8 @@ } .category-browse { - overflow: auto; - width: 100%; + overflow: auto; + width: 100%; } /* Hide icon 'collapsed' because it makes no sense here */ @@ -40,7 +40,7 @@ .category.with_children.collapsed>.info>.categoryname, .category.with_children>.info>.categoryname, .category>.info>.categoryname { - background: none; + background-image: none; padding: 0; margin: 0; } diff --git a/less/essential/dock-rtl.less b/less/essential/dock-rtl.less new file mode 100644 index 00000000..c0ef5bd4 --- /dev/null +++ b/less/essential/dock-rtl.less @@ -0,0 +1,33 @@ +/* + * @author Gareth J Barnard + * @package theme_essential + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +// Make room for the dock, i.e. shift slider to the right by the width of the dock. +body.has_dock { + margin-left:0 + &.dir-rtl { + header, > section, footer { + margin-right: 42px; + } + } +} + +body.dir-rtl { + #dockeditempanel { + right: 100%; + .dockeditempanel_hd .commands{ + text-align:left + } + } + #dock { + right: 0; + left: auto; + .dockedtitle { + cursor: pointer; + border-top:1px solid #EEE; + border-bottom: 1px solid #EEE; + } + } +} diff --git a/less/essential/dock.less b/less/essential/dock.less index eabd5bfb..b412f0ff 100644 --- a/less/essential/dock.less +++ b/less/essential/dock.less @@ -30,11 +30,6 @@ body.has_dock { margin-left: 42px; } } - &.dir-rtl { - header, > section, footer { - margin-right: 42px; - } - } } .dockbutton:hover, .dockbutton:focus, .dockbutton.disabled, .dockbutton[disabled]{ @@ -349,30 +344,6 @@ body.has_dock div#dock{ 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; } diff --git a/less/essential/essential.less b/less/essential/essential.less index f47d0da8..f1519cb4 100644 --- a/less/essential/essential.less +++ b/less/essential/essential.less @@ -42,11 +42,6 @@ a { z-index: 100; } -.dir-rtl a.logo { - display: block; - float: right; -} - .moodle-actionmenu[data-enhanced].show .menu { box-shadow: none; } @@ -968,44 +963,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 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"; } @@ -1803,33 +1764,6 @@ table.calendarmonth.calendartable { /* @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; diff --git a/less/essential/general-rtl.less b/less/essential/general-rtl.less new file mode 100644 index 00000000..439d3421 --- /dev/null +++ b/less/essential/general-rtl.less @@ -0,0 +1,80 @@ +/* + * @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; + .footer { + height: 60px; + width: 70%; + padding: 0 50px 10px 10px; + div { + float: right; + clear: right; + } + a { + float: right; + margin: 0; + margin-bottom: 10px; + } + } + } + .header .title h2:before { + float: right; + clear: right; + text-align: right; + } + input[type="submit"], .footer a { + float: right; + } +} + +.dir-rtl .collapsed .tree_item.branch:before { + content: " \f053"; +} + +.dir-rtl a.logo { + display: block; + float: right; +} + +.dir-rtl .block { + .footer { + float: right; + text-align: right; + } + .header .title h2:before { + margin-left: 0.3em; + } + #icon { + margin-left: 5px; + } +} + +/* Hide icon 'collapsed' because it makes no sense here */ +.dir-rtl .course_category_tree { + .category.with_children.collapsed>.info>.categoryname, + .category.with_children>.info>.categoryname, + .category>.info>.categoryname { + background-image: none; + background-repeat: no-repeat; + padding: 0; + margin: 0; + } +} + +/* @navigation */ +.dir-rtl .tree_item.branch:before { + margin-left: 5px; +} diff --git a/less/essential/settings-rtl.less b/less/essential/settings-rtl.less new file mode 100644 index 00000000..91d9aaaa --- /dev/null +++ b/less/essential/settings-rtl.less @@ -0,0 +1,9 @@ +/* + * @author Gareth J Barnard + * @package theme_essential + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +.dir-rtl a.logo { + background: url(~"[[setting:logo]]") no-repeat 100% 0; +} diff --git a/less/essential/settings.less b/less/essential/settings.less index 8cde2d6e..32f3b8ea 100644 --- a/less/essential/settings.less +++ b/less/essential/settings.less @@ -43,10 +43,6 @@ a:hover { color: ~"[[setting:themecolor]]"; } -.dir-rtl a.logo { - background: url(~"[[setting:logo]]") no-repeat 100% 0; -} - /* @group Custom */ .bor { diff --git a/less/rtlall.less b/less/rtlall.less new file mode 100644 index 00000000..4fe8a039 --- /dev/null +++ b/less/rtlall.less @@ -0,0 +1,9 @@ +/* + * @author Gareth J Barnard + * @package theme_essential + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +@import "essential/general-rtl"; +@import "essential/settings-rtl"; +@import "essential/dock-rtl"; diff --git a/package.json b/package.json index ebf45e2f..fffbe09e 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "grunt-contrib-watch": "~0.6.1", "grunt-exec": "~0.4.5", "grunt-text-replace": "~0.3.12", - "grunt-css-flip": "~0.3.0", + "grunt-css-flip": "~0.4.0", "grunt-contrib-copy": "~0.5.0", "grunt-svgmin": "~0.4.0" }, 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/version.php b/version.php index c2e18421..80d799b5 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_BETA; // 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( From 1aed65f4a65d81b8b3826ad65113490d6b4af49c Mon Sep 17 00:00:00 2001 From: Gareth J Barnard Date: Sun, 27 Jul 2014 23:18:10 +0100 Subject: [PATCH 3/5] Add rtl.css. --- less/essential/dock-rtl.less | 10 ++-- less/essential/essential.less | 8 +-- less/essential/general-rtl.less | 10 ++-- less/essential/settings-rtl.less | 10 ++-- less/essentialall.less | 6 +++ style/rtl.css | 92 ++++++++++++++++++++++++++++++++ 6 files changed, 114 insertions(+), 22 deletions(-) create mode 100644 style/rtl.css diff --git a/less/essential/dock-rtl.less b/less/essential/dock-rtl.less index c0ef5bd4..448d1f1a 100644 --- a/less/essential/dock-rtl.less +++ b/less/essential/dock-rtl.less @@ -1,8 +1,8 @@ -/* - * @author Gareth J Barnard - * @package theme_essential - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ +// +// @author Gareth J Barnard +// @package theme_essential +// @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later +// // Make room for the dock, i.e. shift slider to the right by the width of the dock. body.has_dock { diff --git a/less/essential/essential.less b/less/essential/essential.less index f1519cb4..55ba228c 100644 --- a/less/essential/essential.less +++ b/less/essential/essential.less @@ -1,10 +1,4 @@ -/* - * @author Julian Ridden - * @package theme_essential - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - - /* @group Core */ +/* @group Core */ body { line-height: 25px; diff --git a/less/essential/general-rtl.less b/less/essential/general-rtl.less index 439d3421..48bafbb9 100644 --- a/less/essential/general-rtl.less +++ b/less/essential/general-rtl.less @@ -1,8 +1,8 @@ -/* - * @author Gareth J Barnard - * @package theme_essential - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ +// +// @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; diff --git a/less/essential/settings-rtl.less b/less/essential/settings-rtl.less index 91d9aaaa..7272752e 100644 --- a/less/essential/settings-rtl.less +++ b/less/essential/settings-rtl.less @@ -1,8 +1,8 @@ -/* - * @author Gareth J Barnard - * @package theme_essential - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ +// +// @author Gareth J Barnard +// @package theme_essential +// @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later +// .dir-rtl a.logo { background: url(~"[[setting:logo]]") no-repeat 100% 0; diff --git a/less/essentialall.less b/less/essentialall.less index ba7365a5..3ec37916 100644 --- a/less/essentialall.less +++ b/less/essentialall.less @@ -1,3 +1,9 @@ +/* + * @author Julian Ridden + * @package theme_essential + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + // Import the essential less. @import "essential/variables"; diff --git a/style/rtl.css b/style/rtl.css new file mode 100644 index 00000000..c7e3b059 --- /dev/null +++ b/style/rtl.css @@ -0,0 +1,92 @@ +/* + * @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; +} +.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 From d9726e55bfed4165471c1e3d9ad8c039f60460d0 Mon Sep 17 00:00:00 2001 From: Gareth J Barnard Date: Mon, 28 Jul 2014 13:14:08 +0100 Subject: [PATCH 4/5] Fix #85. --- README.txt | 1 + layout/includes/header.php | 4 ++-- less/essential/general-rtl.less | 1 + style/rtl.css | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.txt b/README.txt index ad21194b..4c4b3703 100644 --- a/README.txt +++ b/README.txt @@ -21,6 +21,7 @@ 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. diff --git a/layout/includes/header.php b/layout/includes/header.php index 7b9dc001..32f93a7a 100755 --- a/layout/includes/header.php +++ b/layout/includes/header.php @@ -49,14 +49,14 @@
  • user_picture($USER); ?>
    • -
+
-
+

    Date: Mon, 28 Jul 2014 13:17:59 +0100 Subject: [PATCH 5/5] Remove redundant plugin css exclusion that no longer exists. Thanks to Mary Evans. --- config.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/config.php b/config.php index 27dc9ec3..dcca7bfe 100644 --- a/config.php +++ b/config.php @@ -49,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.