From 838f836051b23b73e551bc13f04d69c8e5ad909b Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Mon, 4 Apr 2016 18:12:21 +1000 Subject: [PATCH] Revert the nav to the classic style Various sizing fixes Set the standard padding to 20px Mute system links unless hover or active Fixes an issue where the scroll indicator appears always on fancy layout, these containers cannot use padding! Refs #1895 --- modules/backend/assets/css/october.css | 89 +- .../assets/less/controls/filelist.less | 20 +- .../assets/less/controls/sidenav-tree.less | 13 +- .../assets/less/controls/treeview.less | 20 +- .../assets/less/layout/fancylayout.less | 12 +- .../backend/assets/less/layout/mainmenu.less | 96 +- .../backend/assets/less/layout/sidenav.less | 2 +- .../richeditor/assets/css/richeditor.css | 20 +- modules/backend/layouts/_mainmenu.htm | 4 +- modules/backend/layouts/_sidenav.htm | 2 +- modules/system/assets/css/styles.css | 38 +- modules/system/assets/ui/css/storm.css | 12131 ---------------- modules/system/assets/ui/js/drag.scroll.js | 42 +- modules/system/assets/ui/less/checkbox.less | 4 +- modules/system/assets/ui/less/filter.less | 14 +- modules/system/assets/ui/less/form.base.less | 6 +- modules/system/assets/ui/less/form.less | 2 +- .../system/assets/ui/less/form.variables.less | 6 +- .../assets/ui/less/global.variables.less | 4 +- modules/system/assets/ui/less/list.less | 21 +- modules/system/assets/ui/less/tab.less | 6 +- modules/system/assets/ui/storm-min.js | 41 +- modules/system/assets/ui/storm.css | 186 +- 23 files changed, 365 insertions(+), 12414 deletions(-) delete mode 100644 modules/system/assets/ui/css/storm.css diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index 1fa7a45f0..8c5664215 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -119,7 +119,7 @@ .sweet-alert h2{word-break:word-break;word-wrap:break-word;max-height:350px;overflow-y:auto;margin:10px 0 17px 0;color:#2b3e50;text-align:left;font-size:15px;line-height:23px} .sweet-alert p{margin:0} .sweet-alert p.text-muted{margin-bottom:20px;color:#555555} -.control-simplelist{font-size:13px;padding:20px 20px 2px 20px;margin-bottom:25px;background:#ffffff;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px} +.control-simplelist{font-size:13px;padding:20px 20px 2px 20px;margin-bottom:20px;background:#ffffff;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px} .control-simplelist ul{padding-left:15px} .control-simplelist.form-control ul{margin-bottom:0} .control-simplelist.form-control li{padding-top:5px;padding-bottom:5px} @@ -179,7 +179,7 @@ .control-filelist ul li a:hover,.control-filelist ul li a:focus,.control-filelist ul li a:active{text-decoration:none} .control-filelist ul li a span{display:block} .control-filelist ul li a span.title{font-weight:normal;color:#405261;font-size:14px} -.control-filelist ul li a span.description{color:#8f8f8f;font-size:13px;white-space:nowrap;font-weight:normal;overflow:hidden;text-overflow:ellipsis} +.control-filelist ul li a span.description{color:#8f8f8f;font-size:12px;white-space:nowrap;font-weight:normal;overflow:hidden;text-overflow:ellipsis} .control-filelist ul li a span.description strong{color:#405261;font-weight:normal} .control-filelist ul li.group > h4,.control-filelist ul li.group > div.group > h4{font-weight:normal;font-size:14px;margin-top:0;margin-bottom:0;position:relative} .control-filelist ul li.group > h4 a,.control-filelist ul li.group > div.group > h4 a{padding:10px 20px 10px 53px;color:#405261;position:relative;outline:none} @@ -335,7 +335,7 @@ .control-treeview ol > li.active > div > span.borders:before,.control-treeview ol > li.active > div > span.borders:after{content:' ';position:absolute;width:100%;height:1px;display:block;left:0;background-color:#dddddd} .control-treeview ol > li.active > div > span.borders:before{top:-1px} .control-treeview ol > li.active > div > span.borders:after{bottom:-1px} -.control-treeview ol > li.no-data{padding:18px 0;margin:0;color:#666666;font-size:12px;text-align:center;font-weight:400} +.control-treeview ol > li.no-data{padding:18px 0;margin:0;color:#666666;font-size:14px;text-align:center;font-weight:400} .control-treeview ol > li > ol > li > div{margin-left:-20px;padding-left:71px} .control-treeview ol > li > ol > li > div > a{margin-left:-71px;padding-left:71px} .control-treeview ol > li > ol > li > div:before{margin-left:10px} @@ -376,7 +376,7 @@ .control-treeview ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > div > a{margin-left:-161px;padding-left:161px} .control-treeview ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > div:before{margin-left:100px} .control-treeview ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > ol > li > div > span.expand{left:102px} -.control-treeview p.no-data{padding:18px 0;margin:0;color:#666666;font-size:12px;text-align:center;font-weight:400} +.control-treeview p.no-data{padding:18px 0;margin:0;color:#666666;font-size:14px;text-align:center;font-weight:400} .control-treeview a.menu-control{display:block;margin:20px;padding:13px 15px;border:dotted 2px #ebebeb;color:#bdc3c7;font-size:12px;font-weight:600;text-transform:uppercase;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;vertical-align:middle} .control-treeview a.menu-control:hover{text-decoration:none;background-color:#58b6f7 !important;color:#ffffff !important;border:none;padding:15px 17px} .control-treeview a.menu-control i{margin-right:10px;font-size:14px} @@ -417,16 +417,17 @@ .sidenav-tree ul.top-level > li > div.group h3{background:#2a3e51;color:#ecf0f1;text-transform:uppercase;font-size:15px;padding:15px 15px 15px 40px;margin:0;position:relative;cursor:pointer} .sidenav-tree ul.top-level > li > div.group h3:before{display:block;position:absolute;width:10px;height:10px;left:16px;top:15px;color:#cfcfcf;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f105";-webkit-transform:rotate(90deg) translate(5px,-3px);-ms-transform:rotate(90deg) translate(5px,-3px);transform:rotate(90deg) translate(5px,-3px);-webkit-transition:all 0.1s ease;transition:all 0.1s ease;font-size:16px} .sidenav-tree ul.top-level > li > div.group h3:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-top:8px solid #2a3e51;border-bottom-width:0;position:absolute;left:15px;bottom:-8px;z-index:101} -.sidenav-tree ul.top-level > li > ul li a{display:block;position:relative;padding:18px 25px 18px 55px;background:transparent;border-bottom:1px solid #2a3e51;color:#ffffff;text-decoration:none !important} +.sidenav-tree ul.top-level > li > ul li a{display:block;position:relative;padding:18px 25px 18px 55px;background:transparent;border-bottom:1px solid #2a3e51;color:#ffffff;text-decoration:none !important;opacity:0.65;filter:alpha(opacity=65)} .sidenav-tree ul.top-level > li > ul li a:after{content:'';position:absolute;top:0;right:0;width:10px;height:100%;-webkit-box-shadow:inset -5px 0 3px rgba(0,0,0,0.1);box-shadow:inset -5px 0 3px rgba(0,0,0,0.1)} .sidenav-tree ul.top-level > li > ul li a:hover{text-decoration:none} .sidenav-tree ul.top-level > li > ul li a i{position:absolute;left:16px;top:18px;font-size:22px} .sidenav-tree ul.top-level > li > ul li a span{display:block;line-height:150%} -.sidenav-tree ul.top-level > li > ul li a span.header{color:#ffffff;font-size:16px;margin-bottom:5px} -.sidenav-tree ul.top-level > li > ul li a span.description{color:#bdc3c7;font-size:15px} -.sidenav-tree ul.top-level > li > ul li.active a,.sidenav-tree ul.top-level > li > ul li:hover a{background:#1f99dc;color:rgba(255,255,255,0.91)} -.sidenav-tree ul.top-level > li > ul li.active a span.header,.sidenav-tree ul.top-level > li > ul li:hover a span.header{color:#ffffff} -.sidenav-tree ul.top-level > li > ul li.active a span.description,.sidenav-tree ul.top-level > li > ul li:hover a span.description{color:rgba(255,255,255,0.91)} +.sidenav-tree ul.top-level > li > ul li a span.header{color:#ffffff;font-size:15px;margin-bottom:5px} +.sidenav-tree ul.top-level > li > ul li a span.description{color:#bdc3c7;font-size:13px} +.sidenav-tree ul.top-level > li > ul li:hover a,.sidenav-tree ul.top-level > li > ul li.active a{opacity:1;filter:alpha(opacity=100)} +.sidenav-tree ul.top-level > li > ul li.active a{background:#1f99dc;color:rgba(255,255,255,0.91)} +.sidenav-tree ul.top-level > li > ul li.active a span.header{color:#ffffff} +.sidenav-tree ul.top-level > li > ul li.active a span.description{color:rgba(255,255,255,0.91)} .sidenav-tree ul.top-level > li > ul li:last-child a{border-bottom:none} .sidenav-tree .back-link{display:none} @media (max-width:768px){.sidenav-tree{width:100%;height:auto !important;display:block !important} @@ -579,7 +580,7 @@ body.no-select{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:no html,body{height:100%; } body{webkit-font-smoothing:antialiased;font-family:sans-serif;background:#f9f9f9} #layout-canvas{min-height:100%;height:100%} -.control-tabs.primary-tabs > ul.nav-tabs,.control-tabs.primary-tabs > div > ul.nav-tabs,.control-tabs.primary-tabs > div > div > ul.nav-tabs{margin-left:-25px;margin-right:-25px} +.control-tabs.primary-tabs > ul.nav-tabs,.control-tabs.primary-tabs > div > ul.nav-tabs,.control-tabs.primary-tabs > div > div > ul.nav-tabs{margin-left:-20px;margin-right:-20px} .control-tabs.primary-tabs.tabs-no-inset > ul.nav-tabs,.control-tabs.primary-tabs.tabs-no-inset > div > ul.nav-tabs,.control-tabs.primary-tabs.tabs-no-inset > div > div > ul.nav-tabs{margin-left:0;margin-right:0} .layout{display:table;table-layout:fixed;height:100%;width:100%} .layout > .layout-row{display:table-row;vertical-align:top;height:100%} @@ -591,7 +592,7 @@ body{webkit-font-smoothing:antialiased;font-family:sans-serif;background:#f9f9f9 .layout > .layout-row > .layout-cell.width-200{width:200px} .layout > .layout-row > .layout-cell.width-300{width:300px} .layout > .layout-row > .layout-cell.width-350{width:350px} -.layout > .layout-row > .layout-cell.layout-container,.layout > .layout-row > .layout-cell .layout-container,.layout > .layout-row > .layout-cell.padded-container,.layout > .layout-row > .layout-cell .padded-container{padding:25px 25px 0 25px} +.layout > .layout-row > .layout-cell.layout-container,.layout > .layout-row > .layout-cell .layout-container,.layout > .layout-row > .layout-cell.padded-container,.layout > .layout-row > .layout-cell .padded-container{padding:20px 20px 0 20px} .layout > .layout-row > .layout-cell.layout-container .container-flush,.layout > .layout-row > .layout-cell .layout-container .container-flush,.layout > .layout-row > .layout-cell.padded-container .container-flush,.layout > .layout-row > .layout-cell .padded-container .container-flush{padding-top:0} .layout > .layout-row > .layout-cell .layout-relative{position:relative;height:100%} .layout > .layout-row > .layout-cell .layout-absolute{position:absolute;height:100%;width:100%} @@ -606,7 +607,7 @@ body{webkit-font-smoothing:antialiased;font-family:sans-serif;background:#f9f9f9 .layout > .layout-row > .layout-cell.width-200{width:200px} .layout > .layout-row > .layout-cell.width-300{width:300px} .layout > .layout-row > .layout-cell.width-350{width:350px} -.layout > .layout-row > .layout-cell.layout-container,.layout > .layout-row > .layout-cell .layout-container,.layout > .layout-row > .layout-cell.padded-container,.layout > .layout-row > .layout-cell .padded-container{padding:25px 25px 0 25px} +.layout > .layout-row > .layout-cell.layout-container,.layout > .layout-row > .layout-cell .layout-container,.layout > .layout-row > .layout-cell.padded-container,.layout > .layout-row > .layout-cell .padded-container{padding:20px 20px 0 20px} .layout > .layout-row > .layout-cell.layout-container .container-flush,.layout > .layout-row > .layout-cell .layout-container .container-flush,.layout > .layout-row > .layout-cell.padded-container .container-flush,.layout > .layout-row > .layout-cell .padded-container .container-flush{padding-top:0} .layout > .layout-row > .layout-cell .layout-relative{position:relative;height:100%} .layout > .layout-row > .layout-cell .layout-absolute{position:absolute;height:100%;width:100%} @@ -623,7 +624,7 @@ body{webkit-font-smoothing:antialiased;font-family:sans-serif;background:#f9f9f9 .layout > .layout-cell.width-200{width:200px} .layout > .layout-cell.width-300{width:300px} .layout > .layout-cell.width-350{width:350px} -.layout > .layout-cell.layout-container,.layout > .layout-cell .layout-container,.layout > .layout-cell.padded-container,.layout > .layout-cell .padded-container{padding:25px 25px 0 25px} +.layout > .layout-cell.layout-container,.layout > .layout-cell .layout-container,.layout > .layout-cell.padded-container,.layout > .layout-cell .padded-container{padding:20px 20px 0 20px} .layout > .layout-cell.layout-container .container-flush,.layout > .layout-cell .layout-container .container-flush,.layout > .layout-cell.padded-container .container-flush,.layout > .layout-cell .padded-container .container-flush{padding-top:0} .layout > .layout-cell .layout-relative{position:relative;height:100%} .layout > .layout-cell .layout-absolute{position:absolute;height:100%;width:100%} @@ -662,7 +663,7 @@ body.slim-container .layout.layout-container,body.slim-container .layout .layout .flex-layout-item.width-300{width:300px} body.mainmenu-open{overflow:hidden} .mainmenu-tooltip .tooltip-inner{font-size:16px;padding:6px 16px;border-radius:0} -nav#layout-mainmenu{background-color:#111111;padding:0 0 0 20px;line-height:0;white-space:nowrap;vertical-align:top;height:78px} +nav#layout-mainmenu{background-color:#111111;padding:0 0 0 20px;line-height:0;white-space:nowrap;vertical-align:top;height:60px} nav#layout-mainmenu a{text-decoration:none} nav#layout-mainmenu a:focus{background:transparent} nav#layout-mainmenu ul{margin:0;padding:0;list-style:none;float:left;white-space:nowrap;overflow:hidden} @@ -683,38 +684,41 @@ 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 i{font-size:20px} -nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview a{height:62px;line-height:62px;padding:0 15px;margin:8px 0 8px 11px} +nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview a{height:44px;line-height:44px;padding:0 15px;margin:8px 0 8px 11px} nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account{margin-right:0} -nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account > a{height:78px;line-height:78px;padding:0 20px 0 10px;font-size:16px;position:relative;z-index:590} -nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account img{width:40px;margin-right:15px;border-radius:999px} +nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account > a{height:60px;line-height:60px;padding:0 15px 0 10px;font-size:16px;position:relative;z-index:590} +nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account img{width:45px;margin-left:15px} nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account ul{line-height:23px} -nav#layout-mainmenu:hover ul.mainmenu-nav li{-webkit-transition:opacity 0.15s ease;transition:opacity 0.15s ease;opacity:1;filter:alpha(opacity=100)} -nav#layout-mainmenu ul.mainmenu-nav li a{position:relative;width:65px;height:65px} -nav#layout-mainmenu ul.mainmenu-nav li a .nav-icon{text-align:center;display:block;position:absolute;top:50%;left:50%;margin-left:-15px;margin-top:-22.5px;width:30px;height:30px} -nav#layout-mainmenu ul.mainmenu-nav li a .nav-icon i,nav#layout-mainmenu ul.mainmenu-nav li a .nav-icon img{margin:0} -nav#layout-mainmenu ul.mainmenu-nav li a .nav-label{display:block;width:100px;height:20px;line-height:23px;position:absolute;bottom:0;left:50%;padding:0 5px;margin-left:-50px;overflow:hidden;text-overflow:ellipsis;text-align:center} -nav#layout-mainmenu ul.mainmenu-nav li{opacity:0.65;filter:alpha(opacity=65);-webkit-transition:opacity 5s ease;transition:opacity 5s ease;-webkit-transition-delay:5s;transition-delay:5s;margin-right:30px;padding:3px 0} -nav#layout-mainmenu ul.mainmenu-nav li:first-child{margin-left:8px} -nav#layout-mainmenu ul.mainmenu-nav li:last-child{margin-right:0} -nav#layout-mainmenu ul.mainmenu-nav li.active{opacity:1;filter:alpha(opacity=100)} -nav#layout-mainmenu ul.mainmenu-nav li.active a .nav-label{text-shadow:1px 1px 0 rgba(255,255,255,0.3)} -nav#layout-mainmenu ul.mainmenu-nav li:hover .nav-label{width:auto;min-width:100px;text-overflow:all;overflow:visible;background-color:#111111;z-index:2} -nav#layout-mainmenu .menu-toggle{display:inline-block;font-size:15px;color:inherit;outline:none;height:78px;line-height:78px;display:none} +nav#layout-mainmenu ul.mainmenu-nav li{margin-right:30px} +nav#layout-mainmenu ul.mainmenu-nav.nav-inline li a{padding:15px 0} +nav#layout-mainmenu ul.mainmenu-nav.nav-inline li a .nav-icon{position:relative;top:-1px;margin-right:5px;width:30px;height:30px} +nav#layout-mainmenu ul.mainmenu-nav.nav-inline li a .nav-icon i,nav#layout-mainmenu ul.mainmenu-nav.nav-inline li a .nav-icon img{margin:0} +nav#layout-mainmenu ul.mainmenu-nav.nav-inline li a .nav-label{line-height:30px} +nav#layout-mainmenu ul.mainmenu-nav.nav-inline li:first-child{margin-left:2px} +nav#layout-mainmenu ul.mainmenu-nav.nav-inline li:last-child{margin-right:0} +nav#layout-mainmenu ul.mainmenu-nav.nav-tiles li a{position:relative;width:65px;height:65px} +nav#layout-mainmenu ul.mainmenu-nav.nav-tiles li a .nav-icon{text-align:center;display:block;position:absolute;top:50%;left:50%;margin-left:-15px;margin-top:-22.5px;width:30px;height:30px} +nav#layout-mainmenu ul.mainmenu-nav.nav-tiles li a .nav-icon i,nav#layout-mainmenu ul.mainmenu-nav.nav-tiles li a .nav-icon img{margin:0} +nav#layout-mainmenu ul.mainmenu-nav.nav-tiles li a .nav-label{display:block;width:100px;height:20px;line-height:20px;position:absolute;bottom:0;left:50%;padding:0 5px;margin-left:-50px;overflow:hidden;text-overflow:ellipsis;text-align:center} +nav#layout-mainmenu ul.mainmenu-nav.nav-tiles li{padding:3px 0} +nav#layout-mainmenu ul.mainmenu-nav.nav-tiles li:first-child{margin-left:8px} +nav#layout-mainmenu ul.mainmenu-nav.nav-tiles li:last-child{margin-right:0} +nav#layout-mainmenu ul.mainmenu-nav.nav-tiles li.active a .nav-label{text-shadow:1px 1px 0 rgba(255,255,255,0.3)} +nav#layout-mainmenu ul.mainmenu-nav.nav-tiles li:hover .nav-label{width:auto;min-width:100px;text-overflow:all;overflow:visible;background-color:#111111;z-index:2} +nav#layout-mainmenu .menu-toggle{display:inline-block;font-size:15px;color:inherit;outline:none;height:60px;line-height:60px;display:none} nav#layout-mainmenu .menu-toggle:hover{background-color:transparent !important} nav#layout-mainmenu .menu-toggle:active,nav#layout-mainmenu .menu-toggle:focus{text-decoration:none;color:#555555} nav#layout-mainmenu .menu-toggle i{line-height:1;font-size:30px;vertical-align:middle} nav#layout-mainmenu .menu-toggle > i{margin-right:10px} html.svg nav#layout-mainmenu img.svg-icon,html.svg .mainmenu-collapsed img.svg-icon{display:inline-block} -nav#layout-mainmenu ul li .mainmenu-accountmenu{position:fixed;top:78px;right:0;background:#2b3e50;z-index:590;display:none} +nav#layout-mainmenu ul li .mainmenu-accountmenu{position:fixed;top:60px;right:0;background:#2b3e50;z-index:590;display:none} nav#layout-mainmenu ul li .mainmenu-accountmenu.active{display:block} -nav#layout-mainmenu ul li .mainmenu-accountmenu:after{content:'';display:block;width:0;height:0;border-left:11px solid transparent;border-right:11px solid transparent;border-bottom:12px solid #2b3e50;right:40px;top:-12px;position:absolute} +nav#layout-mainmenu ul li .mainmenu-accountmenu:after{content:'';display:block;width:0;height:0;border-left:11px solid transparent;border-right:11px solid transparent;border-bottom:12px solid #2b3e50;right:26px;top:-12px;position:absolute} nav#layout-mainmenu ul li .mainmenu-accountmenu ul{float:none;display:block} nav#layout-mainmenu ul li .mainmenu-accountmenu li{padding:0;margin:0;font-weight:normal;text-align:left;display:block} nav#layout-mainmenu ul li .mainmenu-accountmenu li a{display:block;padding:12px 30px;text-align:left} 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} -@media (max-width:768px){nav#layout-mainmenu ul li .mainmenu-accountmenu:after{right:71px} -} nav#layout-mainmenu.navbar ul li:hover a:active,.mainmenu-collapsed li:hover a:active,nav#layout-mainmenu.navbar ul li:hover a:focus,.mainmenu-collapsed li:hover a:focus{color:#ffffff !important} .touch .mainmenu-collapsed li a:hover{color:#555555} nav#layout-mainmenu.navbar ul li.active,.mainmenu-collapsed li.active,nav#layout-mainmenu.navbar ul li.highlight,.mainmenu-collapsed li.highlight{color:#ffffff !important} @@ -753,7 +757,7 @@ body.mainmenu-open .mainmenu-collapsed ul{position:fixed;left:0;top:10px;bottom: #layout-sidenav ul,#layout-sidenav ul li:first-child a{-webkit-box-shadow:inset 0 6px 3px -3px rgba(0,0,0,0.1);box-shadow:inset 0 6px 3px -3px rgba(0,0,0,0.1)} #layout-sidenav ul:after{content:'';position:absolute;height:100%;top:0;right:0;width:10px;-webkit-box-shadow:inset -5px 0 3px rgba(0,0,0,0.1);box-shadow:inset -5px 0 3px rgba(0,0,0,0.1)} #layout-sidenav ul li{display:block;text-align:center;position:relative} -#layout-sidenav ul li a{padding:20px 10px;display:block;font-size:14px;color:rgba(255,255,255,0.35);font-weight:normal;position:relative} +#layout-sidenav ul li a{padding:20px 10px;display:block;font-size:13px;color:rgba(255,255,255,0.35);font-weight:normal;position:relative} #layout-sidenav ul li a:hover{text-decoration:none;background-color:transparent} #layout-sidenav ul li a:focus{background:transparent} #layout-sidenav ul li a i{color:rgba(255,255,255,0.35);display:block;margin-bottom:5px;font-size:28px} @@ -805,9 +809,9 @@ body.outer .layout > .layout-row > .layout-cell .outer-form-container .forgot-pa body.outer .layout > .layout-row > .layout-cell .outer-form-container .forgot-password:before{color:rgba(255,255,255,0.44);font-size:14px;position:relative;margin-right:5px} html.csstransitions body.outer .outer-form-container{-webkit-transition:all 0.5s ease-out;transition:all 0.5s ease-out;-webkit-transform:scale(1,1);-moz-transform:scale(1,1);-ms-transform:scale(1,1);-o-transform:scale(1,1);transform:scale(1,1)} html.csstransitions body.outer.preload .outer-form-container{-webkit-transform:scale(0.2,0.2);-moz-transform:scale(0.2,0.2);-ms-transform:scale(0.2,0.2);-o-transform:scale(0.2,0.2);transform:scale(0.2,0.2)} -@media (max-width:768px){body.outer .layout > .layout-row.layout-head > .layout-cell{padding:50px 25px} -body.outer .layout > .layout-row > .layout-cell .outer-form-container{width:auto;padding:25px} -body.outer .layout > .layout-row > .layout-cell .outer-form-container .horizontal-form input{display:block;width:100% !important;margin-bottom:25px} +@media (max-width:768px){body.outer .layout > .layout-row.layout-head > .layout-cell{padding:50px 20px} +body.outer .layout > .layout-row > .layout-cell .outer-form-container{width:auto;padding:20px} +body.outer .layout > .layout-row > .layout-cell .outer-form-container .horizontal-form input{display:block;width:100% !important;margin-bottom:20px} } .fancy-layout .tab-collapse-icon{position:absolute;display:block;text-decoration:none;outline:none;opacity:0.6;filter:alpha(opacity=60);-webkit-transition:all 0.3s;transition:all 0.3s;font-size:12px;color:#ffffff;right:11px} .fancy-layout .tab-collapse-icon:hover{text-decoration:none;opacity:1;filter:alpha(opacity=100)} @@ -843,10 +847,13 @@ 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: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} .fancy-layout .control-tabs.master-tabs.has-tabs:before,.fancy-layout.control-tabs.master-tabs.has-tabs:before,.fancy-layout .control-tabs.master-tabs.has-tabs:after,.fancy-layout.control-tabs.master-tabs.has-tabs:after{display:block} -.fancy-layout .control-tabs.secondary-tabs > div > ul.nav-tabs,.fancy-layout.control-tabs.secondary-tabs > div > ul.nav-tabs{background:#475354;padding-left:15px} +.fancy-layout .control-tabs.secondary-tabs:before,.fancy-layout.control-tabs.secondary-tabs:before{left:5px} +.fancy-layout .control-tabs.secondary-tabs:after,.fancy-layout.control-tabs.secondary-tabs:after{right:5px} +.fancy-layout .control-tabs.secondary-tabs > div > ul.nav-tabs,.fancy-layout.control-tabs.secondary-tabs > div > ul.nav-tabs{background:#475354} .fancy-layout .control-tabs.secondary-tabs > div > ul.nav-tabs > li,.fancy-layout.control-tabs.secondary-tabs > div > ul.nav-tabs > li{border-right:none;padding-right:0;margin-right:0} .fancy-layout .control-tabs.secondary-tabs > div > ul.nav-tabs > li a,.fancy-layout.control-tabs.secondary-tabs > div > ul.nav-tabs > li a{background:transparent;border:none;padding:12px 10px 13px 10px;font-size:14px;font-weight:normal;line-height:14px;color:#919898} .fancy-layout .control-tabs.secondary-tabs > div > ul.nav-tabs > li a span span,.fancy-layout.control-tabs.secondary-tabs > div > ul.nav-tabs > li a span span{overflow:visible;border-top:none;margin-top:0;padding-top:0} +.fancy-layout .control-tabs.secondary-tabs > div > ul.nav-tabs > li:first-child,.fancy-layout.control-tabs.secondary-tabs > div > ul.nav-tabs > li:first-child{padding-left:15px} .fancy-layout .control-tabs.secondary-tabs > div > ul.nav-tabs > li.active a,.fancy-layout.control-tabs.secondary-tabs > div > ul.nav-tabs > li.active a{color:#ffffff} .fancy-layout .control-tabs.secondary-tabs .tab-collapse-icon,.fancy-layout.control-tabs.secondary-tabs .tab-collapse-icon{position:absolute;display:block;text-decoration:none;outline:none;opacity:0.6;filter:alpha(opacity=60);-webkit-transition:all 0.3s;transition:all 0.3s;font-size:12px;color:#ffffff;right:11px} .fancy-layout .control-tabs.secondary-tabs .tab-collapse-icon:hover,.fancy-layout.control-tabs.secondary-tabs .tab-collapse-icon:hover{text-decoration:none;opacity:1;filter:alpha(opacity=100)} @@ -887,12 +894,12 @@ body.outer .layout > .layout-row > .layout-cell .outer-form-container .horizonta .fancy-layout .control-tabs.primary-tabs > div > ul.nav-tabs > li.active a:before,.fancy-layout.control-tabs.primary-tabs > div > ul.nav-tabs > li.active a:before{display:none} .fancy-layout .control-tabs.primary-tabs > div > ul.nav-tabs > li.active a span.title,.fancy-layout.control-tabs.primary-tabs > div > ul.nav-tabs > li.active a span.title{background:#fafafa} .fancy-layout .control-tabs.primary-tabs > div > ul.nav-tabs > li.active a span.title:before,.fancy-layout.control-tabs.primary-tabs > div > ul.nav-tabs > li.active a span.title:before,.fancy-layout .control-tabs.primary-tabs > div > ul.nav-tabs > li.active a span.title:after,.fancy-layout.control-tabs.primary-tabs > div > ul.nav-tabs > li.active a span.title:after{background:#fafafa} -.fancy-layout .control-tabs.primary-tabs > .tab-content > .tab-pane,.fancy-layout.control-tabs.primary-tabs > .tab-content > .tab-pane{padding:25px 25px 0 25px} +.fancy-layout .control-tabs.primary-tabs > .tab-content > .tab-pane,.fancy-layout.control-tabs.primary-tabs > .tab-content > .tab-pane{padding:20px 20px 0 20px} .fancy-layout .control-tabs.primary-tabs > .tab-content > .tab-pane.pane-compact,.fancy-layout.control-tabs.primary-tabs > .tab-content > .tab-pane.pane-compact{padding:0} .fancy-layout .control-tabs.primary-tabs.collapsed,.fancy-layout.control-tabs.primary-tabs.collapsed{display:none} .fancy-layout .control-tabs.has-tabs > div.tab-content,.fancy-layout.control-tabs.has-tabs > div.tab-content{background:#f9f9f9} .fancy-layout .control-tabs > div.tab-content > div.tab-pane,.fancy-layout.control-tabs > div.tab-content > div.tab-pane{padding:0} -.fancy-layout .control-tabs > div.tab-content > div.tab-pane.padded-pane,.fancy-layout.control-tabs > div.tab-content > div.tab-pane.padded-pane{padding:25px 25px 0 25px} +.fancy-layout .control-tabs > div.tab-content > div.tab-pane.padded-pane,.fancy-layout.control-tabs > div.tab-content > div.tab-pane.padded-pane{padding:20px 20px 0 20px} .fancy-layout .form-tabless-fields{position:relative;background:#e67e22;padding:18px 23px 0 23px;-webkit-transition:all 0.5s;transition:all 0.5s} .fancy-layout .form-tabless-fields:before,.fancy-layout .form-tabless-fields:after{content:" ";display:table} .fancy-layout .form-tabless-fields:after{clear:both} diff --git a/modules/backend/assets/less/controls/filelist.less b/modules/backend/assets/less/controls/filelist.less index 5cd0c17b6..fd7b8fa42 100644 --- a/modules/backend/assets/less/controls/filelist.less +++ b/modules/backend/assets/less/controls/filelist.less @@ -21,7 +21,7 @@ padding: 22px 0; margin: 0; color: @color-filelist-norecords-text; - font-size: 14px; + font-size: @font-size-base; text-align: center; font-weight: normal; .border-radius(@border-radius-base); @@ -69,12 +69,12 @@ &.title { font-weight: normal; color: @color-text-title; - font-size: 14px; + font-size: @font-size-base; } &.description { color: @color-text-description; - font-size: 13px; + font-size: @font-size-base - 2; white-space: nowrap; font-weight: normal; overflow: hidden; @@ -91,7 +91,7 @@ &.group { > h4, > div.group > h4 { font-weight: normal; - font-size: 14px; + font-size: @font-size-base; margin-top: 0; margin-bottom: 0; position: relative; @@ -174,7 +174,7 @@ a.control { color: @color-text-title; - font-size: 14px; + font-size: @font-size-base; visibility: hidden; overflow: hidden; width: 14px; @@ -232,6 +232,10 @@ } } + // + // Templates have emphasis + // + &.hero { .a-hover() { background: @color-filelist-hero-hover-bg; @@ -252,17 +256,17 @@ > a { padding: 16px 45px 15px 50px; - font-size: 13px; + font-size: @font-size-base - 1; border-bottom: 1px solid @color-panel-light; span.title { - font-size: 15px; + font-size: @font-size-base + 1; font-weight: normal; color: @color-filelist-title-hero; } span.description { - font-size: 14px; + font-size: @font-size-base; } .list-icon { diff --git a/modules/backend/assets/less/controls/sidenav-tree.less b/modules/backend/assets/less/controls/sidenav-tree.less index 975b66af2..5bc9ea9c9 100644 --- a/modules/backend/assets/less/controls/sidenav-tree.less +++ b/modules/backend/assets/less/controls/sidenav-tree.less @@ -105,6 +105,7 @@ > ul { li { + a { display: block; position: relative; @@ -113,6 +114,7 @@ border-bottom: 1px solid @color-sidebarnav-tree-group-bg; color: @color-sidebarnav-tree-inactive-text; text-decoration: none!important; + .opacity(.65); &:after { .sidenav-tree-shadow-element(); @@ -135,18 +137,23 @@ &.header { color: @color-sidebarnav-tree-inactive-header; - font-size: 16px; + font-size: @font-size-base + 1; margin-bottom: 5px; } &.description { color: @color-sidebarnav-tree-inactive-desc; - font-size: 15px; + font-size: @font-size-base - 1; } } } - &.active a, &:hover a { + &:hover a, + &.active a { + .opacity(1); + } + + &.active a { background: @color-sidebarnav-tree-active-bg; color: @color-sidebarnav-tree-active-text; diff --git a/modules/backend/assets/less/controls/treeview.less b/modules/backend/assets/less/controls/treeview.less index 3b0718835..c21c3076b 100644 --- a/modules/backend/assets/less/controls/treeview.less +++ b/modules/backend/assets/less/controls/treeview.less @@ -5,7 +5,7 @@ padding: 18px 0; margin: 0; color: @color-filelist-norecords-text; - font-size: 12px; + font-size: @font-size-base; text-align: center; font-weight: 400; } @@ -20,7 +20,7 @@ .transition(width 1s); > div { - font-size: 15px; + font-size: @font-size-base + 1; font-weight: normal; background: @color-treeview-item-bg; border-bottom: 1px solid @color-panel-light; @@ -53,7 +53,7 @@ display: block; font-weight: 400; color: @color-treeview-item-comment; - font-size: 14px; + font-size: @font-size-base; margin-top: 2px; overflow: hidden; text-overflow: ellipsis; @@ -74,7 +74,7 @@ &:before { .icon(@caret-right); line-height: 100%; - font-size: 15px; + font-size: @font-size-base + 1; position: relative; left: 8px; @@ -138,7 +138,7 @@ } li { - font-size: 12px; + font-size: @font-size-base - 2; a { display: block; @@ -422,7 +422,7 @@ padding: 13px 15px; border: dotted 2px #ebebeb; color: #bdc3c7; - font-size: 12px; + font-size: @font-size-base - 2; font-weight: 600; text-transform: uppercase; .border-radius(5px); @@ -430,8 +430,8 @@ &:hover { text-decoration: none; - background-color: @color-treeview-hover-bg!important; - color: @color-treeview-hover-text!important; + background-color: @color-treeview-hover-bg !important; + color: @color-treeview-hover-text !important; border: none; padding: 15px 17px; } @@ -445,7 +445,7 @@ /* * Light version of the treeview - transparent background, no bottom borders, * smaller paddings, inline submenu - */ + */ &.light { margin-bottom: 0; margin-top: 20px; @@ -519,7 +519,7 @@ vertical-align: middle; height: 100%; padding: 0 20px; - font-size: 13px; + font-size: @font-size-base - 1; .box-sizing(border-box); i.control-icon { diff --git a/modules/backend/assets/less/layout/fancylayout.less b/modules/backend/assets/less/layout/fancylayout.less index 45c620986..7c4706a32 100644 --- a/modules/backend/assets/less/layout/fancylayout.less +++ b/modules/backend/assets/less/layout/fancylayout.less @@ -195,9 +195,15 @@ } &.secondary-tabs { + // Target horizontal scroll indicators + &:before { + left: 5px; + } + &:after { + right: 5px; + } > div > ul.nav-tabs { background: @color-fancy-secondary-tabs-bg; - padding-left: 15px; > li { border-right: none; padding-right: 0; @@ -221,6 +227,10 @@ } } + &:first-child { + padding-left: 15px; // Will cause issues when first child is hidden + } + &.active { a {color: @color-fancy-secondary-tabs-active-text;} } diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less index 07c3a988c..c7c3ea951 100644 --- a/modules/backend/assets/less/layout/mainmenu.less +++ b/modules/backend/assets/less/layout/mainmenu.less @@ -2,9 +2,12 @@ // Top navigation bar // -------------------------------------------------- -@mainmenu-height: 78px; +//mainmenu-height: 78px; +@mainmenu-height: 60px; +@mainmenu-icon-dimension: 30px; + +// Stacked nav @mainmenu-tile-dimension: 65px; -@mainmenu-tile-icon-dimension: 30px; @mainmenu-tile-label-height: 20px; @mainmenu-tile-label-width: 100px; @@ -14,7 +17,7 @@ body.mainmenu-open { .mainmenu-item-link() { display: inline-block; - font-size: 15px; + font-size: @font-size-base + 1; color: inherit; outline: none; @@ -36,7 +39,7 @@ body.mainmenu-open { .mainmenu-tooltip { .tooltip-inner { - font-size: 16px; + font-size: @font-size-base + 2; padding: 6px 16px; border-radius: 0; } @@ -144,7 +147,7 @@ nav#layout-mainmenu { > a { height: @mainmenu-height; line-height: @mainmenu-height; - padding: 0 20px 0 10px; + padding: 0 15px 0 10px; font-size: 16px; position: relative; // z-index: 200; // Previous value 590 was overlappnig with drop-down menus on small screens @@ -152,9 +155,8 @@ nav#layout-mainmenu { } img { - width: 40px; - margin-right: 15px; - border-radius: 999px; + width: 45px; + margin-left: 15px; } ul { @@ -164,17 +166,64 @@ nav#layout-mainmenu { } // - // Tiles + // Menu items // &:hover { ul.mainmenu-nav li { - .transition(opacity .15s ease); - .opacity(1); + //.transition(opacity .15s ease); + //.opacity(1); } } - ul.mainmenu-nav { + ul.mainmenu-nav li { + //.opacity(.65); + //.transition(opacity 5s ease); + //.transition-delay(5s); + margin-right: 30px; + + &.active { + //.opacity(1); + } + } + + // + // Menu items (Inline mode) + // + + ul.mainmenu-nav.nav-inline { + li a { + padding: 15px 0; + + .nav-icon { + position: relative; + top: -1px; + margin-right: 5px; + width: @mainmenu-icon-dimension; + height: @mainmenu-icon-dimension; + i, img { margin: 0; } + } + .nav-label { + line-height: @mainmenu-icon-dimension; + } + } + + li { + &:first-child { + margin-left: 2px; + } + + &:last-child { + margin-right: 0; + } + } + } + + // + // Menu items (Tile mode) + // + + ul.mainmenu-nav.nav-tiles { li a { position: relative; width: @mainmenu-tile-dimension; @@ -186,10 +235,10 @@ nav#layout-mainmenu { position: absolute; top: 50%; left: 50%; - margin-left: -(@mainmenu-tile-icon-dimension / 2); + margin-left: -(@mainmenu-icon-dimension / 2); margin-top: -(@mainmenu-tile-dimension - @mainmenu-tile-label-height) / 2; - width: @mainmenu-tile-icon-dimension; - height: @mainmenu-tile-icon-dimension; + width: @mainmenu-icon-dimension; + height: @mainmenu-icon-dimension; i, img { margin: 0; } } @@ -197,7 +246,7 @@ nav#layout-mainmenu { display: block; width: @mainmenu-tile-label-width; height: @mainmenu-tile-label-height; - line-height: (@mainmenu-tile-label-height+3); + line-height: @mainmenu-tile-label-height; position: absolute; bottom: 0; left: 50%; @@ -210,11 +259,6 @@ nav#layout-mainmenu { } li { - .opacity(.65); - .transition(opacity 5s ease); - .transition-delay(5s); - - margin-right: 30px; padding: 3px 0; &:first-child { @@ -226,8 +270,6 @@ nav#layout-mainmenu { } &.active { - .opacity(1); - a .nav-label { text-shadow: 1px 1px 0 rgba(255,255,255,.3); } @@ -286,7 +328,7 @@ nav#layout-mainmenu ul li .mainmenu-accountmenu { &:after { .triangle(up, 22px, 12px, @color-accountmenu-bg); - right: 40px; + right: 26px; top: -12px; position: absolute; } @@ -319,12 +361,6 @@ nav#layout-mainmenu ul li .mainmenu-accountmenu { width: 100%; background-color: @color-accountmenu-divider; } - - @media (max-width: @screen-sm) { - &:after { - right: 71px; - } - } } nav#layout-mainmenu.navbar ul li:hover, diff --git a/modules/backend/assets/less/layout/sidenav.less b/modules/backend/assets/less/layout/sidenav.less index 1d4d23e19..3e611950a 100644 --- a/modules/backend/assets/less/layout/sidenav.less +++ b/modules/backend/assets/less/layout/sidenav.less @@ -43,7 +43,7 @@ a { padding: 20px 10px; display: block; - font-size: 14px; + font-size: @font-size-base - 1; color: @color-sidebarnav-inactive-text; font-weight: normal; position: relative; diff --git a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css index fc4983d13..20823f3d6 100755 --- a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css +++ b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css @@ -1,29 +1,29 @@ .redactor-editor figure{position:relative} -.redactor-editor figcaption{text-align:center;line-height:21px;font-size:15px} +.redactor-editor figcaption{text-align:center;line-height:20px;font-size:14px} .redactor-editor figure[data-type=table]{clear:both} -.redactor-editor figure[data-type=video]{position:relative;margin-bottom:21px;text-align:center;clear:both} +.redactor-editor figure[data-type=video]{position:relative;margin-bottom:20px;text-align:center;clear:both} .redactor-editor figure[data-type=video] p{margin:0} .redactor-editor figure[data-type=video].oc-figure-full:before{position:relative;padding-bottom:51%;width:100%;height:0;content:"";display:block} .redactor-editor figure[data-type=video].oc-figure-full iframe{width:100%;height:100%;position:absolute;left:0;top:0} -.redactor-editor figure[data-type=image]{position:relative;margin-bottom:21px} +.redactor-editor figure[data-type=image]{position:relative;margin-bottom:20px} .redactor-editor figure[data-type=image] .oc-figure-controls{top:0px} .redactor-editor figure[data-type=image] img{width:100%} .redactor-editor figure[data-type=image].oc-figure-large{width:100%;clear:both} .redactor-editor figure[data-type=image].oc-figure-medium{width:50%} .redactor-editor figure[data-type=image].oc-figure-small{width:33%} -.redactor-editor figure[data-type=quote]{font-family:Georgia,serif;margin-bottom:21px;margin-left:21px;font-style:italic;position:relative;border-left:solid 4px #cccccc;padding-left:21px} +.redactor-editor figure[data-type=quote]{font-family:Georgia,serif;margin-bottom:20px;margin-left:20px;font-style:italic;position:relative;border-left:solid 4px #cccccc;padding-left:20px} .redactor-editor figure[data-type=quote] figcaption{font-weight:bold;text-align:left} .redactor-editor figure[data-type=quote] .oc-figure-controls{margin-left:-5px} .redactor-editor figure[data-type=quote].oc-figure-medium,.redactor-editor figure[data-type=quote].oc-figure-medium blockquote{font-size:20px} .redactor-editor figure[data-type=quote].oc-figure-large,.redactor-editor figure[data-type=quote].oc-figure-large blockquote{font-size:24px} .redactor-editor figure[data-type=quote].oc-figure-right{width:33%} -.redactor-editor figure[data-type=quote].oc-figure-left{width:33%;border-left:none;border-right:solid 4px #cccccc;padding-left:0;padding-right:21px;margin-left:0;margin-right:21px} +.redactor-editor figure[data-type=quote].oc-figure-left{width:33%;border-left:none;border-right:solid 4px #cccccc;padding-left:0;padding-right:20px;margin-left:0;margin-right:20px} .redactor-editor figure[data-type=quote].oc-figure-left .oc-figure-controls{margin-left:0;margin-right:-5px} .redactor-editor figure[data-type=quote] cite{display:block;text-align:left;font-weight:normal} .redactor-editor figure[data-type=quote] cite:before{content:"\2014\00a0"} .redactor-editor figure[data-type=quote] cite:empty:before{opacity:0.4;content:"\2014 Type to add citation (optional)"} .redactor-box figcaption:empty:before{opacity:.4;content:"Type to add caption (optional)"} -.redactor-box .oc-figure-controls{background:#2b3e50 !important;padding:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;position:absolute;display:none;white-space:nowrap;left:10px;top:-50px;margin:0 auto;font-family:sans-serif;line-height:21px;font-style:normal;z-index:1100;text-align:center} +.redactor-box .oc-figure-controls{background:#2b3e50 !important;padding:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;position:absolute;display:none;white-space:nowrap;left:10px;top:-50px;margin:0 auto;font-family:sans-serif;line-height:20px;font-style:normal;z-index:1100;text-align:center} .redactor-box .oc-figure-controls:after{content:' ';left:0;position:absolute;display:block;height:10px;background:rgba(0,0,0,0.1);width:100%;bottom:-10px;opacity:0.1;filter:alpha(opacity=10)} .redactor-box .oc-figure-controls:before{content:'';display:block;width:0;height:0;border-left:8.5px solid transparent;border-right:8.5px solid transparent;border-top:9px solid #2b3e50;border-bottom-width:0;position:absolute;left:14px;bottom:-8px} .redactor-box figure:hover .oc-figure-controls{display:block} @@ -45,14 +45,14 @@ .redactor-box .oc-figure-controls span.oc-figure-controls-arrow-down:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f063"} .redactor-box .oc-figure-controls span.oc-figure-controls-resize-full:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f065"} .redactor-box .oc-figure-controls span.oc-figure-controls-resize-small:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f066"} -.redactor-box .oc-figure-controls span.oc-figure-controls-delete{margin-left:21px} +.redactor-box .oc-figure-controls span.oc-figure-controls-delete{margin-left:20px} .redactor-box .oc-figure-controls span.oc-figure-controls-delete:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f014"} .redactor-box .oc-figure-controls span.oc-figure-controls-delete:hover{background:#c63e26} -.redactor-box .oc-figure-controls span.oc-figure-controls-table{width:auto;padding-left:10.5px;padding-right:10.5px;text-align:left} +.redactor-box .oc-figure-controls span.oc-figure-controls-table{width:auto;padding-left:10px;padding-right:10px;text-align:left} .redactor-box .oc-figure-controls span.oc-figure-controls-table:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f0ce"} -.redactor-box .oc-figure-right{float:right;margin-left:21px} +.redactor-box .oc-figure-right{float:right;margin-left:20px} .redactor-box .oc-figure-right .oc-figure-controls{right:0} -.redactor-box .oc-figure-left{float:left;margin-right:21px} +.redactor-box .oc-figure-left{float:left;margin-right:20px} .redactor-box .oc-dropdown-menu,.redactor-box .oc-dropdown-menu ul{padding:0 !important} .redactor-box .oc-dropdown-menu ul{background-color:#ffffff !important} .redactor-box .oc-dropdown-menu a{text-decoration:none;padding:0 15px !important;color:#39454a !important;text-decoration:none !important;line-height:25px} diff --git a/modules/backend/layouts/_mainmenu.htm b/modules/backend/layouts/_mainmenu.htm index 8734d9076..6363d7065 100644 --- a/modules/backend/layouts/_mainmenu.htm +++ b/modules/backend/layouts/_mainmenu.htm @@ -10,7 +10,7 @@ label)) : 'CMS' ?> -