From 40439218344e39cbfcd45c1677cf2c245a8d6623 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Thu, 7 Apr 2016 20:17:48 +1000 Subject: [PATCH] Adds extra flavor to buttons Reduce font sizes a bit Fixes rogue hand from appearing when clicking drag scroll enabled elements --- modules/backend/assets/css/october.css | 16 ++- .../assets/less/layout/fancylayout.less | 1 + .../backend/assets/less/layout/mainmenu.less | 17 ++- .../assets/css/permissioneditor.css | 15 +-- .../assets/less/permissioneditor.less | 10 +- .../backend/models/brandsettings/custom.less | 3 +- modules/system/assets/ui/js/drag.scroll.js | 8 +- .../system/assets/ui/less/button.base.less | 11 +- modules/system/assets/ui/less/button.less | 23 ++-- .../system/assets/ui/less/button.mixins.less | 6 +- modules/system/assets/ui/less/checkbox.less | 16 +-- modules/system/assets/ui/less/filter.less | 16 ++- modules/system/assets/ui/less/form.base.less | 7 +- modules/system/assets/ui/less/form.less | 2 +- .../system/assets/ui/less/form.variables.less | 4 +- modules/system/assets/ui/less/list.less | 5 +- .../system/assets/ui/less/list.variables.less | 2 +- modules/system/assets/ui/less/toolbar.less | 5 +- modules/system/assets/ui/storm-min.js | 6 +- modules/system/assets/ui/storm.css | 104 +++++++++--------- 20 files changed, 141 insertions(+), 136 deletions(-) diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index 573d06c49..24e74ab75 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -674,9 +674,6 @@ nav#layout-mainmenu ul li a:hover{background-color:transparent !important} nav#layout-mainmenu ul li a:active,nav#layout-mainmenu ul li a:focus{text-decoration:none;color:#555555} nav#layout-mainmenu ul li a i{line-height:1;font-size:30px;vertical-align:middle} nav#layout-mainmenu ul li a img.svg-icon{height:30px;width:30px;margin-right:10px;position:relative;top:0} -nav#layout-mainmenu ul li.icon-only{margin-right:0} -nav#layout-mainmenu ul li.icon-only a{padding:14px} -nav#layout-mainmenu ul li.icon-only i{margin-right:0} nav#layout-mainmenu ul.nav{display:inline-block} nav#layout-mainmenu .toolbar-item{padding-right:0} nav#layout-mainmenu .toolbar-item:before,nav#layout-mainmenu .toolbar-item:after{margin-top:0} @@ -684,8 +681,9 @@ nav#layout-mainmenu .toolbar-item:before{left:-12px} nav#layout-mainmenu .toolbar-item:after{right:-12px} nav#layout-mainmenu .toolbar-item.scroll-active-before:before{color:#ffffff} nav#layout-mainmenu .toolbar-item.scroll-active-after:after{color:#ffffff} +nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview{margin:0 0 0 11px} nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview i{font-size:20px} -nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview a{padding:0 15px;margin:8px 0 8px 11px} +nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview a{position:relative;padding:0 15px;top:-1px} nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account{margin-right:0} nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account > a{padding:0 15px 0 10px;font-size:14px;position:relative;z-index:590} nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account img.account-avatar{width:45px} @@ -701,7 +699,7 @@ nav#layout-mainmenu ul li .mainmenu-accountmenu li a{display:block;padding:12px nav#layout-mainmenu ul li .mainmenu-accountmenu li:hover{background:#3d5265 !important} nav#layout-mainmenu ul li .mainmenu-accountmenu li.divider{height:1px;width:100%;background-color:#4b6372} nav#layout-mainmenu.navbar-mode-inline{height:60px} -nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-toolbar li.mainmenu-preview a{height:44px;line-height:44px} +nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-toolbar li.mainmenu-preview a{height:60px;line-height:60px} nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-toolbar li.mainmenu-account > a{height:60px;line-height:60px} nav#layout-mainmenu.navbar-mode-inline ul li .mainmenu-accountmenu{top:60px} nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a{padding:15px 0} @@ -711,7 +709,7 @@ nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-label{line-heig 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-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-preview a{height:78px;line-height:78px} 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} @@ -728,7 +726,7 @@ nav#layout-mainmenu .menu-toggle .menu-toggle-icon{background:#333;display:inlin nav#layout-mainmenu .menu-toggle .menu-toggle-icon i{line-height:1;font-size:30px;vertical-align:middle} nav#layout-mainmenu .menu-toggle .menu-toggle-title{margin-left:10px} nav#layout-mainmenu.navbar-mode-collapse{padding-left:0;height:45px} -nav#layout-mainmenu.navbar-mode-collapse ul.mainmenu-toolbar li.mainmenu-preview a{height:29px;line-height:29px} +nav#layout-mainmenu.navbar-mode-collapse ul.mainmenu-toolbar li.mainmenu-preview a{height:45px;line-height:45px} nav#layout-mainmenu.navbar-mode-collapse ul.mainmenu-toolbar li.mainmenu-account > a{height:45px;line-height:45px} nav#layout-mainmenu.navbar-mode-collapse ul li .mainmenu-accountmenu{top:45px} nav#layout-mainmenu.navbar-mode-collapse ul.mainmenu-toolbar li.mainmenu-account > a{padding-right:0} @@ -736,7 +734,7 @@ nav#layout-mainmenu.navbar-mode-collapse ul li .mainmenu-accountmenu:after{right nav#layout-mainmenu.navbar-mode-collapse ul.nav{display:none} nav#layout-mainmenu.navbar-mode-collapse .menu-toggle{display:inline-block;color:#ffffff !important} @media (max-width:769px){nav#layout-mainmenu.navbar{padding-left:0;height:45px} -nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-preview a{height:29px;line-height:29px} +nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-preview a{height:45px;line-height:45px} nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-account > a{height:45px;line-height:45px} nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu{top:45px} nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-account > a{padding-right:0} @@ -948,7 +946,7 @@ body.outer .layout > .layout-row > .layout-cell .outer-form-container .horizonta .fancy-layout .form-tabless-fields .loading-indicator-container .loading-indicator{background-color:#e67e22;padding:0 0 0 30px;color:rgba(255,255,255,0.5);margin-top:1px;height:90%;font-size:12px;line-height:100%} .fancy-layout .form-tabless-fields .loading-indicator-container .loading-indicator > span{left:-10px;top:18px} .fancy-layout .form-buttons{-webkit-transition:all 0.5s;transition:all 0.5s;padding-top:11px;padding-bottom:5px} -.fancy-layout .form-buttons .btn{padding:0;margin-right:5px;margin-top:-6px;margin-right:30px;background-color:transparent;color:#ffffff;font-weight:normal;opacity:0.5;filter:alpha(opacity=50);-webkit-transition:all 0.3s ease;transition:all 0.3s ease} +.fancy-layout .form-buttons .btn{padding:0;margin-right:5px;margin-top:-6px;margin-right:30px;background-color:transparent;color:#ffffff;font-weight:normal;-webkit-box-shadow:none;box-shadow:none;opacity:0.5;filter:alpha(opacity=50);-webkit-transition:all 0.3s ease;transition:all 0.3s ease} .fancy-layout .form-buttons .btn:hover{opacity:1;filter:alpha(opacity=100)} .fancy-layout .form-buttons .btn:last-child{margin-right:0} .fancy-layout form.oc-data-changed .btn.save{opacity:1;filter:alpha(opacity=100)} diff --git a/modules/backend/assets/less/layout/fancylayout.less b/modules/backend/assets/less/layout/fancylayout.less index 7c4706a32..2030a023a 100644 --- a/modules/backend/assets/less/layout/fancylayout.less +++ b/modules/backend/assets/less/layout/fancylayout.less @@ -562,6 +562,7 @@ background-color: transparent; color: @color-fancy-master-tabs-active-text; font-weight: normal; + .box-shadow(none); .opacity(0.5); .transition(all 0.3s ease); diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less index 879687cd9..38f4c1b90 100644 --- a/modules/backend/assets/less/layout/mainmenu.less +++ b/modules/backend/assets/less/layout/mainmenu.less @@ -43,8 +43,8 @@ body.mainmenu-open { ul.mainmenu-toolbar { li.mainmenu-preview { a { - height: @height - 16px; - line-height: @height - 16px; + height: @height; + line-height: @height; } } @@ -110,12 +110,6 @@ nav#layout-mainmenu { top: 0; } } - - &.icon-only { - margin-right: 0; - a { padding: 14px; } - i { margin-right: 0; } - } } &.nav { @@ -153,13 +147,16 @@ nav#layout-mainmenu { ul.mainmenu-toolbar { li.mainmenu-preview { + margin: 0 0 0 11px; + i { font-size: 20px; } a { + position: relative; padding: 0 15px; - margin: 8px 0 8px 11px; + top: -1px; } } @@ -265,7 +262,7 @@ nav#layout-mainmenu ul li .mainmenu-accountmenu { } &:hover { - background: #3d5265!important; + background: #3d5265 !important; } } diff --git a/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css b/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css index 3ac87d150..ee2bce90a 100644 --- a/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css +++ b/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css @@ -1,6 +1,6 @@ .permissioneditor { position: relative; - margin: 0 -25px; + margin: 0 -20px; } .permissioneditor.control-disabled .permissions-overlay { position: absolute; @@ -25,10 +25,11 @@ border-bottom: 1px solid #dbe1e3; } .permissioneditor table th.tab { - font-size: 15px; + font-size: 13px; } .permissioneditor table th.permission-type { - font-size: 15px; + text-transform: uppercase; + font-size: 11px; text-align: center; } .permissioneditor table td { @@ -44,9 +45,9 @@ text-align: center; } .permissioneditor table td.permission-name { - font-size: 14px; + font-size: 13px; cursor: pointer; - color: #555555; + color: #777777; } .permissioneditor table td p.comment { margin-top: 5px; @@ -59,11 +60,11 @@ background: #4da7e8; } .permissioneditor table tr:hover td.permission-name { - color: #ffffff!important; + color: #ffffff !important; } .permissioneditor table th:first-child, .permissioneditor table td:first-child { - padding-left: 25px; + padding-left: 20px; } .permissioneditor table th:last-child, .permissioneditor table td:last-child { diff --git a/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less b/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less index 7bd661a21..c5f575c07 100644 --- a/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less +++ b/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less @@ -3,7 +3,6 @@ @color-permissioneditor-section-border: #DBE1E3; @color-permissioneditor-permission-border: #ECF0F1; - .permissioneditor { position: relative; @@ -35,11 +34,12 @@ border-bottom: 1px solid @color-permissioneditor-section-border; &.tab { - font-size: 15px; + font-size: @font-size-base - 1; } &.permission-type { - font-size: 15px; + text-transform: uppercase; + font-size: @font-size-base - 3; text-align: center; } } @@ -55,7 +55,7 @@ } &.permission-name { - font-size: 14px; + font-size: @font-size-base - 1; cursor: pointer; color: @color-help-block-text; } @@ -75,7 +75,7 @@ background: @color-list-hover-bg; &.permission-name { - color: #ffffff!important; + color: #ffffff !important; } } } diff --git a/modules/backend/models/brandsettings/custom.less b/modules/backend/models/brandsettings/custom.less index f2d1919c5..d79cfda1a 100644 --- a/modules/backend/models/brandsettings/custom.less +++ b/modules/backend/models/brandsettings/custom.less @@ -35,7 +35,6 @@ border-top-color: @brand-secondary; } -/* // // Logos // @@ -48,6 +47,7 @@ height: 170px !important; } +/* // // Outside Layout // @@ -308,4 +308,5 @@ div.control-componentlist { } } } + */ \ No newline at end of file diff --git a/modules/system/assets/ui/js/drag.scroll.js b/modules/system/assets/ui/js/drag.scroll.js index 2d7a3a79a..ab6066b27 100644 --- a/modules/system/assets/ui/js/drag.scroll.js +++ b/modules/system/assets/ui/js/drag.scroll.js @@ -104,7 +104,7 @@ $el.on('click.dragScroll', function() { // Do not handle item clicks while dragging - if ($(document.body).hasClass('drag')) + if ($(document.body).hasClass(self.options.dragClass)) return false }) @@ -132,10 +132,9 @@ else { $(window).on('mousemove.dragScroll', function(event){ moveDrag(event) - $(document.body).addClass(self.options.dragClass) return false }) - + $(window).on('mouseup.dragScroll', function(mouseUpEvent){ var isClick = event.pageX == mouseUpEvent.pageX && event.pageY == mouseUpEvent.pageY stopDrag(isClick) @@ -155,7 +154,8 @@ if (!dragging) { dragging = true $el.trigger('start.oc.dragScroll') - self.options.start(); + self.options.start() + $(document.body).addClass(self.options.dragClass) } self.options.vertical diff --git a/modules/system/assets/ui/less/button.base.less b/modules/system/assets/ui/less/button.base.less index ff0b4a2b4..d0f693fa4 100644 --- a/modules/system/assets/ui/less/button.base.less +++ b/modules/system/assets/ui/less/button.base.less @@ -33,7 +33,6 @@ &.active { outline: 0; background-image: none; - .box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); } &.disabled, @@ -54,24 +53,24 @@ .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border; @btn-primary-bg; @btn-primary-bg); } .btn-primary { - .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border); + .button-variant(@btn-primary-color; lighten(@btn-primary-bg, 5%); @btn-primary-border; @btn-primary-bg; @btn-primary-bg); font-weight: bold; } // Success appears as green .btn-success { - .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border); + .button-variant(@btn-success-color; @btn-default-bg; @btn-success-border; @btn-success-bg; @btn-success-bg); } // Info appears as blue-green .btn-info { - .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border); + .button-variant(@btn-info-color; @btn-default-bg; @btn-info-border; @btn-info-bg; @btn-info-bg); } // Warning appears as orange .btn-warning { - .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border); + .button-variant(@btn-warning-color; @btn-default-bg; @btn-warning-border; @btn-warning-bg; @btn-warning-bg); } // Danger and error appear as red .btn-danger { - .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border); + .button-variant(@btn-danger-color; @btn-default-bg; @btn-danger-border; @btn-danger-bg; @btn-danger-bg); } diff --git a/modules/system/assets/ui/less/button.less b/modules/system/assets/ui/less/button.less index 1b754eda7..eb076408c 100644 --- a/modules/system/assets/ui/less/button.less +++ b/modules/system/assets/ui/less/button.less @@ -16,7 +16,7 @@ // -------------------------------------------------- .btn { - font-size: 15px; + font-size: @font-size-base; border: none; text-align: left; outline: none !important; @@ -35,28 +35,25 @@ color: @color-button-disabled-text; } + .box-shadow(inset 0 -2px 0 rgba(0,0,0,.2)); + &.active, &:active { - .box-shadow(none); + .box-shadow(inset 0 2px 0 rgba(0,0,0,.3)); } } -.btn-default.on { - background-color: #95a5a6; - color: #f9f9f9; -} - .btn-group { - .btn{ + .btn { border-right: 1px solid rgba(0,0,0,0.09); - margin-left: 0!important; + margin-left: 0 !important; &:last-child, &.last { border-right: none; } &.last { - .border-right-radius(@border-radius-base)!important; + .border-right-radius(@border-radius-base) !important; } } @@ -65,11 +62,11 @@ &:not(:last-child, .last) > .btn { border-right: 1px solid rgba(0,0,0,0.09); - .border-right-radius(0)!important; + .border-right-radius(0) !important; } &:not(:first-child) > .btn { - .border-left-radius(0)!important; + .border-left-radius(0) !important; } &.last { @@ -129,7 +126,7 @@ } .btn-text { - font-size: 16px; + font-size: @font-size-base; padding: 8px 0; vertical-align: middle; display: inline-block; diff --git a/modules/system/assets/ui/less/button.mixins.less b/modules/system/assets/ui/less/button.mixins.less index 11b9f7239..6ed2a60b4 100644 --- a/modules/system/assets/ui/less/button.mixins.less +++ b/modules/system/assets/ui/less/button.mixins.less @@ -13,13 +13,15 @@ &.active, .open .dropdown-toggle& { color: @color; - background-color: darken(@background-hover, 8%); - border-color: darken(@border-hover, 12%); + background-color: @background-hover; + border-color: @border-hover; } &:active, &.active, .open .dropdown-toggle& { + background-color: darken(@background-hover, 8%); + border-color: darken(@border-hover, 12%); background-image: none; } diff --git a/modules/system/assets/ui/less/checkbox.less b/modules/system/assets/ui/less/checkbox.less index 648c4e4a5..8f12c863f 100644 --- a/modules/system/assets/ui/less/checkbox.less +++ b/modules/system/assets/ui/less/checkbox.less @@ -50,25 +50,25 @@ display: inline-block; cursor: pointer; position: relative; - padding-left: 30px; + padding-left: 25px; margin-right: 15px; margin-left: -20px; + font-size: @label-font-size; .user-select(none); - font-size: 15px; &:before { content: ""; display: inline-block; text-align: center; color: @color-checkbox-icon; - width: 20px; - height: 20px; + width: 18px; + height: 18px; margin-right: 15px; position: absolute; left: -3px; - top: 0; + top: -1px; background-color: #FFFFFF; border: 2px solid @color-checkbox-border; } @@ -138,7 +138,7 @@ } p.help-block { - padding-left: 10px; + padding-left: 6px; margin-bottom: 17px; } } @@ -235,7 +235,7 @@ left: 0; width: 100%; background-color: @color-checkbox-switch-off; - font-size: 13px; + font-size: 12px; font-weight: bold; .user-select(none); .border-radius(20px); @@ -245,7 +245,7 @@ display: block; width: 50%; position: absolute; - top: 1px; + top: 2px; left: -1px; .box-sizing(border-box); &:last-child { diff --git a/modules/system/assets/ui/less/filter.less b/modules/system/assets/ui/less/filter.less index 6e701b905..ad33bccd8 100644 --- a/modules/system/assets/ui/less/filter.less +++ b/modules/system/assets/ui/less/filter.less @@ -28,10 +28,10 @@ border-top: 1px solid @color-filter-border; border-bottom: 1px solid @color-filter-border; - font-size: @font-size-base; + font-size: @font-size-base - 1; .custom-checkbox label { - font-size: @font-size-base; + font-size: @font-size-base - 1; color: @color-filter-text; } @@ -42,7 +42,8 @@ > .filter-scope { display: inline-block; - padding: 15px; + padding: 10px; + .filter-label { margin-right: 5px; } @@ -75,9 +76,14 @@ } label { - padding-left: 30px; + padding-left: 25px; + + &:before { + top: -1px; + } } + &:after { content: ''; } @@ -123,7 +129,7 @@ .filter-items, .filter-active-items { color: @color-filter-text; - font-size: 14px; + font-size: @font-size-base - 1; ul, li { list-style-type: none; margin:0; diff --git a/modules/system/assets/ui/less/form.base.less b/modules/system/assets/ui/less/form.base.less index 8dab8991a..86125b18f 100644 --- a/modules/system/assets/ui/less/form.base.less +++ b/modules/system/assets/ui/less/form.base.less @@ -31,13 +31,12 @@ legend { label { display: inline-block; - margin-bottom: 7px; + margin-bottom: 5px; font-weight: normal; font-size: @label-font-size; color: @color-label; } - // Normalize form controls // // While most of our form styles require extra classes, some basic normalization @@ -320,13 +319,13 @@ input[type="checkbox"], .help-block { display: block; // account for any element using help-block margin-top: 5px; - margin-bottom: 14px; + margin-bottom: 10px; color: @color-help-block-text; } label + .help-block, label + .help-block.before-field { - margin-top: -5px; + margin-top: 0; } // Inline forms diff --git a/modules/system/assets/ui/less/form.less b/modules/system/assets/ui/less/form.less index f1038f78d..cd3098796 100644 --- a/modules/system/assets/ui/less/form.less +++ b/modules/system/assets/ui/less/form.less @@ -178,7 +178,7 @@ } .help-block { - font-size: 14px; + font-size: @font-size-base - 1; margin-bottom: 0; &.before-field { margin-top: 0; diff --git a/modules/system/assets/ui/less/form.variables.less b/modules/system/assets/ui/less/form.variables.less index 769c01558..8762ec49d 100644 --- a/modules/system/assets/ui/less/form.variables.less +++ b/modules/system/assets/ui/less/form.variables.less @@ -23,8 +23,8 @@ @input-group-addon-bg: @gray-lighter; @input-group-addon-border-color: @input-border; -@label-font-size: 14px; -@input-font-size: 14px; +@label-font-size: @font-size-base - 1; +@input-font-size: @font-size-base; @color-label: #2A3E51; @input-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; diff --git a/modules/system/assets/ui/less/list.less b/modules/system/assets/ui/less/list.less index 3c0ca3ab8..621c19bb8 100644 --- a/modules/system/assets/ui/less/list.less +++ b/modules/system/assets/ui/less/list.less @@ -32,7 +32,7 @@ table.table.data { } } - font-size: @font-size-base; + font-size: @font-size-base - 1; &.no-offset-bottom { margin-bottom: 0!important; @@ -48,6 +48,8 @@ table.table.data { border-color: @color-list-border; padding: 0; font-weight: normal; + text-transform: uppercase; + font-size: @font-size-base - 3; > a, > span { display: block; @@ -92,7 +94,6 @@ table.table.data { padding: 12px 15px; color: @color-list-text; border-color: @color-list-grid; - font-size: @font-size-base; a:not(.btn) { color: @color-list-text; diff --git a/modules/system/assets/ui/less/list.variables.less b/modules/system/assets/ui/less/list.variables.less index 8b361afc8..7285d6983 100644 --- a/modules/system/assets/ui/less/list.variables.less +++ b/modules/system/assets/ui/less/list.variables.less @@ -24,7 +24,7 @@ @color-list-progress-bg: #0181b9; @color-list-border: #D4D8DA; @color-list-border-light: #eeeeee; -@color-list-text-head: @color-label; +@color-list-text-head: #666666; @color-list-text: #666666; @color-list-text-active: #000000; @color-list-stripe-active: #ff9933; diff --git a/modules/system/assets/ui/less/toolbar.less b/modules/system/assets/ui/less/toolbar.less index dd31eeb9f..438ad8ee1 100644 --- a/modules/system/assets/ui/less/toolbar.less +++ b/modules/system/assets/ui/less/toolbar.less @@ -60,7 +60,8 @@ white-space: nowrap; float: none; display: inline-block; - margin-right: 10px; + margin-right: 10px; + &:last-child { margin-right: 0; } @@ -130,6 +131,8 @@ color: @color-toolbar-editor-btn-color; background: transparent; .user-select(none); + .box-shadow(none); + border-radius: 0; &:before { font-size: 14px !important; diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js index 783d1f7cf..26a7a03fc 100644 --- a/modules/system/assets/ui/storm-min.js +++ b/modules/system/assets/ui/storm-min.js @@ -3058,7 +3058,7 @@ startDrag(event) return false})} $el.on('touchstart.dragScroll',function(event){var touchEvent=event.originalEvent;if(touchEvent.touches.length==1){startDrag(touchEvent.touches[0]) event.stopPropagation()}}) -$el.on('click.dragScroll',function(){if($(document.body).hasClass('drag')) +$el.on('click.dragScroll',function(){if($(document.body).hasClass(self.options.dragClass)) return false}) $(document).on('ready',this.proxy(this.fixScrollClasses)) $(window).on('resize',this.proxy(this.fixScrollClasses)) @@ -3069,7 +3069,6 @@ moveDrag(touchEvent.touches[0]) event.preventDefault()}) $(window).on('touchend.dragScroll',function(event){stopDrag()})} else{$(window).on('mousemove.dragScroll',function(event){moveDrag(event) -$(document.body).addClass(self.options.dragClass) return false}) $(window).on('mouseup.dragScroll',function(mouseUpEvent){var isClick=event.pageX==mouseUpEvent.pageX&&event.pageY==mouseUpEvent.pageY stopDrag(isClick) @@ -3077,7 +3076,8 @@ return false})}} function moveDrag(event){var current=event[eventElementName],offset=dragStart-current if(Math.abs(offset)>2){if(!dragging){dragging=true $el.trigger('start.oc.dragScroll') -self.options.start();} +self.options.start() +$(document.body).addClass(self.options.dragClass)} self.options.vertical?$el.scrollTop(startOffset+offset):$el.scrollLeft(startOffset+offset) $el.trigger('drag.oc.dragScroll') self.options.drag()}} diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index 0986718d3..8322f9320 100644 --- a/modules/system/assets/ui/storm.css +++ b/modules/system/assets/ui/storm.css @@ -501,38 +501,38 @@ address{margin-bottom:20px;font-style:normal;line-height:1.42857143} .btn{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:8px 19.5px;font-size:14px;line-height:1.42857143;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} .btn:focus,.btn:active:focus,.btn.active:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px} .btn:hover,.btn:focus{color:#ffffff;text-decoration:none} -.btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)} +.btn:active,.btn.active{outline:0;background-image:none} .btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none} .btn-default{color:#ffffff;background-color:#a7afb4;border-color:#a7afb4} -.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#ffffff;background-color:#126896;border-color:#105b83} -.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none} +.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#ffffff;background-color:#1681ba;border-color:#1681ba} +.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-color:#126896;border-color:#105b83;background-image:none} .btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#a7afb4;border-color:#a7afb4} .btn-default .badge{color:#a7afb4;background-color:#ffffff} -.btn-primary{color:#ffffff;background-color:#1681ba;border-color:#1371a3;font-weight:bold} -.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#ffffff;background-color:#126896;border-color:#0d4b6c} -.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none} -.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#1681ba;border-color:#1371a3} -.btn-primary .badge{color:#1681ba;background-color:#ffffff} -.btn-success{color:#ffffff;background-color:#31ac5f;border-color:#2b9854} -.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#ffffff;background-color:#288c4d;border-color:#1e693a} -.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none} -.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#31ac5f;border-color:#2b9854} -.btn-success .badge{color:#31ac5f;background-color:#ffffff} -.btn-info{color:#ffffff;background-color:#5bc0de;border-color:#46b8da} -.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#ffffff;background-color:#39b3d7;border-color:#269abc} -.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none} -.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da} -.btn-info .badge{color:#5bc0de;background-color:#ffffff} -.btn-warning{color:#ffffff;background-color:#f0ad4e;border-color:#eea236} -.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#ffffff;background-color:#ed9c28;border-color:#d58512} -.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none} -.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236} -.btn-warning .badge{color:#f0ad4e;background-color:#ffffff} -.btn-danger{color:#ffffff;background-color:#ab2a1c;border-color:#952518} -.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#ffffff;background-color:#882116;border-color:#601810} -.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none} -.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#ab2a1c;border-color:#952518} -.btn-danger .badge{color:#ab2a1c;background-color:#ffffff} +.btn-primary{color:#ffffff;background-color:#1991d1;border-color:#1371a3;font-weight:bold} +.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#ffffff;background-color:#1681ba;border-color:#1681ba} +.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-color:#126896;border-color:#105b83;background-image:none} +.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#1991d1;border-color:#1371a3} +.btn-primary .badge{color:#1991d1;background-color:#ffffff} +.btn-success{color:#ffffff;background-color:#a7afb4;border-color:#2b9854} +.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#ffffff;background-color:#31ac5f;border-color:#31ac5f} +.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-color:#288c4d;border-color:#237c45;background-image:none} +.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#a7afb4;border-color:#2b9854} +.btn-success .badge{color:#a7afb4;background-color:#ffffff} +.btn-info{color:#ffffff;background-color:#a7afb4;border-color:#46b8da} +.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#ffffff;background-color:#5bc0de;border-color:#5bc0de} +.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-color:#39b3d7;border-color:#2aabd2;background-image:none} +.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#a7afb4;border-color:#46b8da} +.btn-info .badge{color:#a7afb4;background-color:#ffffff} +.btn-warning{color:#ffffff;background-color:#a7afb4;border-color:#eea236} +.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#ffffff;background-color:#f0ad4e;border-color:#f0ad4e} +.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-color:#ed9c28;border-color:#eb9316;background-image:none} +.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#a7afb4;border-color:#eea236} +.btn-warning .badge{color:#a7afb4;background-color:#ffffff} +.btn-danger{color:#ffffff;background-color:#a7afb4;border-color:#952518} +.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#ffffff;background-color:#ab2a1c;border-color:#ab2a1c} +.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-color:#882116;border-color:#761d13;background-image:none} +.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#a7afb4;border-color:#952518} +.btn-danger .badge{color:#a7afb4;background-color:#ffffff} .btn-link{color:#0181b9;font-weight:normal;cursor:pointer;border-radius:0} .btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none} .btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent} @@ -581,11 +581,10 @@ input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button" .btn-group-justified > .btn,.btn-group-justified > .btn-group{float:none;display:table-cell;width:1%} .btn-group-justified > .btn-group .btn{width:100%} [data-toggle="buttons"] > .btn > input[type="radio"],[data-toggle="buttons"] > .btn > input[type="checkbox"]{display:none} -.btn{font-size:15px;border:none;text-align:left;outline:none !important} +.btn{font-size:14px;border:none;text-align:left;outline:none !important;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.2);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.2)} .btn[class^="oc-icon-"]:before,.btn[class*=" oc-icon-"]:before{font-size:14px;line-height:14px;position:relative} .btn[disabled]{background-color:#dbdbdb;color:#aaaaaa} -.btn.active,.btn:active{-webkit-box-shadow:none;box-shadow:none} -.btn-default.on{background-color:#95a5a6;color:#f9f9f9} +.btn.active,.btn:active{-webkit-box-shadow:inset 0 2px 0 rgba(0,0,0,0.3);box-shadow:inset 0 2px 0 rgba(0,0,0,0.3)} .btn-group .btn{border-right:1px solid rgba(0,0,0,0.09);margin-left:0 !important} .btn-group .btn:last-child,.btn-group .btn.last{border-right:none} .btn-group .btn.last{border-bottom-right-radius:3px !important;border-top-right-radius:3px !important} @@ -602,7 +601,7 @@ input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button" .btn-icon.margin-left{margin-left:5px} .btn-icon.small{font-size:17px;height:17px;line-height:15px} .btn-icon.larger{font-size:21px;height:21px;line-height:17px} -.btn-text{font-size:16px;padding:8px 0;vertical-align:middle;display:inline-block;color:#a7afb4} +.btn-text{font-size:14px;padding:8px 0;vertical-align:middle;display:inline-block;color:#a7afb4} .btn-text a{color:#a7afb4;text-decoration:underline} .btn-text a:hover{color:#0181b9} .tooltip{position:absolute;z-index:1060;display:block;visibility:visible;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0)} @@ -1606,7 +1605,7 @@ ul.status-list li span.status.info{background:#5bc0de} [data-control=toolbar]{white-space:nowrap;width:100%;overflow:hidden} .control-toolbar.editor-toolbar{padding:0;background:#dddddd;border-bottom-right-radius:0;border-bottom-left-radius:0} .control-toolbar.editor-toolbar .toolbar-item .btn,.control-toolbar.editor-toolbar .toolbar-item .btn-group,.control-toolbar.editor-toolbar .toolbar-item .dropdown{margin:0;padding:0} -.control-toolbar.editor-toolbar .toolbar-item .btn{text-align:center;height:40px;width:40px;line-height:40px;zoom:1;color:#404040;background:transparent;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} +.control-toolbar.editor-toolbar .toolbar-item .btn{text-align:center;height:40px;width:40px;line-height:40px;zoom:1;color:#404040;background:transparent;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-box-shadow:none;box-shadow:none;border-radius:0} .control-toolbar.editor-toolbar .toolbar-item .btn:before{font-size:14px !important} .control-toolbar.editor-toolbar .toolbar-item .btn:hover{outline:none;background-color:#999999;color:#ffffff} .control-toolbar.editor-toolbar .toolbar-item .btn.active,.control-toolbar.editor-toolbar .toolbar-item .btn:active{outline:none;background-color:#404040;color:#ffffff} @@ -1950,7 +1949,7 @@ body.slim-container div.scoreboard{padding:0 20px} .flag-ss{background-position:0 -3936px} fieldset{padding:0;margin:0;border:0;min-width:0} legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333333;border:0;border-bottom:1px solid #e5e5e5} -label{display:inline-block;margin-bottom:7px;font-weight:normal;font-size:14px;color:#2a3e51} +label{display:inline-block;margin-bottom:5px;font-weight:normal;font-size:13px;color:#2a3e51} input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9; line-height:normal} input[type="file"]{display:block} @@ -2001,8 +2000,8 @@ textarea.input-lg,select[multiple].input-lg{height:auto} .has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede} .has-error .form-control-feedback{color:#a94442} .form-control-static{margin-bottom:0} -.help-block{display:block;margin-top:5px;margin-bottom:14px;color:#777777} -label + .help-block,label + .help-block.before-field{margin-top:-5px} +.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#777777} +label + .help-block,label + .help-block.before-field{margin-top:0} @media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle} .form-inline .form-control{display:inline-block;width:auto;vertical-align:middle} .form-inline .input-group > .form-control{width:100%} @@ -2292,8 +2291,8 @@ html.cssanimations .cursor-loading-indicator.hide{display:none} .custom-checkbox.nolabel label,.custom-radio.nolabel label{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0} .custom-checkbox,.custom-radio{padding-left:23px;margin-top:0} .custom-checkbox input[type=radio],.custom-radio input[type=radio],.custom-checkbox input[type=checkbox],.custom-radio input[type=checkbox]{display:none} -.custom-checkbox label,.custom-radio label{display:inline-block;cursor:pointer;position:relative;padding-left:30px;margin-right:15px;margin-left:-20px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;font-size:15px} -.custom-checkbox label:before,.custom-radio label:before{content:"";display:inline-block;text-align:center;color:#ffffff;width:20px;height:20px;margin-right:15px;position:absolute;left:-3px;top:0;background-color:#FFFFFF;border:2px solid #dce1e3} +.custom-checkbox label,.custom-radio label{display:inline-block;cursor:pointer;position:relative;padding-left:25px;margin-right:15px;margin-left:-20px;font-size:13px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} +.custom-checkbox label:before,.custom-radio label:before{content:"";display:inline-block;text-align:center;color:#ffffff;width:18px;height:18px;margin-right:15px;position:absolute;left:-3px;top:-1px;background-color:#FFFFFF;border:2px solid #dce1e3} .custom-checkbox label:hover:before,.custom-radio label:hover:before{border-color:#c0c9cc} .custom-checkbox label:active:before,.custom-radio label:active:before{border-color:#a3b0b6} .custom-checkbox input[type=radio]:checked + label:before,.custom-radio input[type=radio]:checked + label:before{border-color:#1f99dc;line-height:17px;border-width:2px} @@ -2305,7 +2304,7 @@ html.cssanimations .cursor-loading-indicator.hide{display:none} .custom-checkbox input[type=checkbox]:checked + label:before,.custom-radio input[type=checkbox]:checked + label:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f00c";border-color:#1f99dc;background-color:#1f99dc;font-size:12px;line-height:17px;border-width:2px} .custom-checkbox:focus,.custom-radio:focus{outline:none} .custom-checkbox:focus label:before,.custom-radio:focus label:before{border-color:#3498db} -.custom-checkbox p.help-block,.custom-radio p.help-block{padding-left:10px;margin-bottom:17px} +.custom-checkbox p.help-block,.custom-radio p.help-block{padding-left:6px;margin-bottom:17px} .custom-radio label:before{-webkit-border-radius:18px;-moz-border-radius:18px;border-radius:18px} .custom-checkbox label:before{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px} .switch-field .field-switch{padding-left:85px;float:left} @@ -2321,8 +2320,8 @@ html.cssanimations .cursor-loading-indicator.hide{display:none} .custom-switch input:checked ~ span{background-color:#76a544} .custom-switch input:checked ~ span span:first-of-type{color:#FFFFFF;display:block} .custom-switch input:checked ~ span span:last-of-type{color:#666666;display:none} -.custom-switch > span{display:block;height:100%;position:absolute;left:0;width:100%;background-color:#bb2424;font-size:13px;font-weight:bold;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px} -.custom-switch > span span{z-index:5;display:block;width:50%;position:absolute;top:1px;left:-1px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} +.custom-switch > span{display:block;height:100%;position:absolute;left:0;width:100%;background-color:#bb2424;font-size:12px;font-weight:bold;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px} +.custom-switch > span span{z-index:5;display:block;width:50%;position:absolute;top:2px;left:-1px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} .custom-switch > span span:last-child{left:28px;color:#FFFFFF;display:block} .custom-switch > span span:first-of-type{padding-left:13px;display:none;color:#666666} .form-preview{padding:20px;margin-bottom:20px;background:white;border:1px solid #eee} @@ -2359,7 +2358,7 @@ html.cssanimations .cursor-loading-indicator.hide{display:none} .form-group.input-sidebar-control .sidebar-control:hover,.form-group.input-sidebar-control .sidebar-control:focus{text-decoration:none;color:#0181b9;outline:none} .form-group-preview .form-control{background-color:#f6f6f6;height:auto;min-height:38px} .form-group-preview .custom-checkbox label,.form-group-preview .custom-radio label{cursor:default} -.help-block{font-size:14px;margin-bottom:0} +.help-block{font-size:13px;margin-bottom:0} .help-block.before-field{margin-top:0;margin-bottom:17px} .input-with-icon{position:relative} .input-with-icon > .icon{position:absolute;z-index:2;padding:13px;pointer-events:none;color:#bdbdbd;font-size:15px} @@ -2459,11 +2458,11 @@ table td[class*="col-"],table th[class*="col-"]{position:static;float:none;displ .table-responsive > .table-bordered > thead > tr > th:last-child,.table-responsive > .table-bordered > tbody > tr > th:last-child,.table-responsive > .table-bordered > tfoot > tr > th:last-child,.table-responsive > .table-bordered > thead > tr > td:last-child,.table-responsive > .table-bordered > tbody > tr > td:last-child,.table-responsive > .table-bordered > tfoot > tr > td:last-child{border-right:0} .table-responsive > .table-bordered > tbody > tr:last-child > th,.table-responsive > .table-bordered > tfoot > tr:last-child > th,.table-responsive > .table-bordered > tbody > tr:last-child > td,.table-responsive > .table-bordered > tfoot > tr:last-child > td{border-bottom:0} } -table.table.data{font-size:14px} +table.table.data{font-size:13px} table.table.data.no-offset-bottom{margin-bottom:0 !important} table.table.data thead{background:#ffffff} -table.table.data thead td,table.table.data thead th{border-width:1px;border-top:1px solid #d4d8da !important;border-bottom:2px solid #d4d8da !important;border-color:#d4d8da;padding:0;font-weight:normal} -table.table.data thead td > a,table.table.data thead th > a,table.table.data thead td > span,table.table.data thead th > span{display:block;padding:13px 15px;color:#2a3e51;text-decoration:none} +table.table.data thead td,table.table.data thead th{border-width:1px;border-top:1px solid #d4d8da !important;border-bottom:2px solid #d4d8da !important;border-color:#d4d8da;padding:0;font-weight:normal;text-transform:uppercase;font-size:11px} +table.table.data thead td > a,table.table.data thead th > a,table.table.data thead td > span,table.table.data thead th > span{display:block;padding:13px 15px;color:#666666;text-decoration:none} table.table.data thead td > a:hover,table.table.data thead th > a:hover,table.table.data thead td > span:hover,table.table.data thead th > span:hover{color:#000000} table.table.data thead td.sort-desc > span:after,table.table.data thead th.sort-desc > span:after,table.table.data thead td.sort-desc > a:after,table.table.data thead th.sort-desc > a:after{font-size:14px;line-height:14px;display:inline-block;margin-left:8px;vertical-align:baseline;opacity:0.2;filter:alpha(opacity=20);font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f107"} table.table.data thead td.sort-desc > span:hover:after,table.table.data thead th.sort-desc > span:hover:after,table.table.data thead td.sort-desc > a:hover:after,table.table.data thead th.sort-desc > a:hover:after{opacity:0.6;filter:alpha(opacity=60)} @@ -2475,7 +2474,7 @@ table.table.data thead tr th:first-child{padding-left:10px} table.table.data thead tr th:last-child a{padding-right:25px} table.table.data thead .list-checkbox .custom-checkbox{top:-20px} table.table.data tbody tr:nth-child(even) td,table.table.data tbody tr:nth-child(even) th{background-color:#ecf0f1} -table.table.data tbody td,table.table.data tbody th{padding:12px 15px;color:#666666;border-color:#e4e7e8;font-size:14px} +table.table.data tbody td,table.table.data tbody th{padding:12px 15px;color:#666666;border-color:#e4e7e8} table.table.data tbody td a:not(.btn),table.table.data tbody th a:not(.btn){color:#666666} table.table.data tbody td a:not(.btn):hover,table.table.data tbody th a:not(.btn):hover{text-decoration:none} table.table.data tbody td div.progress,table.table.data tbody th div.progress{position:relative;overflow:visible;height:auto;margin-bottom:0;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none} @@ -2559,7 +2558,7 @@ table.table.data tr.list-tree-level-10 td.list-cell-index-1{padding-left:125px} .control-list:not(.list-unresponsive) table thead tr th.list-setup a{padding:10px 15px} .control-list:not(.list-unresponsive) table tbody tr{border-bottom:1px solid #d4d8da} .control-list:not(.list-unresponsive) table tbody tr td{border:none;border-left:3px solid transparent;position:relative;padding-left:40% !important;white-space:normal;text-align:left;min-height:40px} -.control-list:not(.list-unresponsive) table tbody tr td:before{position:absolute;top:0;left:0;width:35%;padding:11px 15px;white-space:nowrap;text-align:left;color:#2a3e51;content:attr(data-title)} +.control-list:not(.list-unresponsive) table tbody tr td:before{position:absolute;top:0;left:0;width:35%;padding:11px 15px;white-space:nowrap;text-align:left;color:#666666;content:attr(data-title)} .control-list:not(.list-unresponsive) table tbody tr:hover td:before{color:white !important} .control-list:not(.list-unresponsive) table tbody tr.active td{border-left:3px solid #ff9933} .control-list:not(.list-unresponsive) table tbody tr.active td:before{color:#000000} @@ -2688,17 +2687,18 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete li a{padding:5px 12px;white .control-pagination .page-back{padding-right:6px} .control-pagination .page-next:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f105"} .control-pagination .page-back:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f104"} -.control-filter{padding:0 10px;color:#949ea6;background-color:#ecf0f1;border-top:1px solid #d7dbdd;border-bottom:1px solid #d7dbdd;font-size:14px} -.control-filter .custom-checkbox label{font-size:14px;color:#949ea6} +.control-filter{padding:0 10px;color:#949ea6;background-color:#ecf0f1;border-top:1px solid #d7dbdd;border-bottom:1px solid #d7dbdd;font-size:13px} +.control-filter .custom-checkbox label{font-size:13px;color:#949ea6} .control-filter a{text-decoration:none;color:#949ea6} -.control-filter > .filter-scope{display:inline-block;padding:15px} +.control-filter > .filter-scope{display:inline-block;padding:10px} .control-filter > .filter-scope .filter-label{margin-right:5px} .control-filter > .filter-scope .filter-setting{display:inline-block;margin-right:5px;-webkit-transition:color 0.6s;transition:color 0.6s} .control-filter > .filter-scope:after{font-size:14px;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f107"} .control-filter > .filter-scope.active .filter-setting{padding-left:5px;padding-right:5px;color:#FFF;background-color:#6aab55;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-transition:color 1s,background-color 1s;transition:color 1s,background-color 1s} .control-filter > .filter-scope.checkbox{padding-left:35px} .control-filter > .filter-scope.checkbox,.control-filter > .filter-scope.checkbox label{margin-bottom:0} -.control-filter > .filter-scope.checkbox label{padding-left:30px} +.control-filter > .filter-scope.checkbox label{padding-left:25px} +.control-filter > .filter-scope.checkbox label:before{top:-1px} .control-filter > .filter-scope.checkbox:after{content:''} .control-filter > .filter-scope:hover,.control-filter > .filter-scope:hover.custom-checkbox label{color:#000} .control-filter > .filter-scope:hover .filter-label{color:#949ea6} @@ -2708,7 +2708,7 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete li a{padding:5px 12px;white .control-filter-popover .filter-search input{min-height:36px;border:none;border-bottom:1px solid #d7dbdd;border-bottom-right-radius:0;border-bottom-left-radius:0;background-color:transparent} .control-filter-popover .filter-search .form-control.icon.search{background-position:right -81px} .control-filter-popover .filter-search .close{display:none} -.control-filter-popover .filter-items,.control-filter-popover .filter-active-items{color:#949ea6;font-size:14px} +.control-filter-popover .filter-items,.control-filter-popover .filter-active-items{color:#949ea6;font-size:13px} .control-filter-popover .filter-items ul,.control-filter-popover .filter-active-items ul,.control-filter-popover .filter-items li,.control-filter-popover .filter-active-items li{list-style-type:none;margin:0;padding:0} .control-filter-popover .filter-items li,.control-filter-popover .filter-active-items li{-webkit-transition:color 0.6s,background-color 0.3s;transition:color 0.6s,background-color 0.3s} .control-filter-popover .filter-items a,.control-filter-popover .filter-active-items a{text-decoration:none;color:#949ea6;display:block;padding:7px 15px}