diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index e4a0c1e27..2e7d6293f 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -234,10 +234,10 @@ .control-filelist.filelist-hero ul li > div.controls > a.control{width:16px;height:23px;background:transparent;overflow:hidden;display:inline-block;color:#ffffff !important;padding:0} .control-filelist.filelist-hero ul li > div.controls > a.control:before{font-size:17px} .control-filelist.filelist-hero ul li:hover > div.controls{display:block} -.control-filelist.filelist-hero ul li.separator{position:relative;border-bottom:1px solid #95a5a6;padding:17px 15px 18px 15px} +.control-filelist.filelist-hero ul li.separator{position:relative;border-bottom:1px solid #95a5a6;padding:12px 15px 13px 15px} .control-filelist.filelist-hero ul li.separator:before{z-index:31;content:'';display:block;width:0;height:0;border-left:9.5px solid transparent;border-right:9.5px solid transparent;border-top:11px solid #ffffff;border-bottom-width:0;position:absolute;left:13px;bottom:-8px} .control-filelist.filelist-hero ul li.separator:after{z-index:30;content:'';display:block;width:0;height:0;border-left:8.5px solid transparent;border-right:8.5px solid transparent;border-top:9px solid #95a5a6;border-bottom-width:0;position:absolute;left:14px;bottom:-9px} -.control-filelist.filelist-hero ul li.separator h5{color:#2b3e50;font-size:15px;margin:0;font-weight:bold;padding:0} +.control-filelist.filelist-hero ul li.separator h5{color:#2b3e50;font-size:14px;margin:0;font-weight:normal;padding:0} .control-filelist.filelist-hero ul > li.group > ul > li > a{padding-left:66px} .control-filelist.filelist-hero.single-level ul li:hover{background:#58b6f7} .control-filelist.filelist-hero.single-level ul li:hover > a{background:#58b6f7;border-bottom:1px solid #58b6f7 !important} @@ -861,8 +861,8 @@ body.outer .layout > .layout-row > .layout-cell .outer-form-container .horizonta .fancy-layout .control-tabs.master-tabs > div > div.tabs-container,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container{background:#d35400;padding-left:20px;padding-right:20px} .fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs{margin-left:-8px} .fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li{margin-left:-5px;top:1px;padding-top:3px} -.fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li span.tab-close,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li span.tab-close{top:15px;right:-3px;left:auto;z-index:110} -.fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li span.tab-close i,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li span.tab-close i{top:4px;right:1px;color:rgba(255,255,255,0.3) !important;font-style:normal;font-weight:bold} +.fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li span.tab-close,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li span.tab-close{top:14px;right:-3px;left:auto;z-index:110} +.fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li span.tab-close i,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li span.tab-close i{top:4px;right:1px;color:rgba(255,255,255,0.3) !important;font-style:normal;font-weight:bold;font-size:16px} .fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li span.tab-close i:hover,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li span.tab-close i:hover{color:#ffffff !important} .fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li a,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li a{border-bottom:none;background:transparent;font-size:14px;color:rgba(255,255,255,0.35);padding:6px 0 0 24px!important;overflow:visible} .fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li a > span.title,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li a > span.title{position:relative;display:inline-block;padding:12px 5px 0 5px;height:38px;font-size:14px;z-index:100;background-color:#b9530f} @@ -877,7 +877,7 @@ body.outer .layout > .layout-row > .layout-cell .outer-form-container .horizonta .fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li.active a > span.title,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li.active a > span.title{background-color:#e67e22;z-index:105} .fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li.active a > span.title:before,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li.active a > span.title:before{z-index:107;background-color:#e67e22} .fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li.active a > span.title:after,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li.active a > span.title:after{background-color:#e67e22;z-index:107} -.fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li[data-modified] span.tab-close i,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li[data-modified] span.tab-close i{top:3px;font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0} +.fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li[data-modified] span.tab-close i,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li[data-modified] span.tab-close i{top:5px;font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0} .fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li[data-modified] span.tab-close i:before,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li[data-modified] span.tab-close i:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f111";font-size:9px} .fancy-layout .control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li:first-child,.fancy-layout.control-tabs.master-tabs > div > div.tabs-container > ul.nav-tabs > li:first-child{margin-left:0} .fancy-layout .control-tabs.master-tabs[data-closable] > div > div.tabs-container > ul.nav-tabs > li a > span.title,.fancy-layout.control-tabs.master-tabs[data-closable] > div > div.tabs-container > ul.nav-tabs > li a > span.title{padding-right:10px} diff --git a/modules/backend/assets/less/controls/filelist.less b/modules/backend/assets/less/controls/filelist.less index d7b152f12..1f2030e23 100644 --- a/modules/backend/assets/less/controls/filelist.less +++ b/modules/backend/assets/less/controls/filelist.less @@ -351,7 +351,7 @@ &.separator { position: relative; border-bottom: 1px solid #95a5a6; - padding: 17px 15px 18px 15px; + padding: 12px 15px 13px 15px; &:before { z-index: 31; @@ -371,9 +371,9 @@ h5 { color: #2b3e50; - font-size: 15px; + font-size: @font-size-base; margin: 0; - font-weight: bold; + font-weight: normal; padding: 0; } } diff --git a/modules/backend/assets/less/layout/fancylayout.less b/modules/backend/assets/less/layout/fancylayout.less index 779777e8c..a1e8fec03 100644 --- a/modules/backend/assets/less/layout/fancylayout.less +++ b/modules/backend/assets/less/layout/fancylayout.less @@ -59,7 +59,7 @@ padding-top: 3px; span.tab-close{ - top: 15px; + top: 14px; right: -3px; left: auto; z-index: 110; @@ -70,6 +70,7 @@ color: rgba(255, 255, 255, 0.3) !important; font-style: normal; font-weight: bold; + font-size: 16px; &:hover { color: @color-fancy-master-tabs-active-text !important; } } @@ -160,7 +161,7 @@ &[data-modified] { span.tab-close i { - top: 3px; + top: 5px; .hide-text(); &:before { diff --git a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css index 27489707c..c8821406a 100755 --- a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css +++ b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css @@ -30,7 +30,7 @@ iframe.fr-iframe{width:100%;border:none;position:relative;display:block;z-index: .fr-box.fr-basic.fr-bottom .fr-wrapper{border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;border-bottom:0;-webkit-box-shadow:0 -1px 3px rgba(0,0,0,0.12),0 -1px 2px rgba(0,0,0,0.24);-moz-box-shadow:0 -1px 3px rgba(0,0,0,0.12),0 -1px 2px rgba(0,0,0,0.24);box-shadow:0 -1px 3px rgba(0,0,0,0.12),0 -1px 2px rgba(0,0,0,0.24)} .fr-tooltip{position:absolute;top:0;left:0;padding:0 8px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;-webkit-box-shadow:0 3px 6px rgba(0,0,0,0.16),0 2px 4px rgba(0,0,0,0.23);-moz-box-shadow:0 3px 6px rgba(0,0,0,0.16),0 2px 4px rgba(0,0,0,0.23);box-shadow:0 3px 6px rgba(0,0,0,0.16),0 2px 4px rgba(0,0,0,0.23);background:#34495e;color:#ffffff;font-size:12px;line-height:22px;font-family:sans-serif;transition:opacity 0.2s ease 0s;-webkit-transition:opacity 0.2s ease 0s;-moz-transition:opacity 0.2s ease 0s;-ms-transition:opacity 0.2s ease 0s;-o-transition:opacity 0.2s ease 0s;filter:alpha(opacity=0);-webkit-opacity:0;-moz-opacity:0;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";left:-3000px;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;z-index:9997} .fr-tooltip.fr-visible{filter:alpha(opacity=100);-webkit-opacity:1;-moz-opacity:1;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"} -.fr-toolbar{color:#222222;background:#ffffff;position:relative;z-index:4;font-family:sans-serif;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;padding:0 2px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);text-align:left;border:0px;border-top:1px solid #bdbdbd} +.fr-toolbar{color:#222222;background:#f9f9f9;position:relative;z-index:4;font-family:sans-serif;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;padding:0 2px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);text-align:left;border:0px;border-top:1px solid #bdbdbd} .fr-toolbar:before,.fr-toolbar:after{content:" ";display:table} .fr-toolbar:after{clear:both} .fr-toolbar::after{clear:both;display:block;content:""} @@ -49,18 +49,18 @@ iframe.fr-iframe{width:100%;border:none;position:relative;display:block;z-index: .fr-rtl .fr-separator{float:right} .fr-toolbar.fr-inline .fr-separator.fr-hs{float:none} .fr-toolbar.fr-inline .fr-separator.fr-vs{float:none;display:inline-block} -.fr-toolbar .fr-command.fr-btn,.fr-popup .fr-command.fr-btn{background:transparent;color:rgba(0,0,0,0.5);-moz-outline:0;outline:0;border:0;line-height:1;cursor:pointer;text-align:left;margin:0px 2px;transition:background 0.2s ease 0s;-webkit-transition:background 0.2s ease 0s;-moz-transition:background 0.2s ease 0s;-ms-transition:background 0.2s ease 0s;-o-transition:background 0.2s ease 0s;border-radius:0;-moz-border-radius:0;-webkit-border-radius:0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;z-index:2;position:relative;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;text-decoration:none;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;float:left;padding:0;width:38px;height:37px} +.fr-toolbar .fr-command.fr-btn,.fr-popup .fr-command.fr-btn{background:transparent;color:rgba(64,82,97,0.6);-moz-outline:0;outline:0;border:0;line-height:1;cursor:pointer;text-align:left;margin:0px 2px;transition:background 0.2s ease 0s;-webkit-transition:background 0.2s ease 0s;-moz-transition:background 0.2s ease 0s;-ms-transition:background 0.2s ease 0s;-o-transition:background 0.2s ease 0s;border-radius:0;-moz-border-radius:0;-webkit-border-radius:0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;z-index:2;position:relative;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;text-decoration:none;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;float:left;padding:0;width:38px;height:37px} .fr-toolbar .fr-command.fr-btn i,.fr-popup .fr-command.fr-btn i{display:block;font-size:15px;width:15px;margin:11px 11.5px;text-align:center;float:none} .fr-toolbar .fr-command.fr-btn span,.fr-popup .fr-command.fr-btn span{font-size:14px;display:block;line-height:14px;min-width:38px;float:left;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;height:15px;font-weight:bold} .fr-toolbar .fr-command.fr-btn img,.fr-popup .fr-command.fr-btn img{margin:11px 11.5px;width:15px} -.fr-toolbar .fr-command.fr-btn.fr-active,.fr-popup .fr-command.fr-btn.fr-active{color:#222222;background:transparent} +.fr-toolbar .fr-command.fr-btn.fr-active,.fr-popup .fr-command.fr-btn.fr-active{color:#000000;background:transparent} .fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-selection,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-selection{width:auto} .fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-selection span,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-selection span{font-weight:normal} .fr-toolbar .fr-command.fr-btn.fr-dropdown i,.fr-popup .fr-command.fr-btn.fr-dropdown i,.fr-toolbar .fr-command.fr-btn.fr-dropdown span,.fr-popup .fr-command.fr-btn.fr-dropdown span,.fr-toolbar .fr-command.fr-btn.fr-dropdown img,.fr-popup .fr-command.fr-btn.fr-dropdown img{margin-left:7.5px;margin-right:15.5px} -.fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-active,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-active{color:rgba(0,0,0,0.5);background:#d6d6d6} -.fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-active:hover,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-active:hover,.fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-active:focus,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-active:focus{background:#d6d6d6 !important;color:rgba(0,0,0,0.5) !important} -.fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-active:hover::after,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-active:hover::after,.fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-active:focus::after,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-active:focus::after{border-top-color:rgba(0,0,0,0.5) !important} -.fr-toolbar .fr-command.fr-btn.fr-dropdown::after,.fr-popup .fr-command.fr-btn.fr-dropdown::after{position:absolute;width:0;height:0;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid rgba(0,0,0,0.5);right:3.75px;top:16.5px;content:""} +.fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-active,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-active{color:rgba(64,82,97,0.6);background:#d6d6d6} +.fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-active:hover,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-active:hover,.fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-active:focus,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-active:focus{background:#d6d6d6 !important;color:rgba(64,82,97,0.6) !important} +.fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-active:hover::after,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-active:hover::after,.fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-active:focus::after,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-active:focus::after{border-top-color:rgba(64,82,97,0.6) !important} +.fr-toolbar .fr-command.fr-btn.fr-dropdown::after,.fr-popup .fr-command.fr-btn.fr-dropdown::after{position:absolute;width:0;height:0;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid rgba(64,82,97,0.6);right:3.75px;top:16.5px;content:""} .fr-toolbar .fr-command.fr-btn.fr-disabled,.fr-popup .fr-command.fr-btn.fr-disabled{color:#bdbdbd;cursor:default} .fr-toolbar .fr-command.fr-btn.fr-disabled::after,.fr-popup .fr-command.fr-btn.fr-disabled::after{border-top-color:#bdbdbd !important} .fr-toolbar .fr-command.fr-btn.fr-hidden,.fr-popup .fr-command.fr-btn.fr-hidden{display:none} @@ -70,14 +70,14 @@ iframe.fr-iframe{width:100%;border:none;position:relative;display:block;z-index: .fr-toolbar.fr-inline .fr-command.fr-btn{float:none} .fr-desktop .fr-command:hover,.fr-desktop .fr-command:focus{color:#222222;background:#ebebeb} .fr-desktop .fr-command:hover::after,.fr-desktop .fr-command:focus::after{border-top-color:#222222 !important} -.fr-desktop .fr-command.fr-selected{color:rgba(0,0,0,0.5);background:#d6d6d6} +.fr-desktop .fr-command.fr-selected{color:rgba(64,82,97,0.6);background:#d6d6d6} .fr-desktop .fr-command.fr-active:hover,.fr-desktop .fr-command.fr-active:focus{color:#1e88e5;background:#ebebeb} .fr-desktop .fr-command.fr-active.fr-selected{color:#1e88e5;background:#d6d6d6} .fr-desktop .fr-command.fr-disabled:hover,.fr-desktop .fr-command.fr-disabled:focus,.fr-desktop .fr-command.fr-disabled.fr-selected{background:transparent} .fr-desktop.fr-disabled .fr-command:hover,.fr-desktop.fr-disabled .fr-command:focus,.fr-desktop.fr-disabled .fr-command.fr-selected{background:transparent} .fr-toolbar.fr-mobile .fr-command.fr-blink,.fr-popup.fr-mobile .fr-command.fr-blink{background:transparent} .fr-command.fr-btn + .fr-dropdown-menu{display:inline-block;position:absolute;right:auto;bottom:auto;height:auto;-webkit-box-shadow:0 3px 6px rgba(0,0,0,0.16),0 2px 4px rgba(0,0,0,0.23);-moz-box-shadow:0 3px 6px rgba(0,0,0,0.16),0 2px 4px rgba(0,0,0,0.23);box-shadow:0 3px 6px rgba(0,0,0,0.16),0 2px 4px rgba(0,0,0,0.23);z-index:3;-webkit-overflow-scrolling:touch;overflow:hidden;border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;-webkit-border-radius:0 0 3px 3px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box} -.fr-command.fr-btn + .fr-dropdown-menu .fr-dropdown-wrapper{background:#ffffff;-webkit-box-shadow:0 3px 6px rgba(0,0,0,0.16),0 2px 4px rgba(0,0,0,0.23);-moz-box-shadow:0 3px 6px rgba(0,0,0,0.16),0 2px 4px rgba(0,0,0,0.23);box-shadow:0 3px 6px rgba(0,0,0,0.16),0 2px 4px rgba(0,0,0,0.23);padding:0;margin:auto;display:inline-block;text-align:left;position:relative;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;transition:max-height 0.2s ease 0s;-webkit-transition:max-height 0.2s ease 0s;-moz-transition:max-height 0.2s ease 0s;-ms-transition:max-height 0.2s ease 0s;-o-transition:max-height 0.2s ease 0s;margin-top:0;float:left;max-height:0;height:0;margin-top:0 !important} +.fr-command.fr-btn + .fr-dropdown-menu .fr-dropdown-wrapper{background:#f9f9f9;-webkit-box-shadow:0 3px 6px rgba(0,0,0,0.16),0 2px 4px rgba(0,0,0,0.23);-moz-box-shadow:0 3px 6px rgba(0,0,0,0.16),0 2px 4px rgba(0,0,0,0.23);box-shadow:0 3px 6px rgba(0,0,0,0.16),0 2px 4px rgba(0,0,0,0.23);padding:0;margin:auto;display:inline-block;text-align:left;position:relative;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;transition:max-height 0.2s ease 0s;-webkit-transition:max-height 0.2s ease 0s;-moz-transition:max-height 0.2s ease 0s;-ms-transition:max-height 0.2s ease 0s;-o-transition:max-height 0.2s ease 0s;margin-top:0;float:left;max-height:0;height:0;margin-top:0 !important} .fr-command.fr-btn + .fr-dropdown-menu .fr-dropdown-wrapper .fr-dropdown-content{overflow:auto;position:relative;max-height:275px} .fr-command.fr-btn + .fr-dropdown-menu .fr-dropdown-wrapper .fr-dropdown-content ul.fr-dropdown-list{list-style-type:none;margin:0;padding:0} .fr-command.fr-btn + .fr-dropdown-menu .fr-dropdown-wrapper .fr-dropdown-content ul.fr-dropdown-list li{padding:0;margin:0;font-size:15px} @@ -88,7 +88,7 @@ iframe.fr-iframe{width:100%;border:none;position:relative;display:block;z-index: .fr-command.fr-btn.fr-active + .fr-dropdown-menu .fr-dropdown-wrapper{height:auto;max-height:275px} .fr-bottom > .fr-command.fr-btn + .fr-dropdown-menu{border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;-webkit-box-shadow:0 -3px 6px rgba(0,0,0,0.16),0 -2px 4px rgba(0,0,0,0.23);-moz-box-shadow:0 -3px 6px rgba(0,0,0,0.16),0 -2px 4px rgba(0,0,0,0.23);box-shadow:0 -3px 6px rgba(0,0,0,0.16),0 -2px 4px rgba(0,0,0,0.23)} .fr-toolbar.fr-rtl .fr-dropdown-wrapper,.fr-popup.fr-rtl .fr-dropdown-wrapper{text-align:right !important} -.fr-popup{position:absolute;display:none;color:#222222;background:#ffffff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;font-family:sans-serif;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;margin-top:10px;z-index:9995;text-align:left;border:0px;border-top:1px solid #bdbdbd} +.fr-popup{position:absolute;display:none;color:#222222;background:#f9f9f9;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;font-family:sans-serif;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;margin-top:10px;z-index:9995;text-align:left;border:0px;border-top:1px solid #bdbdbd} .fr-popup.fr-above{margin-top:-10px;border-top:0;border-bottom:1px solid #bdbdbd;-webkit-box-shadow:0 -1px 3px rgba(0,0,0,0.12),0 -1px 2px rgba(0,0,0,0.24);-moz-box-shadow:0 -1px 3px rgba(0,0,0,0.12),0 -1px 2px rgba(0,0,0,0.24);box-shadow:0 -1px 3px rgba(0,0,0,0.12),0 -1px 2px rgba(0,0,0,0.24)} .fr-popup.fr-active{display:block} .fr-popup.fr-hidden{filter:alpha(opacity=0);-webkit-opacity:0;-moz-opacity:0;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"} @@ -215,7 +215,7 @@ textarea.fr-code{display:none;width:100%;resize:none;-moz-resize:none;-webkit-re .fr-box.fr-code-view .fr-element,.fr-box.fr-code-view .fr-placeholder,.fr-box.fr-code-view .fr-iframe{display:none} .fr-box.fr-code-view .CodeMirror{display:block} .fr-box.fr-inline.fr-code-view .fr-command.fr-btn.html-switch{display:block} -.fr-box.fr-inline .fr-command.fr-btn.html-switch{position:absolute;top:0;right:0;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);display:none;background:#ffffff;color:rgba(0,0,0,0.5);-moz-outline:0;outline:0;border:0;line-height:1;cursor:pointer;text-align:left;padding:11px 11.5px;transition:background 0.2s ease 0s;-webkit-transition:background 0.2s ease 0s;-moz-transition:background 0.2s ease 0s;-ms-transition:background 0.2s ease 0s;-o-transition:background 0.2s ease 0s;border-radius:0;-moz-border-radius:0;-webkit-border-radius:0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;z-index:2;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;text-decoration:none;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none} +.fr-box.fr-inline .fr-command.fr-btn.html-switch{position:absolute;top:0;right:0;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);box-shadow:0 1px 3px rgba(0,0,0,0.12),0 1px 2px rgba(0,0,0,0.24);display:none;background:#ffffff;color:rgba(64,82,97,0.6);-moz-outline:0;outline:0;border:0;line-height:1;cursor:pointer;text-align:left;padding:11px 11.5px;transition:background 0.2s ease 0s;-webkit-transition:background 0.2s ease 0s;-moz-transition:background 0.2s ease 0s;-ms-transition:background 0.2s ease 0s;-o-transition:background 0.2s ease 0s;border-radius:0;-moz-border-radius:0;-webkit-border-radius:0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;z-index:2;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;text-decoration:none;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none} .fr-box.fr-inline .fr-command.fr-btn.html-switch i{font-size:15px;width:15px;text-align:center} .fr-box.fr-inline .fr-command.fr-btn.html-switch.fr-desktop:hover{background:#ebebeb} .fr-file-upload-layer{border:dashed 2px #bdbdbd;padding:25px 0;position:relative;font-size:14px;letter-spacing:1px;line-height:140%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;text-align:center} @@ -368,10 +368,10 @@ to{left:100%} .fr-box .ace_editor{position:absolute;top:0;bottom:0;left:0;right:0;margin:0} .fr-box.fr-code-view .ace_editor{display:block} .fr-command.fr-btn[data-cmd=fullscreen]{float:right} -.fr-toolbar{border-top-color:transparent} +.fr-toolbar{border-top-color:transparent;background:#f2f2f2} .fr-popup.fr-desktop .fr-arrow,.fr-toolbar.fr-inline.fr-desktop .fr-arrow{top:-7px} .fr-popup.fr-desktop.fr-above .fr-arrow,.fr-toolbar.fr-inline.fr-desktop.fr-above .fr-arrow{bottom:-7px} -.fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-active,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-active{color:#222222} +.fr-toolbar .fr-command.fr-btn.fr-dropdown.fr-active,.fr-popup .fr-command.fr-btn.fr-dropdown.fr-active{color:#000000} .fr-toolbar.fr-bottom,.fr-toolbar.fr-top{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-bottom:2px solid #d4d8da !important} .field-flush .field-richeditor,.field-flush .field-richeditor.editor-focus{border:none} .field-richeditor{border:1px solid #d1d6d9;-webkit-box-shadow:inset 0 1px 0 rgba(209,214,217,0.25),0 1px 0 rgba(255,255,255,.5);-moz-box-shadow:inset 0 1px 0 rgba(209,214,217,0.25),0 1px 0 rgba(255,255,255,.5);box-shadow:inset 0 1px 0 rgba(209,214,217,0.25),0 1px 0 rgba(255,255,255,.5);border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s;-webkit-transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s;-moz-transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s;-ms-transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s;-o-transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s} diff --git a/modules/backend/formwidgets/richeditor/assets/less/_froala.less b/modules/backend/formwidgets/richeditor/assets/less/_froala.less index 8763f98e4..9ca52cc8d 100644 --- a/modules/backend/formwidgets/richeditor/assets/less/_froala.less +++ b/modules/backend/formwidgets/richeditor/assets/less/_froala.less @@ -47,6 +47,7 @@ .fr-toolbar { border-top-color: transparent; + background: #f2f2f2; } .fr-popup.fr-desktop, diff --git a/modules/backend/formwidgets/richeditor/assets/less/richeditor.less b/modules/backend/formwidgets/richeditor/assets/less/richeditor.less index 2f9ccf2ec..9ddfe55ae 100755 --- a/modules/backend/formwidgets/richeditor/assets/less/richeditor.less +++ b/modules/backend/formwidgets/richeditor/assets/less/richeditor.less @@ -36,11 +36,12 @@ @tooltip-bg: #34495e; // Taken from toolbar.variables.less @tooltip-font-size: @font-size-small; @arrow-size: 7px; +@ui-bg: #f9f9f9; @ui-border-color: @input-border-color; @ui-border-top: 1px solid @ui-border-color; @editor-padding: 20px; -@btn-text: rgba(0,0,0,.5); -@btn-active-text: #222; +@btn-text: fade(@btn-secondary-color, 60%); +@btn-active-text: #000; // // Rich Editor diff --git a/modules/cms/assets/css/october.components.css b/modules/cms/assets/css/october.components.css index 0c41e4780..3312079af 100644 --- a/modules/cms/assets/css/october.components.css +++ b/modules/cms/assets/css/october.components.css @@ -28,7 +28,7 @@ div.control-componentlist div.components div.layout-cell > div:before { position: absolute; font-size: 16px; left: 15px; - top: 8px; + top: 7px; opacity: 0.7; filter: alpha(opacity=70); } @@ -154,6 +154,14 @@ div.control-componentlist div.components div.layout-cell:nth-child(2n) > div:aft top: auto; bottom: 5px; } +div.control-componentlist div.components div.layout-cell:first-child > div.popover-highlight { + border-bottom-left-radius: 3px; + border-top-left-radius: 3px; +} +div.control-componentlist div.components div.layout-cell:last-child > div.popover-highlight { + border-bottom-right-radius: 3px; + border-top-right-radius: 3px; +} div.control-componentlist div.components div.layout-cell > div { -webkit-transform: translate(0, 0); -ms-transform: translate(0, 0); @@ -207,14 +215,15 @@ div.control-componentlist div.components div.layout-cell > div a.remove { display: inline-block; top: 1px; right: 5px; - color: #475354; - font-size: 14px; + color: #000000; + font-size: 17px; + font-weight: bold; opacity: 0.3; filter: alpha(opacity=30); } div.control-componentlist div.components div.layout-cell > div a.remove:hover { - opacity: 1; - filter: alpha(opacity=100); + opacity: 0.5; + filter: alpha(opacity=50); text-decoration: none; } div.control-componentlist div.components div.layout-cell > div:hover a.remove { diff --git a/modules/cms/assets/less/october.components.less b/modules/cms/assets/less/october.components.less index 725e8222f..5e6d3d42b 100644 --- a/modules/cms/assets/less/october.components.less +++ b/modules/cms/assets/less/october.components.less @@ -51,7 +51,7 @@ div.control-componentlist div.components div.layout-cell { position: absolute; font-size: 16px; left: 15px; - top: 8px; + top: 7px; .opacity(0.7); } @@ -161,6 +161,18 @@ div.control-componentlist { bottom: 5px; } + &:first-child { + > div.popover-highlight { + .border-left-radius(3px); + } + } + + &:last-child { + > div.popover-highlight { + .border-right-radius(3px); + } + } + > div { .translate(0, 0); .transition-transform(0.2s); @@ -217,12 +229,13 @@ div.control-componentlist { display: inline-block; top: 1px; right: 5px; - color: @color-component-text; - font-size: 14px; - .opacity(0.3); + color: @close-color; + font-size: 17px; + font-weight: @close-font-weight; + .opacity(.3); &:hover { - .opacity(1); + .opacity(.5); text-decoration: none; } } diff --git a/modules/system/assets/ui/less/button.base.less b/modules/system/assets/ui/less/button.base.less index ebe3774f3..d3a2ede0b 100644 --- a/modules/system/assets/ui/less/button.base.less +++ b/modules/system/assets/ui/less/button.base.less @@ -57,7 +57,8 @@ font-weight: bold; } .btn-secondary { - .button-variant(@btn-secondary-color; lighten(@btn-secondary-bg, 5%); @btn-secondary-border; @btn-secondary-bg; @btn-secondary-bg); + .button-variant(#000; lighten(@btn-secondary-bg, 5%); @btn-secondary-border; @btn-secondary-bg; @btn-secondary-bg); + color: @btn-secondary-color; } // Success appears as green .btn-success { diff --git a/modules/system/assets/ui/less/button.less b/modules/system/assets/ui/less/button.less index a08283568..251a6041a 100644 --- a/modules/system/assets/ui/less/button.less +++ b/modules/system/assets/ui/less/button.less @@ -58,7 +58,7 @@ font-size: 14px; line-height: 14px; position: relative; - opacity: .5; + opacity: .6; } &.on, diff --git a/modules/system/assets/ui/less/button.variables.less b/modules/system/assets/ui/less/button.variables.less index 295c60d0e..6d77f2abb 100644 --- a/modules/system/assets/ui/less/button.variables.less +++ b/modules/system/assets/ui/less/button.variables.less @@ -8,7 +8,7 @@ @btn-primary-bg: #1681BA; @btn-primary-border: darken(@btn-primary-bg, 5%); -@btn-secondary-color: #000; +@btn-secondary-color: #405261; @btn-secondary-bg: #e1e2e4; @btn-secondary-border: darken(@btn-secondary-bg, 5%); diff --git a/modules/system/assets/ui/less/icon.close.less b/modules/system/assets/ui/less/icon.close.less index 9e5403662..ea1141d2f 100644 --- a/modules/system/assets/ui/less/icon.close.less +++ b/modules/system/assets/ui/less/icon.close.less @@ -2,10 +2,6 @@ // Close icons // -------------------------------------------------- -@close-font-weight: bold; -@close-color: #000; -@close-text-shadow: 0 1px 0 #fff; - .close { float: right; font-size: (@font-size-base * 1.5); diff --git a/modules/system/assets/ui/less/icon.variables.less b/modules/system/assets/ui/less/icon.variables.less index 65ce406b3..c2a50f1b0 100644 --- a/modules/system/assets/ui/less/icon.variables.less +++ b/modules/system/assets/ui/less/icon.variables.less @@ -1,3 +1,11 @@ +// +// Close icons +// -------------------------------------------------- + +@close-font-weight: bold; +@close-color: #000; +@close-text-shadow: 0 1px 0 #fff; + // Variables // -------------------------- diff --git a/modules/system/assets/ui/less/inspector.less b/modules/system/assets/ui/less/inspector.less index ac05ececf..f4a5dc42e 100644 --- a/modules/system/assets/ui/less/inspector.less +++ b/modules/system/assets/ui/less/inspector.less @@ -13,6 +13,7 @@ // -------------------------------------------------- @color-inspector-bg: #f2f2f2; +@color-inspector-value-bg: #ffffff; @color-inspector-active-bg: #ffffff; @color-inspector-text: #333333; @color-inspector-input-text: #385487; @@ -107,17 +108,15 @@ td { font-weight: 300; - border-left: 1px solid @color-inspector-bg; + border-left: 1px solid @color-inspector-grid; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; + background: @color-inspector-value-bg; &.text { - background: #F9F7F7; input[type=text] { - background: transparent; - &::-webkit-input-placeholder { font-weight: normal!important; color: #b5babd; @@ -138,7 +137,6 @@ &.active { background: @color-inspector-active-bg; - border-left: 1px solid @color-inspector-grid; } } @@ -380,7 +378,6 @@ width: 100% !important; .select2-selection { - background: transparent; height: 29px; line-height: 29px; padding: 0 3px 0 12px; @@ -404,9 +401,7 @@ .border-radius(0) !important; border: none !important; - .select2-selection { - background: white; - } + .select2-selection {} } .select2-selection__rendered { @@ -479,7 +474,7 @@ div.control-popover { .inspector-wrapper { background: #f2f2f2; // Use @color-inspector-bg instead - border-left: 2px solid #bdc3c7; + border-left: 2px solid #bdc3c7; } .toolbar { @@ -571,13 +566,14 @@ div.inspector-dictionary-container { } .inspector-header { - background: #d35400; + background: @color-popover-head-bg; padding: 14px 16px; position: relative; - color: #ffffff; + color: @color-popover-head-text; + border-bottom: 2px solid @color-popover-border; h3 { - font-size: 16px; + font-size: @font-size-base; font-weight: bold; margin-top: 0; margin-bottom: 0; @@ -586,7 +582,7 @@ div.inspector-dictionary-container { } p { - font-size: 14px; + font-size: @font-size-base - 2; font-weight: normal; margin: 5px 0 0 0; @@ -600,18 +596,20 @@ div.inspector-dictionary-container { position: absolute; top: 12px; float: none; - color: #ffffff; + color: @close-color; cursor: pointer; + line-height: 1; .opacity(0.4); &:hover { .opacity(1); - color: #ffffff; + color: @close-color; } } .detach { right: 26px; + line-height: 22px; } .close { @@ -621,7 +619,7 @@ div.inspector-dictionary-container { } .inspector-container { - &:empty { + &:empty { display: none; } diff --git a/modules/system/assets/ui/less/popover.less b/modules/system/assets/ui/less/popover.less index f14d4640d..11935d468 100644 --- a/modules/system/assets/ui/less/popover.less +++ b/modules/system/assets/ui/less/popover.less @@ -12,8 +12,8 @@ @color-popover-bg: #ffffff; @color-popover-border: rgba(0,0,0,.15); -@color-popover-head-bg: mix(black, saturate(@brand-secondary, 20%), 25%); -@color-popover-head-text: #ffffff; +@color-popover-head-bg: #f9f9f9; +@color-popover-head-text: #2a3e51; @color-popover-danger-bg: #ab2a1c; div.control-popover { @@ -132,6 +132,7 @@ div.control-popover { position: relative; color: @color-popover-head-text; .border-top-radius(2px); + border-bottom: 2px solid @color-popover-border; &:before { z-index: 602; @@ -177,13 +178,14 @@ div.control-popover { top: 14px; right: 26px; float: none; - color: #ffffff; + color: @close-color; cursor: pointer; text-decoration: none; + line-height: 17px; &:hover { .opacity(1); - color: #ffffff; + color: @close-color; } &:before { diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index 1f225048c..68785931b 100644 --- a/modules/system/assets/ui/storm.css +++ b/modules/system/assets/ui/storm.css @@ -515,7 +515,7 @@ address{margin-bottom:20px;font-style:normal;line-height:1.42857143} .btn-primary.on{background:#126b9a;border-color:#0b3f5a;background-image:none} .btn-primary.disabled,.btn-primary[disabled],.btn-primary.disabled:hover,.btn-primary[disabled]:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,.btn-primary.disabled.active,.btn-primary[disabled].active{background:#1991d1;border-color:#1371a3} .btn-primary .badge{color:#1991d1;background:#ffffff} -.btn-secondary{color:#000000;background-color:#eeeff0;border:none;text-shadow:0 -1px 0 rgba(0,0,0,0.4);background:#eeeff0} +.btn-secondary{color:#000000;background-color:#eeeff0;border:none;text-shadow:0 -1px 0 rgba(0,0,0,0.4);background:#eeeff0;color:#405261} .btn-secondary:hover,.btn-secondary:focus,.btn-secondary:active,.btn-secondary.active,.open .dropdown-toggle.btn-secondary{color:#000000;background:#e1e2e4;border-color:#e1e2e4} .btn-secondary:active,.btn-secondary.active,.open .dropdown-toggle.btn-secondary{background:#cccdd1;border-color:#c1c3c7;background-image:none} .btn-secondary.on{background:#ced0d3;border-color:#a9acb1;background-image:none} @@ -633,7 +633,7 @@ input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button" .btn.active,.btn:active{-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,0.3);box-shadow:inset 0 1px 0 rgba(0,0,0,0.3)} .btn i[class^="icon-"],.btn i[class*=" icon-"]{opacity:.5} .btn.on i[class^="icon-"],.btn:hover i[class^="icon-"],.btn:focus i[class^="icon-"],.btn.focus i[class^="icon-"],.btn.on i[class*=" icon-"],.btn:hover i[class*=" icon-"],.btn:focus i[class*=" icon-"],.btn.focus i[class*=" icon-"]{opacity:1} -.btn[class^="oc-icon-"]:before,.btn[class*=" oc-icon-"]:before{font-size:14px;line-height:14px;position:relative;opacity:.5} +.btn[class^="oc-icon-"]:before,.btn[class*=" oc-icon-"]:before{font-size:14px;line-height:14px;position:relative;opacity:.6} .btn[class^="oc-icon-"].on:before,.btn[class*=" oc-icon-"].on:before,.btn[class^="oc-icon-"]:hover:before,.btn[class*=" oc-icon-"]:hover:before,.btn[class^="oc-icon-"]:focus:before,.btn[class*=" oc-icon-"]:focus:before,.btn[class^="oc-icon-"].focus:before,.btn[class*=" oc-icon-"].focus:before{opacity:1} .btn-secondary{text-shadow:0 1px 0 rgba(255,255,255,0.8);-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,.1);box-shadow:inset 0 -2px 0 rgba(0,0,0,.1)} .btn-secondary[disabled]{color:rgba(0,0,0,0.6)} @@ -1348,19 +1348,19 @@ div.control-popover.placement-right > div:before{content:'';display:block;width: div.control-popover div.popover-body{padding:15px} div.control-popover div.popover-body.form-container{padding-bottom:0} div.control-popover div.popover-footer{padding:0 20px 20px 20px} -div.control-popover .popover-head{background:#bf5d07;padding:14px 16px;position:relative;color:#ffffff;border-top-right-radius:2px;border-top-left-radius:2px} +div.control-popover .popover-head{background:#f9f9f9;padding:14px 16px;position:relative;color:#2a3e51;border-top-right-radius:2px;border-top-left-radius:2px;border-bottom:2px solid rgba(0,0,0,0.15)} div.control-popover .popover-head:before{z-index:602;position:absolute} div.control-popover .popover-head h3{font-size:14px;font-weight:bold;margin-top:0;margin-bottom:0;padding-right:15px;line-height:130%} div.control-popover .popover-head p{font-size:12px;font-weight:normal;margin:5px 0 0 0} div.control-popover .popover-head p:empty{display:none} -div.control-popover .popover-head .close{float:none;position:absolute;right:11px;top:12px;color:#ffffff;outline:none;opacity:0.4;filter:alpha(opacity=40)} +div.control-popover .popover-head .close{float:none;position:absolute;right:11px;top:12px;color:#2a3e51;outline:none;opacity:0.4;filter:alpha(opacity=40)} div.control-popover .popover-head .close:hover{opacity:1;filter:alpha(opacity=100)} -div.control-popover .popover-head .inspector-move-to-container{opacity:0.4;filter:alpha(opacity=40);position:absolute;top:14px;right:26px;float:none;color:#ffffff;cursor:pointer;text-decoration:none} -div.control-popover .popover-head .inspector-move-to-container:hover{opacity:1;filter:alpha(opacity=100);color:#ffffff} +div.control-popover .popover-head .inspector-move-to-container{opacity:0.4;filter:alpha(opacity=40);position:absolute;top:14px;right:26px;float:none;color:#000000;cursor:pointer;text-decoration:none;line-height:17px} +div.control-popover .popover-head .inspector-move-to-container:hover{opacity:1;filter:alpha(opacity=100);color:#000000} div.control-popover .popover-head .inspector-move-to-container:before{-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)} -div.control-popover.placement-bottom .popover-head:before{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-bottom:8px solid #bf5d07;left:15px;top:-8px} -div.control-popover.placement-left .popover-head:before{content:'';display:block;width:0;height:0;border-top:7.5px solid transparent;border-bottom:7.5px solid transparent;border-left:8px solid #bf5d07;right:-8px;top:7px} -div.control-popover.placement-right .popover-head:before{content:'';display:block;width:0;height:0;border-top:7.5px solid transparent;border-bottom:7.5px solid transparent;border-right:8px solid #bf5d07;left:-8px;top:7px} +div.control-popover.placement-bottom .popover-head:before{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-bottom:8px solid #f9f9f9;left:15px;top:-8px} +div.control-popover.placement-left .popover-head:before{content:'';display:block;width:0;height:0;border-top:7.5px solid transparent;border-bottom:7.5px solid transparent;border-left:8px solid #f9f9f9;right:-8px;top:7px} +div.control-popover.placement-right .popover-head:before{content:'';display:block;width:0;height:0;border-top:7.5px solid transparent;border-bottom:7.5px solid transparent;border-right:8px solid #f9f9f9;left:-8px;top:7px} div.control-popover.popover-danger > div{color:#fff;background-color:#ab2a1c} div.control-popover.popover-danger.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 #ab2a1c} div.control-popover.popover-danger.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 #ab2a1c;border-bottom-width:0} @@ -2645,14 +2645,12 @@ table.table.data tr.list-tree-level-10 td.list-cell-index-1{padding-left:125px} .inspector-fields tr.expanded{display:table-row} .inspector-fields.has-groups th{padding-left:20px} .inspector-fields.has-groups tr.grouped th{padding-left:35px} -.inspector-fields td{font-weight:300;border-left:1px solid #f2f2f2;text-overflow:ellipsis;white-space:nowrap;overflow:hidden} -.inspector-fields td.text{background:#F9F7F7} -.inspector-fields td.text input[type=text]{background:transparent} +.inspector-fields td{font-weight:300;border-left:1px solid #c8cccd;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;background:#ffffff} .inspector-fields td.text input[type=text]::-webkit-input-placeholder{font-weight:normal !important;color:#b5babd} .inspector-fields td.text input[type=text]:-moz-placeholder{font-weight:normal !important;color:#b5babd} .inspector-fields td.text input[type=text]::-moz-placeholder{font-weight:normal !important;color:#b5babd} .inspector-fields td.text input[type=text]:-ms-input-placeholder{font-weight:normal !important;color:#b5babd} -.inspector-fields td.text.active{background:#ffffff;border-left:1px solid #c8cccd} +.inspector-fields td.text.active{background:#ffffff} .inspector-fields td.autocomplete{padding:0} .inspector-fields td.autocomplete .autocomplete-container input[type=text]{padding:5px 12px} .inspector-fields td.autocomplete .autocomplete-container ul.dropdown-menu{background:white;font-size:12px;z-index:100000} @@ -2688,11 +2686,10 @@ table.table.data tr.list-tree-level-10 td.list-cell-index-1{padding-left:125px} .inspector-fields div.custom-checkbox{margin-top:0;margin-bottom:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} .inspector-fields div.custom-checkbox label:before{top:-12px} .inspector-fields .select2-container{width:100% !important} -.inspector-fields .select2-container .select2-selection{background:transparent;height:29px;line-height:29px;padding:0 3px 0 12px;border:none !important;font-size:12px;-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important;-webkit-box-shadow:none !important;box-shadow:none !important} +.inspector-fields .select2-container .select2-selection{height:29px;line-height:29px;padding:0 3px 0 12px;border:none !important;font-size:12px;-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important;-webkit-box-shadow:none !important;box-shadow:none !important} .inspector-fields .select2-container .select2-selection.select2-default{font-weight:normal !important} .inspector-fields .select2-container .loading-indicator > span{top:15px} .inspector-fields .select2-container.select2-container--open{-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important;border:none !important} -.inspector-fields .select2-container.select2-container--open .select2-selection{background:white} .inspector-fields .select2-container .select2-selection__rendered{padding:0 22px 0 0;color:#385487} .inspector-fields tr.changed td{font-weight:600} .inspector-fields tr.changed td input[type=text]{font-weight:600} @@ -2722,13 +2719,13 @@ div.inspector-dictionary-container table.inspector-dictionary-table tbody tr td div.inspector-dictionary-container table.inspector-dictionary-table tbody tr td input:focus{border:none;outline:none} div.inspector-dictionary-container table.inspector-dictionary-table tbody tr td:first-child{border-right:1px solid #e0e0e0} div.inspector-dictionary-container table.inspector-dictionary-table tbody tr:last-child td{border-bottom:none} -.inspector-header{background:#d35400;padding:14px 16px;position:relative;color:#ffffff} -.inspector-header h3{font-size:16px;font-weight:bold;margin-top:0;margin-bottom:0;padding-right:15px;line-height:130%} -.inspector-header p{font-size:14px;font-weight:normal;margin:5px 0 0 0} +.inspector-header{background:#f9f9f9;padding:14px 16px;position:relative;color:#2a3e51;border-bottom:2px solid rgba(0,0,0,0.15)} +.inspector-header h3{font-size:14px;font-weight:bold;margin-top:0;margin-bottom:0;padding-right:15px;line-height:130%} +.inspector-header p{font-size:12px;font-weight:normal;margin:5px 0 0 0} .inspector-header p:empty{display:none} -.inspector-header span,.inspector-header a{text-decoration:none;position:absolute;top:12px;float:none;color:#ffffff;cursor:pointer;opacity:0.4;filter:alpha(opacity=40)} -.inspector-header span:hover,.inspector-header a:hover{opacity:1;filter:alpha(opacity=100);color:#ffffff} -.inspector-header .detach{right:26px} +.inspector-header span,.inspector-header a{text-decoration:none;position:absolute;top:12px;float:none;color:#000000;cursor:pointer;line-height:1;opacity:0.4;filter:alpha(opacity=40)} +.inspector-header span:hover,.inspector-header a:hover{opacity:1;filter:alpha(opacity=100);color:#000000} +.inspector-header .detach{right:26px;line-height:22px} .inspector-header .close{right:11px;font-size:21px} .inspector-container:empty{display:none} .inspector-container .control-scrollpad{position:absolute}