From 72d3fe3ebdb114841cb028afda8ed92269f2cc82 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 23 Apr 2016 05:11:02 +1000 Subject: [PATCH] More styling updates --- .../backend/widgets/table/assets/css/table.css | 17 ++++++++++------- .../widgets/table/assets/less/table.less | 6 ++++-- modules/system/assets/ui/less/form.less | 10 ---------- modules/system/assets/ui/less/toolbar.less | 5 +++-- modules/system/assets/ui/storm.css | 4 +--- 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/modules/backend/widgets/table/assets/css/table.css b/modules/backend/widgets/table/assets/css/table.css index 2c15a9f7e..f1f14fbec 100644 --- a/modules/backend/widgets/table/assets/css/table.css +++ b/modules/backend/widgets/table/assets/css/table.css @@ -72,16 +72,16 @@ padding: 1px; } .control-table table.data td.active { - border-color: #4da7e8 !important; + border-color: #3498db !important; } .control-table table.data td.active .content-container { padding: 0; - border: 1px solid #4da7e8; + border: 1px solid #3498db; } .control-table table.data td.active .content-container:before, .control-table table.data td.active .content-container:after { content: ' '; - background: #4da7e8; + background: #3498db; position: absolute; left: -2px; top: -2px; @@ -142,6 +142,9 @@ padding: 10px; opacity: 0.5; filter: alpha(opacity=50); + -webkit-box-shadow: none !important; + box-shadow: none !important; + text-shadow: none; } .control-table .toolbar a.btn:hover { opacity: 1; @@ -189,7 +192,7 @@ color: #95a5a6; } .control-table .pagination ul li.active { - background: #4da7e8; + background: #3498db; } .control-table .pagination ul li.active a { color: #ffffff; @@ -236,7 +239,7 @@ ul.table-widget-autocomplete li a { .control-table td[data-column-type=checkbox] div[data-checkbox-element] { width: 16px; height: 16px; - border-radius: 2px; + border-radius: 3px; background-color: #FFFFFF; border: 1px solid #999999; margin: 5px 5px 5px 10px; @@ -267,7 +270,7 @@ ul.table-widget-autocomplete li a { top: -4px; } .control-table td[data-column-type=checkbox] div[data-checkbox-element]:focus { - border-color: #4da7e8; + border-color: #3498db; outline: none; } /* @@ -379,6 +382,6 @@ html.cssanimations .control-table td[data-column-type=dropdown] [data-view-conta .table-control-dropdown-list li:hover, .table-control-dropdown-list li:focus, .table-control-dropdown-list li.selected { - background: #4da7e8; + background: #3498db; color: white; } diff --git a/modules/backend/widgets/table/assets/less/table.less b/modules/backend/widgets/table/assets/less/table.less index 8f152a1d0..d560f43f3 100644 --- a/modules/backend/widgets/table/assets/less/table.less +++ b/modules/backend/widgets/table/assets/less/table.less @@ -118,7 +118,7 @@ } } - tr { + tr { background-color: white; &.error { @@ -126,7 +126,7 @@ td.active.error { border-color: #ec0000!important; - + .content-container { border-color: #ec0000!important; &:before, &:after { @@ -181,6 +181,8 @@ color: #323e50; padding: 10px; .opacity(0.5); + .box-shadow(none) !important; + text-shadow: none; &:hover { .opacity(1); diff --git a/modules/system/assets/ui/less/form.less b/modules/system/assets/ui/less/form.less index 9ad84a73b..b0bee0fee 100644 --- a/modules/system/assets/ui/less/form.less +++ b/modules/system/assets/ui/less/form.less @@ -73,16 +73,6 @@ width: 200px !important; } } - - &.searchable { - border-radius: 100px; - - &.icon { - background-position: left -84px; - padding-left: 33px !important; - padding-right: 13px !important; - } - } } .form-group { diff --git a/modules/system/assets/ui/less/toolbar.less b/modules/system/assets/ui/less/toolbar.less index f97cc5156..80e9bc189 100644 --- a/modules/system/assets/ui/less/toolbar.less +++ b/modules/system/assets/ui/less/toolbar.less @@ -269,9 +269,10 @@ input.form-control { border: none; - padding: 12px 13px 13px; + padding: 11px 13px 12px; height: auto; - .border-radius(0)!important; + .border-radius(0) !important; + .box-shadow(~"inset 0 1px 0 @{input-border}"); &.icon.search { background-position: right -78px; diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index 56d8451c2..515090c3b 100644 --- a/modules/system/assets/ui/storm.css +++ b/modules/system/assets/ui/storm.css @@ -1668,7 +1668,7 @@ ul.status-list li span.status.info{background:#5bc0de} #layout-side-panel div.control-toolbar.separator,.compact-toolbar div.control-toolbar.separator{border-bottom:1px solid #ecf0f1} #layout-side-panel div.control-toolbar .toolbar-item,.compact-toolbar div.control-toolbar .toolbar-item{padding-right:0} #layout-side-panel div.control-toolbar .btn,.compact-toolbar div.control-toolbar .btn{-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important;padding-top:12px;padding-bottom:13px;margin-right:0} -#layout-side-panel div.control-toolbar input.form-control,.compact-toolbar div.control-toolbar input.form-control{border:none;padding:12px 13px 13px;height:auto;-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important} +#layout-side-panel div.control-toolbar input.form-control,.compact-toolbar div.control-toolbar input.form-control{border:none;padding:11px 13px 12px;height:auto;-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important;-webkit-box-shadow:inset 0 1px 0 #bdc3c7;box-shadow:inset 0 1px 0 #bdc3c7} #layout-side-panel div.control-toolbar input.form-control.icon.search,.compact-toolbar div.control-toolbar input.form-control.icon.search{background-position:right -78px} #layout-side-panel div.control-toolbar div.loading-indicator-container.size-input-text .loading-indicator,.compact-toolbar div.control-toolbar div.loading-indicator-container.size-input-text .loading-indicator{top:6px} div.scoreboard{position:relative;padding:0} @@ -2356,8 +2356,6 @@ html.cssanimations .cursor-loading-indicator.hide{display:none} .form-control.icon.lock{background-position:right 0} .form-control.growable{width:110px} .form-control.growable:focus,.form-control.growable:active{width:200px !important} -.form-control.searchable{border-radius:100px} -.form-control.searchable.icon{background-position:left -84px;padding-left:33px !important;padding-right:13px !important} .form-group{position:relative;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} .form-group:empty{display:none} .form-group,.form-group.layout-item{padding-bottom:20px;margin-bottom:0}