From c5362652c18aee2c42f6fc494997ffe0f702698c Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Tue, 5 Apr 2016 20:04:11 +1000 Subject: [PATCH] Begin the process of refitting brand settings Introduce secondary and accent colors Switch some CSS to use the new storm utils Other minor improvements --- modules/backend/ServiceProvider.php | 3 +- modules/backend/assets/css/october.css | 47 ++++---- .../assets/less/controls/sidenav-tree.less | 42 ++++---- .../backend/assets/less/core/variables.less | 7 +- .../assets/less/layout/flexlayout.less | 3 +- .../backend/assets/less/layout/layout.less | 1 + .../backend/assets/less/layout/mainmenu.less | 6 +- .../backend/assets/less/layout/sidenav.less | 4 +- modules/backend/lang/cs/lang.php | 7 +- modules/backend/lang/el/lang.php | 7 +- modules/backend/lang/en/lang.php | 7 +- modules/backend/lang/es/lang.php | 7 +- modules/backend/lang/fa/lang.php | 7 +- modules/backend/lang/fr/lang.php | 7 +- modules/backend/lang/hu/lang.php | 7 +- modules/backend/lang/id/lang.php | 7 +- modules/backend/lang/it/lang.php | 7 +- modules/backend/lang/ja/lang.php | 7 +- modules/backend/lang/lv/lang.php | 7 +- modules/backend/lang/nb-no/lang.php | 7 +- modules/backend/lang/nl/lang.php | 7 +- modules/backend/lang/pl/lang.php | 7 +- modules/backend/lang/pt-br/lang.php | 7 +- modules/backend/lang/ru/lang.php | 7 +- modules/backend/lang/sv/lang.php | 7 +- modules/backend/lang/tr/lang.php | 7 +- modules/backend/lang/zh-cn/lang.php | 7 +- modules/backend/lang/zh-tw/lang.php | 7 +- modules/backend/layouts/_mainmenu.htm | 2 +- modules/backend/layouts/_sidenav.htm | 10 +- modules/backend/layouts/default.htm | 4 +- modules/backend/layouts/form-with-sidebar.htm | 2 +- modules/backend/models/BrandSettings.php | 100 ++++-------------- .../backend/models/brandsettings/custom.less | 39 ++++++- .../backend/models/brandsettings/fields.yaml | 28 +++-- .../widgets/mediamanager/partials/_body.htm | 4 +- .../mediamanager/partials/_crop-toolbar.htm | 6 +- modules/system/assets/css/styles.css | 8 +- modules/system/assets/ui/less/form.less | 15 +-- .../assets/ui/less/global.variables.less | 21 ++-- .../system/partials/_settings_menu_items.htm | 2 +- modules/system/partials/_system_sidebar.htm | 4 +- 42 files changed, 221 insertions(+), 277 deletions(-) diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php index 9451f075d..f1d812b1a 100644 --- a/modules/backend/ServiceProvider.php +++ b/modules/backend/ServiceProvider.php @@ -193,7 +193,8 @@ class ServiceProvider extends ModuleServiceProvider 'icon' => 'icon-paint-brush', 'class' => 'Backend\Models\BrandSettings', 'permissions' => ['backend.manage_branding'], - 'order' => 500 + 'order' => 500, + 'keywords' => 'brand style' ], 'myaccount' => [ 'label' => 'backend::lang.myaccount.menu_label', diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index 4cb23bae7..573d06c49 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -402,22 +402,23 @@ .control-treeview ol > li.drop-target > div:before{background-position:0px -129px} .control-treeview ol > li.drop-target.has-subitems > div:before{background-position:0px -102px} } -.sidenav-tree{width:300px;background:#31495f} +.sidenav-tree{width:300px} .sidenav-tree .control-toolbar{padding:0} .sidenav-tree .control-toolbar .toolbar-item{display:block} .sidenav-tree .control-toolbar input.form-control{border:none;outline:none;padding:12px 13px 13px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:inset -5px 0 3px rgba(0,0,0,0.1);box-shadow:inset -5px 0 3px rgba(0,0,0,0.1)} .sidenav-tree .control-toolbar input.form-control.search{background-position:right -78px} .sidenav-tree ul{padding:0;margin:0;list-style:none} -.sidenav-tree div.scrollbar-thumb{background:#2b3e50 !important} +.sidenav-tree div.scrollbar-thumb{background:rgba(0,0,0,0.2) !important} .sidenav-tree ul.top-level > li[data-status=collapsed] > div.group h3:before{-webkit-transform:rotate(0deg) translate(2px,-2px);-ms-transform:rotate(0deg) translate(2px,-2px);transform:rotate(0deg) translate(2px,-2px)} -.sidenav-tree ul.top-level > li[data-status=collapsed] > div.group h3:after{display:none} +.sidenav-tree ul.top-level > li[data-status=collapsed] > div.group:before,.sidenav-tree ul.top-level > li[data-status=collapsed] > div.group:after{display:none} .sidenav-tree ul.top-level > li[data-status=collapsed] ul{display:none} .sidenav-tree ul.top-level > li > div.group{position:relative} -.sidenav-tree ul.top-level > li > div.group:after{content:'';position:absolute;top:0;right:0;width:10px;height:100%;-webkit-box-shadow:inset -5px 0 3px rgba(0,0,0,0.1);box-shadow:inset -5px 0 3px rgba(0,0,0,0.1)} -.sidenav-tree ul.top-level > li > div.group h3{background:#2a3e51;color:#ecf0f1;text-transform:uppercase;font-size:15px;padding:15px 15px 15px 40px;margin:0;position:relative;cursor:pointer} +.sidenav-tree ul.top-level > li > div.group h3{background:rgba(0,0,0,0.15);color:#ecf0f1;text-transform:uppercase;font-size:15px;padding:15px 15px 15px 40px;margin:0;position:relative;cursor:pointer} .sidenav-tree ul.top-level > li > div.group h3:before{display:block;position:absolute;width:10px;height:10px;left:16px;top:15px;color:#cfcfcf;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f105";-webkit-transform:rotate(90deg) translate(5px,-3px);-ms-transform:rotate(90deg) translate(5px,-3px);transform:rotate(90deg) translate(5px,-3px);-webkit-transition:all 0.1s ease;transition:all 0.1s ease;font-size:16px} -.sidenav-tree ul.top-level > li > div.group h3:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-top:8px solid #2a3e51;border-bottom-width:0;position:absolute;left:15px;bottom:-8px;z-index:101} -.sidenav-tree ul.top-level > li > ul li a{display:block;position:relative;padding:18px 25px 18px 55px;background:transparent;border-bottom:1px solid #2a3e51;color:#ffffff;text-decoration:none !important;opacity:0.65;filter:alpha(opacity=65)} +.sidenav-tree ul.top-level > li > div.group h3:after{content:'';position:absolute;top:0;right:0;width:10px;height:100%;-webkit-box-shadow:inset -5px 0 3px rgba(0,0,0,0.1);box-shadow:inset -5px 0 3px rgba(0,0,0,0.1)} +.sidenav-tree ul.top-level > li > div.group:before,.sidenav-tree ul.top-level > li > div.group:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-top:8px solid #34495e;border-bottom-width:0;position:absolute;left:15px;bottom:-8px;z-index:101} +.sidenav-tree ul.top-level > li > div.group:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-top:8px solid rgba(0,0,0,0.15);border-bottom-width:0} +.sidenav-tree ul.top-level > li > ul li a{display:block;position:relative;padding:18px 25px 18px 55px;background:transparent;border-bottom:1px solid rgba(0,0,0,0.15);color:#ffffff;text-decoration:none !important;opacity:0.65;filter:alpha(opacity=65)} .sidenav-tree ul.top-level > li > ul li a:after{content:'';position:absolute;top:0;right:0;width:10px;height:100%;-webkit-box-shadow:inset -5px 0 3px rgba(0,0,0,0.1);box-shadow:inset -5px 0 3px rgba(0,0,0,0.1)} .sidenav-tree ul.top-level > li > ul li a:hover{text-decoration:none} .sidenav-tree ul.top-level > li > ul li a i{position:absolute;left:16px;top:18px;font-size:22px} @@ -425,7 +426,7 @@ .sidenav-tree ul.top-level > li > ul li a span.header{color:#ffffff;font-size:15px;margin-bottom:5px} .sidenav-tree ul.top-level > li > ul li a span.description{color:#bdc3c7;font-size:13px} .sidenav-tree ul.top-level > li > ul li:hover a,.sidenav-tree ul.top-level > li > ul li.active a{opacity:1;filter:alpha(opacity=100)} -.sidenav-tree ul.top-level > li > ul li.active a{background:#1f99dc;color:rgba(255,255,255,0.91)} +.sidenav-tree ul.top-level > li > ul li.active a{color:rgba(255,255,255,0.91)} .sidenav-tree ul.top-level > li > ul li.active a span.header{color:#ffffff} .sidenav-tree ul.top-level > li > ul li.active a span.description{color:rgba(255,255,255,0.91)} .sidenav-tree ul.top-level > li > ul li:last-child a{border-bottom:none} @@ -709,19 +710,19 @@ nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-icon i,nav#layo nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-label{line-height:30px} nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:first-child{margin-left:2px} nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:last-child{margin-right:0} -nav#layout-mainmenu.navbar-mode-tiles{height:78px} -nav#layout-mainmenu.navbar-mode-tiles ul.mainmenu-toolbar li.mainmenu-preview a{height:62px;line-height:62px} -nav#layout-mainmenu.navbar-mode-tiles ul.mainmenu-toolbar li.mainmenu-account > a{height:78px;line-height:78px} -nav#layout-mainmenu.navbar-mode-tiles ul li .mainmenu-accountmenu{top:78px} -nav#layout-mainmenu.navbar-mode-tiles ul.mainmenu-nav li a{position:relative;width:65px;height:65px} -nav#layout-mainmenu.navbar-mode-tiles ul.mainmenu-nav li a .nav-icon{text-align:center;display:block;position:absolute;top:50%;left:50%;margin-left:-15px;margin-top:-22.5px;width:30px;height:30px} -nav#layout-mainmenu.navbar-mode-tiles ul.mainmenu-nav li a .nav-icon i,nav#layout-mainmenu.navbar-mode-tiles ul.mainmenu-nav li a .nav-icon img{margin:0} -nav#layout-mainmenu.navbar-mode-tiles ul.mainmenu-nav li a .nav-label{display:block;width:100px;height:20px;line-height:20px;position:absolute;bottom:0;left:50%;padding:0 5px;margin-left:-50px;overflow:hidden;text-overflow:ellipsis;text-align:center} -nav#layout-mainmenu.navbar-mode-tiles ul.mainmenu-nav li{padding:3px 0} -nav#layout-mainmenu.navbar-mode-tiles ul.mainmenu-nav li:first-child{margin-left:8px} -nav#layout-mainmenu.navbar-mode-tiles ul.mainmenu-nav li:last-child{margin-right:0} -nav#layout-mainmenu.navbar-mode-tiles ul.mainmenu-nav li.active a .nav-label{text-shadow:1px 1px 0 rgba(255,255,255,0.3)} -nav#layout-mainmenu.navbar-mode-tiles ul.mainmenu-nav li:hover .nav-label{width:auto;min-width:100px;text-overflow:all;overflow:visible;background-color:#111111;z-index:2} +nav#layout-mainmenu.navbar-mode-tile{height:78px} +nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-preview a{height:62px;line-height:62px} +nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-account > a{height:78px;line-height:78px} +nav#layout-mainmenu.navbar-mode-tile ul li .mainmenu-accountmenu{top:78px} +nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li a{position:relative;width:65px;height:65px} +nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li a .nav-icon{text-align:center;display:block;position:absolute;top:50%;left:50%;margin-left:-15px;margin-top:-22.5px;width:30px;height:30px} +nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li a .nav-icon i,nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li a .nav-icon img{margin:0} +nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li a .nav-label{display:block;width:100px;height:20px;line-height:20px;position:absolute;bottom:0;left:50%;padding:0 5px;margin-left:-50px;overflow:hidden;text-overflow:ellipsis;text-align:center} +nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li{padding:3px 0} +nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li:first-child{margin-left:8px} +nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li:last-child{margin-right:0} +nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li.active a .nav-label{text-shadow:1px 1px 0 rgba(255,255,255,0.3)} +nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li:hover .nav-label{width:auto;min-width:100px;text-overflow:all;overflow:visible;background-color:#111111;z-index:2} nav#layout-mainmenu .menu-toggle{height:45px;line-height:45px;font-size:16px;display:none} nav#layout-mainmenu .menu-toggle .menu-toggle-icon{background:#333;display:inline-block;height:45px;line-height:45px;width:45px;text-align:center} nav#layout-mainmenu .menu-toggle .menu-toggle-icon i{line-height:1;font-size:30px;vertical-align:middle} @@ -776,7 +777,7 @@ nav#layout-mainmenu.navbar ul li.active,.mainmenu-collapsed li.active,nav#layout nav#layout-mainmenu.navbar ul li.active a,.mainmenu-collapsed li.active a,nav#layout-mainmenu.navbar ul li.highlight a,.mainmenu-collapsed li.highlight a{color:#ffffff !important} nav#layout-mainmenu.navbar ul li:hover,.mainmenu-collapsed li:hover{color:#ffffff;background:transparent} body.drag nav#layout-mainmenu.navbar ul.nav li:hover,body.drag .mainmenu-collapsed ul li:hover{color:#555555} -#layout-sidenav{background-color:#31495f;position:absolute;height:100%;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} +#layout-sidenav{position:absolute;height:100%;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} #layout-sidenav ul{position:relative;margin:0;padding:0;height:100%;overflow:hidden} #layout-sidenav ul,#layout-sidenav ul li:first-child a{-webkit-box-shadow:inset 0 6px 3px -3px rgba(0,0,0,0.1);box-shadow:inset 0 6px 3px -3px rgba(0,0,0,0.1)} #layout-sidenav ul:after{content:'';position:absolute;height:100%;top:0;right:0;width:10px;-webkit-box-shadow:inset -5px 0 3px rgba(0,0,0,0.1);box-shadow:inset -5px 0 3px rgba(0,0,0,0.1)} @@ -787,7 +788,7 @@ body.drag nav#layout-mainmenu.navbar ul.nav li:hover,body.drag .mainmenu-collaps #layout-sidenav ul li a i{color:rgba(255,255,255,0.35);display:block;margin-bottom:5px;font-size:28px} #layout-sidenav ul li.active a,#layout-sidenav ul li a:hover{color:#ffffff} #layout-sidenav ul li.active a i,#layout-sidenav ul li a:hover i{color:#ffffff} -#layout-sidenav ul li.active a{background:#1f99dc;text-shadow:1px 1px 0 rgba(0,0,0,0.2)} +#layout-sidenav ul li.active a{text-shadow:1px 1px 0 rgba(0,0,0,0.2)} #layout-sidenav ul li.active a > i{text-shadow:none} #layout-sidenav ul li span.counter{display:block;position:absolute;top:15px;right:15px;padding:2px 6px 3px 4px;background-color:#d9350f;color:#ffffff;font-size:11px;line-height:100%;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;opacity:1;filter:alpha(opacity=100);-webkit-transform:scale(1,);-ms-transform:scale(1,);transform:scale(1,);-webkit-transition:all 0.3s;transition:all 0.3s} #layout-sidenav ul li span.counter.empty{opacity:0;filter:alpha(opacity=0);-webkit-transform:scale(0,);-ms-transform:scale(0,);transform:scale(0,)} diff --git a/modules/backend/assets/less/controls/sidenav-tree.less b/modules/backend/assets/less/controls/sidenav-tree.less index 5bc9ea9c9..62169731d 100644 --- a/modules/backend/assets/less/controls/sidenav-tree.less +++ b/modules/backend/assets/less/controls/sidenav-tree.less @@ -11,7 +11,6 @@ .sidenav-tree { width: 300px; - background: @color-sidebarnav-bg; .control-toolbar { padding: 0; @@ -40,20 +39,19 @@ } div.scrollbar-thumb { - background: #2b3e50!important; + background: rgba(0,0,0,.2) !important; } ul.top-level > li { &[data-status=collapsed] { > div.group { - h3 { - &:before { - .transform(~'rotate(0deg) translate(2px, -2px)'); - } + h3:before { + .transform(~'rotate(0deg) translate(2px, -2px)'); + } - &:after { - display: none; - } + // Hide triangle + &:before, &:after { + display: none; } } @@ -65,10 +63,6 @@ > div.group { position: relative; - &:after { - .sidenav-tree-shadow-element(); - } - h3 { background: @color-sidebarnav-tree-group-bg; color: @color-sidebarnav-tree-group; @@ -94,13 +88,23 @@ } &:after { - .triangle(down, 15px, 8px, @color-sidebarnav-tree-group-bg); - position: absolute; - left: 15px; - bottom: -8px; - z-index: 101; + .sidenav-tree-shadow-element(); } } + + // Use two triangles to achieve the darkening effect + &:before, + &:after { + .triangle(down, 15px, 8px, @brand-secondary); + position: absolute; + left: 15px; + bottom: -8px; + z-index: 101; + } + + &:after { + .triangle(down, 15px, 8px, @color-sidebarnav-tree-group-bg); + } } > ul { @@ -154,7 +158,7 @@ } &.active a { - background: @color-sidebarnav-tree-active-bg; + //background: @color-sidebarnav-tree-active-bg; color: @color-sidebarnav-tree-active-text; span.header { diff --git a/modules/backend/assets/less/core/variables.less b/modules/backend/assets/less/core/variables.less index 6dde4bc63..8db02f968 100644 --- a/modules/backend/assets/less/core/variables.less +++ b/modules/backend/assets/less/core/variables.less @@ -29,9 +29,8 @@ @color-footer-border: #dfdfdf; @color-footer-text: #666666; -@color-sidebarnav-bg: #31495F; @color-sidebarnav-active-text: #ffffff; -@color-sidebarnav-active-bg: #1f99dc; +//@color-sidebarnav-active-bg: #1f99dc; @color-sidebarnav-active-icon: #ffffff; @color-sidebarnav-inactive-text: rgba(255,255,255,.35); @color-sidebarnav-inactive-icon: rgba(255,255,255,.35); @@ -39,13 +38,13 @@ @color-sidebarnav-counter-text: #ffffff; @color-sidebarnav-tree-group: #ecf0f1; -@color-sidebarnav-tree-group-bg: #2A3E51; +@color-sidebarnav-tree-group-bg: rgba(0,0,0,.15); @color-sidebarnav-tree-inactive-header: #ffffff; @color-sidebarnav-tree-inactive-desc: #BDC3C7; @color-sidebarnav-tree-inactive-text: #ffffff; @color-sidebarnav-tree-active-header: #ffffff; @color-sidebarnav-tree-inactive-bg: transparent; -@color-sidebarnav-tree-active-bg: #1F99DC; +//@color-sidebarnav-tree-active-bg: #1F99DC; @color-sidebarnav-tree-active-text: rgba(255,255,255,.91); @color-sidebarnav-tree-active-marker: #e67e22; @color-sidebarnav-back-link-bg: #2b3e50; diff --git a/modules/backend/assets/less/layout/flexlayout.less b/modules/backend/assets/less/layout/flexlayout.less index 0f3fe3d7c..461751a75 100644 --- a/modules/backend/assets/less/layout/flexlayout.less +++ b/modules/backend/assets/less/layout/flexlayout.less @@ -27,7 +27,7 @@ .flex-layout-column, .flex-layout-row { &.justify-center {.justify-content(center);} &.align-center { - .align-items(center); + .align-items(center); .align-content(center); } @@ -48,6 +48,7 @@ &.layout-container {max-width: none;} + // @deprecated Remove if year >= 2017 (3 lines below) &.width-100 {width: 100px;} &.width-200 {width: 200px;} &.width-300 {width: 300px;} diff --git a/modules/backend/assets/less/layout/layout.less b/modules/backend/assets/less/layout/layout.less index f1bbe99d7..fb1dfce97 100644 --- a/modules/backend/assets/less/layout/layout.less +++ b/modules/backend/assets/less/layout/layout.less @@ -72,6 +72,7 @@ body { vertical-align: top; height: 100%; + // @deprecated Remove if year >= 2017 (7 lines below) &.width-100 { width: 100px; } &.width-120 { width: 120px; } &.width-130 { width: 130px; } diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less index 3435efa20..879687cd9 100644 --- a/modules/backend/assets/less/layout/mainmenu.less +++ b/modules/backend/assets/less/layout/mainmenu.less @@ -2,7 +2,7 @@ // Top navigation bar // -------------------------------------------------- -@mainmenu-mode-tiles-height: 78px; +@mainmenu-mode-tile-height: 78px; @mainmenu-mode-inline-height: 60px; @mainmenu-mode-collapse-height: 45px; @@ -316,8 +316,8 @@ nav#layout-mainmenu.navbar-mode-inline { // Navbar (Tiles mode) // -nav#layout-mainmenu.navbar-mode-tiles { - .mainmenu-set-height(@mainmenu-mode-tiles-height); +nav#layout-mainmenu.navbar-mode-tile { + .mainmenu-set-height(@mainmenu-mode-tile-height); .mainmenu-navbar-tiles(); } diff --git a/modules/backend/assets/less/layout/sidenav.less b/modules/backend/assets/less/layout/sidenav.less index 3e611950a..c49145451 100644 --- a/modules/backend/assets/less/layout/sidenav.less +++ b/modules/backend/assets/less/layout/sidenav.less @@ -3,8 +3,6 @@ // -------------------------------------------------- #layout-sidenav { - - background-color: @color-sidebarnav-bg; position: absolute; height: 100%; width: 100%; @@ -71,7 +69,7 @@ } &.active a { - background: @color-sidebarnav-active-bg; + //background: @color-sidebarnav-active-bg; text-shadow: 1px 1px 0 rgba(0,0,0,.2); > i { text-shadow: none; diff --git a/modules/backend/lang/cs/lang.php b/modules/backend/lang/cs/lang.php index 70c662f40..96e009313 100644 --- a/modules/backend/lang/cs/lang.php +++ b/modules/backend/lang/cs/lang.php @@ -292,10 +292,9 @@ return [ 'app_tagline' => 'Motto aplikace', 'app_tagline_description' => 'Toto motto se zobrazí na přihlašovací stránce administrace.', 'colors' => 'Barvy', - 'primary_light' => 'Primární (světlá)', - 'primary_dark' => 'Primární (tmavá)', - 'secondary_light' => 'Sekundární (světlá)', - 'secondary_dark' => 'Sekundární (tmavá)', + 'primary_color' => 'Primární color', + 'secondary_color' => 'Sekundární color', + 'accent_color' => 'Accent color', 'styles' => 'Styly', 'custom_stylesheet' => 'Vlastní kaskádové styly' ], diff --git a/modules/backend/lang/el/lang.php b/modules/backend/lang/el/lang.php index e0b96299f..5ed74f0c1 100644 --- a/modules/backend/lang/el/lang.php +++ b/modules/backend/lang/el/lang.php @@ -292,10 +292,9 @@ return [ 'app_tagline' => 'Ετικέτα Εφαρμογής', 'app_tagline_description' => 'Αυτό το όνομα εμφανίζεται στην οθόνη σύνδεσης στο back-end.', 'colors' => 'Χρώματα', - 'primary_light' => 'Πρωτεύων (Ανοιχτό)', - 'primary_dark' => 'Πρωτεύων (Σκούρο)', - 'secondary_light' => 'Δευτερεύων (Ανοιχτό)', - 'secondary_dark' => 'Δευτερεύων (Σκούρο)', + 'primary_color' => 'Πρωτεύων color', + 'secondary_color' => 'Δευτερεύων color', + 'accent_color' => 'Accent color', 'styles' => 'Στυλ', 'custom_stylesheet' => 'Προσαρμοσμένα στυλ', ], diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index 0e0900416..0c1b21c5c 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -306,10 +306,9 @@ return [ 'app_tagline' => 'App Tagline', 'app_tagline_description' => 'This name is shown on the sign in screen for the back-end.', 'colors' => 'Colors', - 'primary_light' => 'Primary (Light)', - 'primary_dark' => 'Primary (Dark)', - 'secondary_light' => 'Secondary (Light)', - 'secondary_dark' => 'Secondary (Dark)', + 'primary_color' => 'Primary color', + 'secondary_color' => 'Secondary color', + 'accent_color' => 'Accent color', 'styles' => 'Styles', 'custom_stylesheet' => 'Custom stylesheet' ], diff --git a/modules/backend/lang/es/lang.php b/modules/backend/lang/es/lang.php index 488630b61..6f31c08df 100644 --- a/modules/backend/lang/es/lang.php +++ b/modules/backend/lang/es/lang.php @@ -295,10 +295,9 @@ return [ 'app_tagline' => 'Eslogan', 'app_tagline_description' => 'Se mostrará en la página de inicio de sesión del back-end.', 'colors' => 'Colores', - 'primary_light' => 'Primario (Claro)', - 'primary_dark' => 'Primario (Oscuro)', - 'secondary_light' => 'Secundario (Claro)', - 'secondary_dark' => 'Secundario (Oscuro)', + 'primary_color' => 'Primario color', + 'secondary_color' => 'Secundario color', + 'accent_color' => 'Accent color', 'styles' => 'Estilos', 'custom_stylesheet' => 'Hoja de estilo personalizada' ], diff --git a/modules/backend/lang/fa/lang.php b/modules/backend/lang/fa/lang.php index b3cb9332c..bee25c83a 100644 --- a/modules/backend/lang/fa/lang.php +++ b/modules/backend/lang/fa/lang.php @@ -303,10 +303,9 @@ return [ 'app_tagline' => 'شعار برنامه', 'app_tagline_description' => 'این شعار در قسمت ورود به بخش مدیریت نمایش داده می شود.', 'colors' => 'رنگ ها', - 'primary_light' => 'اصلی (روشن)', - 'primary_dark' => 'اصلی (تیره)', - 'secondary_light' => 'ثانویه (روشن)', - 'secondary_dark' => 'ثانویه (تیره)', + 'primary_color' => 'اصلی color', + 'secondary_color' => 'ثانویه color', + 'accent_color' => 'Accent color', 'styles' => 'شیوه نامه ها', 'custom_stylesheet' => 'شیوه نامه های سفارشی' ], diff --git a/modules/backend/lang/fr/lang.php b/modules/backend/lang/fr/lang.php index 87f65d8a1..96b58d964 100644 --- a/modules/backend/lang/fr/lang.php +++ b/modules/backend/lang/fr/lang.php @@ -290,10 +290,9 @@ return [ 'app_tagline' => 'Slogan de l’application', 'app_tagline_description' => 'Ce slogan est affiché sur la page d’inscription à l’interface d’administration.', 'colors' => 'Couleurs', - 'primary_light' => 'Primaire (Claire)', - 'primary_dark' => 'Primaire (Foncée)', - 'secondary_light' => 'Secondaire (Claire)', - 'secondary_dark' => 'Secondaire (Foncée)', + 'primary_color' => 'Primaire color', + 'secondary_color' => 'Secondaire color', + 'accent_color' => 'Accent color', 'styles' => 'Styles', 'custom_stylesheet' => 'Feuille de style personnalisée (CSS)' ], diff --git a/modules/backend/lang/hu/lang.php b/modules/backend/lang/hu/lang.php index 9ae63b015..04b9dd279 100644 --- a/modules/backend/lang/hu/lang.php +++ b/modules/backend/lang/hu/lang.php @@ -292,10 +292,9 @@ return [ 'app_tagline' => 'Weboldal szlogenje', 'app_tagline_description' => 'Ez a mondat látható a bejelentkező oldalon.', 'colors' => 'Színek', - 'primary_light' => 'Alap (világos)', - 'primary_dark' => 'Alap (sötét)', - 'secondary_light' => 'Másodlagos (világos)', - 'secondary_dark' => 'Másodlagos (sötét)', + 'primary_color' => 'Alap color', + 'secondary_color' => 'Másodlagos color', + 'accent_color' => 'Accent color', 'styles' => 'Stílusok', 'custom_stylesheet' => 'Egyéni megjelenés' ], diff --git a/modules/backend/lang/id/lang.php b/modules/backend/lang/id/lang.php index f858c4709..aaa810054 100644 --- a/modules/backend/lang/id/lang.php +++ b/modules/backend/lang/id/lang.php @@ -274,10 +274,9 @@ return [ 'app_tagline' => 'Slogan Apl', 'app_tagline_description' => 'Nama ini akan ditampilkan pada layar masuk back-end.', 'colors' => 'Warna', - 'primary_light' => 'Primer (Terang)', - 'primary_dark' => 'Primer (Gelap)', - 'secondary_light' => 'Sekunder (Terang)', - 'secondary_dark' => 'Sekunder (Gelap)', + 'primary_color' => 'Primer color', + 'secondary_color' => 'Sekunder color', + 'accent_color' => 'Accent color', 'styles' => 'Gaya', 'custom_stylesheet' => 'Lembar gaya ubah suai' ], diff --git a/modules/backend/lang/it/lang.php b/modules/backend/lang/it/lang.php index 62eb0733a..0f9f99703 100644 --- a/modules/backend/lang/it/lang.php +++ b/modules/backend/lang/it/lang.php @@ -287,10 +287,9 @@ return [ 'app_tagline' => 'Slogan dell\'applicazione', 'app_tagline_description' => 'Questo campo verrà visualizzato nella schermata di login del pannello di controllo.', 'colors' => 'Colori', - 'primary_light' => 'Principale (Chiaro)', - 'primary_dark' => 'Principale (Scuro)', - 'secondary_light' => 'Secondario (Chiaro)', - 'secondary_dark' => 'Secondario (Scuro)', + 'primary_color' => 'Principale color', + 'secondary_color' => 'Secondario color', + 'accent_color' => 'Accent color', 'styles' => 'Stili', 'custom_stylesheet' => 'Foglio di stile personalizzato' ], diff --git a/modules/backend/lang/ja/lang.php b/modules/backend/lang/ja/lang.php index bce7b076d..1f109acfb 100644 --- a/modules/backend/lang/ja/lang.php +++ b/modules/backend/lang/ja/lang.php @@ -270,10 +270,9 @@ return [ 'app_tagline' => 'アプリタグライン', 'app_tagline_description' => 'この名前はバックエンドのサインインページに表示されます。', 'colors' => '配色', - 'primary_light' => 'プライマリ (明るい)', - 'primary_dark' => 'プライマリ (暗い)', - 'secondary_light' => 'セカンダリ (明るい)', - 'secondary_dark' => 'セカンダリ (暗い)', + 'primary_color' => 'プライマリ color', + 'secondary_color' => 'セカンダリ color', + 'accent_color' => 'Accent color', 'styles' => 'スタイル', 'custom_stylesheet' => 'カスタムスタイルシート' ], diff --git a/modules/backend/lang/lv/lang.php b/modules/backend/lang/lv/lang.php index f904add5e..61f3ef8f9 100644 --- a/modules/backend/lang/lv/lang.php +++ b/modules/backend/lang/lv/lang.php @@ -292,10 +292,9 @@ return [ 'app_tagline' => 'Apraksts', 'app_tagline_description' => 'Šis apraksts tiek rādīts back-end auteintificēšanās lapā.', 'colors' => 'Krāsas', - 'primary_light' => 'Primārā (Gaiša)', - 'primary_dark' => 'Primārā (Tumša)', - 'secondary_light' => 'Sekundārā (Gaiša)', - 'secondary_dark' => 'Sekundārā (Tumša)', + 'primary_color' => 'Primārā color', + 'secondary_color' => 'Sekundārā color', + 'accent_color' => 'Accent color', 'styles' => 'Stili', 'custom_stylesheet' => 'Pielāgots css' ], diff --git a/modules/backend/lang/nb-no/lang.php b/modules/backend/lang/nb-no/lang.php index f0f3cc97a..6afddd05a 100644 --- a/modules/backend/lang/nb-no/lang.php +++ b/modules/backend/lang/nb-no/lang.php @@ -275,10 +275,9 @@ return [ 'app_tagline' => 'App Tagline', 'app_tagline_description' => 'Denne teksten vises på innloggingssiden backend.', 'colors' => 'Farger', - 'primary_light' => 'Primær (Lys)', - 'primary_dark' => 'Primær (Mørk)', - 'secondary_light' => 'Sekundær (Lys)', - 'secondary_dark' => 'Sekundær (Mørk)', + 'primary_color' => 'Primær color', + 'secondary_color' => 'Sekundær color', + 'accent_color' => 'Accent color', 'styles' => 'Stilsett', 'custom_stylesheet' => 'Eget stilsett' ], diff --git a/modules/backend/lang/nl/lang.php b/modules/backend/lang/nl/lang.php index a863e93f6..b8c362d2f 100644 --- a/modules/backend/lang/nl/lang.php +++ b/modules/backend/lang/nl/lang.php @@ -303,10 +303,9 @@ return [ 'app_tagline' => 'Applicatie slogan', 'app_tagline_description' => 'Deze slogan wordt weergegeven in het aanmeldvenster van de beheeromgeving.', 'colors' => 'Kleuren', - 'primary_light' => 'Primair (Licht)', - 'primary_dark' => 'Primair (Donker)', - 'secondary_light' => 'Secundair (Licht)', - 'secondary_dark' => 'Secundair (Donker)', + 'primary_color' => 'Primair color', + 'secondary_color' => 'Secundair color', + 'accent_color' => 'Accent color', 'styles' => 'Stijlen', 'custom_stylesheet' => 'Aangepaste stylesheet', ], diff --git a/modules/backend/lang/pl/lang.php b/modules/backend/lang/pl/lang.php index dea253e49..0e25d0df8 100644 --- a/modules/backend/lang/pl/lang.php +++ b/modules/backend/lang/pl/lang.php @@ -289,10 +289,9 @@ return [ 'app_tagline' => 'Podpis aplikacji', 'app_tagline_description' => 'Ten podpis jest wyświetlany na ekranie logowania do back-endu', 'colors' => 'Kolory', - 'primary_light' => 'Podstawowy (Jasny)', - 'primary_dark' => 'Podstawowy (Ciemny)', - 'secondary_light' => 'Dodatkowy (Jasny)', - 'secondary_dark' => 'Dodatkowy (Ciemny)', + 'primary_color' => 'Podstawowy color', + 'secondary_color' => 'Dodatkowy color', + 'accent_color' => 'Accent color', 'styles' => 'Style', 'custom_stylesheet' => 'Własne style' ], diff --git a/modules/backend/lang/pt-br/lang.php b/modules/backend/lang/pt-br/lang.php index 44066a241..4f2676f09 100644 --- a/modules/backend/lang/pt-br/lang.php +++ b/modules/backend/lang/pt-br/lang.php @@ -303,10 +303,9 @@ return [ 'app_tagline' => 'Slogan do Aplicativo', 'app_tagline_description' => 'Esta frase é mostrada na tela de login administrativo.', 'colors' => 'Cores', - 'primary_light' => 'Primária (Clara)', - 'primary_dark' => 'Primária (Escura)', - 'secondary_light' => 'Secundária (Clara)', - 'secondary_dark' => 'Secundária (Escura)', + 'primary_color' => 'Primária color', + 'secondary_color' => 'Secundária color', + 'accent_color' => 'Accent color', 'styles' => 'Estilos', 'custom_stylesheet' => 'CSS customizado', ], diff --git a/modules/backend/lang/ru/lang.php b/modules/backend/lang/ru/lang.php index b20688864..f51d77a9f 100644 --- a/modules/backend/lang/ru/lang.php +++ b/modules/backend/lang/ru/lang.php @@ -303,10 +303,9 @@ return [ 'app_tagline' => 'Слоган приложения', 'app_tagline_description' => 'Слоган будет отображаться на экране входа в панель управления.', 'colors' => 'Цвета', - 'primary_light' => 'Первичный (Светлый)', - 'primary_dark' => 'Первичный (Тёмный)', - 'secondary_light' => 'Вторичный (Светлый)', - 'secondary_dark' => 'Вторичный (Тёмный)', + 'primary_color' => 'Первичный color', + 'secondary_color' => 'Вторичный color', + 'accent_color' => 'Accent color', 'styles' => 'Стили', 'custom_stylesheet' => 'Пользовательские стили' ], diff --git a/modules/backend/lang/sv/lang.php b/modules/backend/lang/sv/lang.php index c7e49eb05..e1984bf84 100644 --- a/modules/backend/lang/sv/lang.php +++ b/modules/backend/lang/sv/lang.php @@ -292,10 +292,9 @@ return [ 'app_tagline' => 'Applikationstaggning', 'app_tagline_description' => 'Detta namn visas på inloggningsskärmen för back-end.', 'colors' => 'Färger', - 'primary_light' => 'Primär (Ljus)', - 'primary_dark' => 'Primär (Mörk)', - 'secondary_light' => 'Sekundär (Ljus)', - 'secondary_dark' => 'Sekundär (Mörk)', + 'primary_color' => 'Primär color', + 'secondary_color' => 'Sekundär color', + 'accent_color' => 'Accent color', 'styles' => 'Formatmallar', 'custom_stylesheet' => 'Anpassad formatmall' ], diff --git a/modules/backend/lang/tr/lang.php b/modules/backend/lang/tr/lang.php index 6862b4c72..fb2bc47d6 100644 --- a/modules/backend/lang/tr/lang.php +++ b/modules/backend/lang/tr/lang.php @@ -303,10 +303,9 @@ return [ 'app_tagline' => 'Site Mottosu', 'app_tagline_description' => 'Bu motto Yönetim Paneli giriş ekranında görüntülenecektir.', 'colors' => 'Renkler', - 'primary_light' => 'Ana Renk (Açık Ton)', - 'primary_dark' => 'Ana Renk (Koyu Ton)', - 'secondary_light' => 'İkincil Renk (Açık Ton)', - 'secondary_dark' => 'İkincil Renk (Koyu Ton)', + 'primary_color' => 'Ana Renk color', + 'secondary_color' => 'İkincil Renk color', + 'accent_color' => 'Accent color', 'styles' => 'Stiller', 'custom_stylesheet' => 'Özel stil - CSS' ], diff --git a/modules/backend/lang/zh-cn/lang.php b/modules/backend/lang/zh-cn/lang.php index 2c6379368..0abdb9457 100644 --- a/modules/backend/lang/zh-cn/lang.php +++ b/modules/backend/lang/zh-cn/lang.php @@ -286,10 +286,9 @@ return [ 'app_tagline' => '站点标语', 'app_tagline_description' => '标语显示在后台的登录界面.', 'colors' => '颜色', - 'primary_light' => '主要 (Light)', - 'primary_dark' => '主要 (Dark)', - 'secondary_light' => '次要 (Light)', - 'secondary_dark' => '次要 (Dark)', + 'primary_color' => '主要 color', + 'secondary_color' => '次要 color', + 'accent_color' => 'Accent color', 'styles' => '样式', 'custom_stylesheet' => '自定义样式' ], diff --git a/modules/backend/lang/zh-tw/lang.php b/modules/backend/lang/zh-tw/lang.php index c066d9eb2..885e3185f 100644 --- a/modules/backend/lang/zh-tw/lang.php +++ b/modules/backend/lang/zh-tw/lang.php @@ -275,10 +275,9 @@ return [ 'app_tagline' => '網站標語', 'app_tagline_description' => '標語顯示在管理介面的登入介面', 'colors' => '顏色', - 'primary_light' => '主要 (Light)', - 'primary_dark' => '主要 (Dark)', - 'secondary_light' => '次要 (Light)', - 'secondary_dark' => '次要 (Dark)', + 'primary_color' => '主要 color', + 'secondary_color' => '次要 color', + 'accent_color' => 'Accent color', 'styles' => '樣式', 'custom_stylesheet' => '自訂樣式' ], diff --git a/modules/backend/layouts/_mainmenu.htm b/modules/backend/layouts/_mainmenu.htm index 43064072a..347698ad5 100644 --- a/modules/backend/layouts/_mainmenu.htm +++ b/modules/backend/layouts/_mainmenu.htm @@ -1,7 +1,7 @@ listItems('mysettings'); - $navbarMode = 'navbar-mode-inline'; // Supported: inline, tiles, collapse. + $navbarMode = 'navbar-mode-inline'; // Supported: inline, tile, collapse. ?>