diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index f603fd579..cc6232c57 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -710,7 +710,6 @@ nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-icon i,nav#layo nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-label{line-height:30px} nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:first-child{margin-left:-13px} nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:last-child{margin-right:0} -nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li.active{background:#262626;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.25);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.25)} nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li.active:first-child{margin-left:0} nav#layout-mainmenu.navbar-mode-tile{height:78px} nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-preview a{height:78px;line-height:78px} @@ -723,7 +722,6 @@ nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li a .nav-label{display:blo nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li{padding:0 15px;margin:7px 0 0} nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li:first-child{margin-left:-7px} nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li:hover .nav-label{width:auto;min-width:100px;text-overflow:all;overflow:visible;z-index:2} -nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li.active{background:#262626;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.25);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.25)} nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li.active:first-child{margin-left:0} nav#layout-mainmenu .menu-toggle{height:45px;line-height:45px;font-size:16px;display:none} nav#layout-mainmenu .menu-toggle .menu-toggle-icon{background:#333;display:inline-block;height:45px;line-height:45px;width:45px;text-align:center} @@ -755,7 +753,6 @@ nav#layout-mainmenu.navbar .menu-toggle{display:inline-block;color:#ffffff !impo .mainmenu-collapsed > div ul.mainmenu-nav li{padding:0 15px;margin:7px 0 0} .mainmenu-collapsed > div ul.mainmenu-nav li:first-child{margin-left:-7px} .mainmenu-collapsed > div ul.mainmenu-nav li:hover .nav-label{width:auto;min-width:100px;text-overflow:all;overflow:visible;z-index:2} -.mainmenu-collapsed > div ul.mainmenu-nav li.active{background:#262626;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.25);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.25)} .mainmenu-collapsed > div ul.mainmenu-nav li.active:first-child{margin-left:0} .mainmenu-collapsed > div ul.mainmenu-nav li:first-child{margin-left:0} .mainmenu-collapsed > div ul{margin:0;padding:5px 0 15px 15px;overflow:hidden} diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less index 89526f350..428ff8e84 100644 --- a/modules/backend/assets/less/layout/mainmenu.less +++ b/modules/backend/assets/less/layout/mainmenu.less @@ -39,9 +39,9 @@ body.mainmenu-open { } .mainmenu-item-link-active() { - background: @color-mainmenu-active-bg; - .border-radius(3px); - .box-shadow(inset 0 -2px 0 rgba(0,0,0,.25)); + // background: @color-mainmenu-active-bg; + // .border-radius(3px); + // .box-shadow(inset 0 -2px 0 rgba(0,0,0,.25)); } .mainmenu-set-height(@height) { diff --git a/modules/system/assets/ui/less/flashmessage.less b/modules/system/assets/ui/less/flashmessage.less index f0d97ec5d..50bc21f38 100644 --- a/modules/system/assets/ui/less/flashmessage.less +++ b/modules/system/assets/ui/less/flashmessage.less @@ -30,10 +30,9 @@ padding: 10px 30px 10px 15px; z-index: 10000; word-wrap: break-word; - font-weight: bold; - text-shadow: 0 -1px 0px rgba(0,0,0,.35); + text-shadow: 0 -1px 0px rgba(0,0,0,.25); text-align: center; - .box-shadow(inset 0 -2px 0 rgba(0,0,0,.15)); + .box-shadow(inset 0 -2px 0 rgba(0,0,0,.1)); .border-radius(@border-radius-base); diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index 77d9d91da..c65412061 100644 --- a/modules/system/assets/ui/storm.css +++ b/modules/system/assets/ui/storm.css @@ -1726,7 +1726,7 @@ div.scoreboard .control-chart .canvas + ul{margin-left:0} div.scoreboard .scoreboard-offset{padding-left:20px} body.slim-container div.scoreboard{padding:0 20px} #layout-canvas .flash-message{display:none} -.flash-message{position:fixed;width:500px;left:50%;top:13px;margin-left:-250px;color:#ffffff;font-size:14px;padding:10px 30px 10px 15px;z-index:10000;word-wrap:break-word;font-weight:bold;text-shadow:0 -1px 0px rgba(0,0,0,0.35);text-align:center;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px} +.flash-message{position:fixed;width:500px;left:50%;top:13px;margin-left:-250px;color:#ffffff;font-size:14px;padding:10px 30px 10px 15px;z-index:10000;word-wrap:break-word;text-shadow:0 -1px 0px rgba(0,0,0,0.25);text-align:center;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.1);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.1);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px} .flash-message.fade{opacity:0;filter:alpha(opacity=0);-webkit-transition:opacity .15s linear;transition:opacity .15s linear} .flash-message.fade.in{opacity:1;filter:alpha(opacity=100);-webkit-animation:flashmessage-fade-in 1s cubic-bezier(0.2,0.7,0.5,1);animation:flashmessage-fade-in 1s cubic-bezier(0.2,0.7,0.5,1)} .flash-message.success{background:#8da85e}