From 997a032849effc5e606905cdb98e0610631d3931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1sztor=20G=C3=A1bor?= Date: Sat, 18 Apr 2015 22:12:56 +0200 Subject: [PATCH 1/2] Minor style fixes --- .../backend/assets/less/controls/popover.less | 2 ++ .../backend/models/brandsettings/custom.less | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/modules/backend/assets/less/controls/popover.less b/modules/backend/assets/less/controls/popover.less index 852b6d746..3df5e9f30 100644 --- a/modules/backend/assets/less/controls/popover.less +++ b/modules/backend/assets/less/controls/popover.less @@ -41,6 +41,8 @@ div.control-popover { } &.placement-bottom > div { + border: 1px solid @color-popover-border; + &:after { .triangle(up, 15px, 8px, @color-popover-bg); left: 15px; diff --git a/modules/backend/models/brandsettings/custom.less b/modules/backend/models/brandsettings/custom.less index 52ce04dbe..69fb79f06 100644 --- a/modules/backend/models/brandsettings/custom.less +++ b/modules/backend/models/brandsettings/custom.less @@ -128,6 +128,16 @@ table.table.data { } } + &.secondary { + &.content-tabs { + &.primary-collapsed { + > div > ul.nav-tabs { + background: @color-fancy-form-tabless-fields-bg; + } + } + } + } + &.primary { > div > ul.nav-tabs { &.master-area { @@ -203,6 +213,32 @@ div.control-componentlist { } } +.nav.selector-group { + li { + &.active { + border-color: @color-list-active-border; + } + } +} + +// +// TreeView +// + +.control-treeview { + ol { + > li { + &.active { + > div { + &:after { + background: @color-list-active-border; + } + } + } + } + } +} + // // Sidenav Tree // From dd0c82544a22fa83f7914e986dc5bdbeb0851598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1sztor=20G=C3=A1bor?= Date: Sat, 18 Apr 2015 22:22:26 +0200 Subject: [PATCH 2/2] Fixes in richeditor: z-index --- modules/backend/assets/css/controls.css | 1 + .../backend/formwidgets/richeditor/assets/css/richeditor.css | 4 ++-- .../formwidgets/richeditor/assets/less/richeditor.less | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/backend/assets/css/controls.css b/modules/backend/assets/css/controls.css index 15f922e96..55fa2ebd5 100644 --- a/modules/backend/assets/css/controls.css +++ b/modules/backend/assets/css/controls.css @@ -786,6 +786,7 @@ div.control-popover > div{position:relative;background:#ffffff;-webkit-box-shado div.control-popover > div:after,div.control-popover > div:before{position:absolute} div.control-popover > div:after{z-index:601} div.control-popover > div:before{z-index:600} +div.control-popover.placement-bottom > div{border:1px solid #949ea6} div.control-popover.placement-bottom > div:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-bottom:8px solid #ffffff;left:15px;top:-8px} div.control-popover.placement-bottom > div:before{content:'';display:block;width:0;height:0;border-left:8.5px solid transparent;border-right:8.5px solid transparent;border-bottom:9px solid #949ea6;left:14px;top:-9px} div.control-popover.placement-top > div:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-top:8px solid #ffffff;border-bottom-width:0;left:15px;bottom:-8px} diff --git a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css index a0d61624d..f4f9db35d 100644 --- a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css +++ b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css @@ -247,9 +247,9 @@ to{background-position:0 0} .redactor-box{margin-bottom:0} .redactor-box iframe{border:none} .redactor-box-fullscreen{z-index:715 !important} -.redactor-toolbar,.redactor-dropdown{z-index:710 !important} +.redactor-dropdown{z-index:725 !important} #redactor-modal-overlay,#redactor-modal-box,#redactor-modal{z-index:720 !important} -.redactor-toolbar{background:#dddddd;-webkit-box-shadow:none;box-shadow:none} +.redactor-toolbar{background:#dddddd;-webkit-box-shadow:none;box-shadow:none;z-index:410 !important} .redactor-toolbar li.redactor-btn-right{float:right;margin-right:2px} .redactor-toolbar li a{color:#404040;font-size:14px;width:20px;line-height:20px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} .redactor-toolbar li a:hover{background-color:#999999;color:#ffffff} diff --git a/modules/backend/formwidgets/richeditor/assets/less/richeditor.less b/modules/backend/formwidgets/richeditor/assets/less/richeditor.less index edd065d4b..6ce7c1c90 100644 --- a/modules/backend/formwidgets/richeditor/assets/less/richeditor.less +++ b/modules/backend/formwidgets/richeditor/assets/less/richeditor.less @@ -49,9 +49,9 @@ .redactor-box-fullscreen { z-index: @richeditor-zindex + 115 !important; } -.redactor-toolbar, + .redactor-dropdown { - z-index: @richeditor-zindex + 110 !important; + z-index: @richeditor-zindex + 125 !important; } #redactor-modal-overlay, #redactor-modal-box, @@ -62,6 +62,7 @@ .redactor-toolbar { background: @color-richeditor-toolbar; .box-shadow(none); + z-index: 410 !important; & li.redactor-btn-right { float: right;