mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

This fixes the mis-aligned backend menu in Firefox browsers!

Browse Source 
Recompiled assets
This commit is contained in:
Samuel Georges 2015-03-06 20:42:23 +11:00
parent 690ec1e5db
commit 00e1f15d08
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/backend/assets/css/controls.css
View File

@ -556,7 +556,7 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
.tooltip .tooltip-inner{text-align:left;padding:5px 8px}
.tooltip.in{opacity:1;filter:alpha(opacity=100)}
.oc-logo-white{background-image:url(../images/october-logo-white.svg);background-position:50% 50%;background-repeat:no-repeat;background-size:contain}
.oc-bg-logo{background-image:url(../images/october-logo-transparent.svg);background-position:50% 50%;background-repeat:no-repeat;background-size:50% contain}
.oc-bg-logo{background-image:url(../images/october-logo-transparent.svg);background-position:50% 50%;background-repeat:no-repeat;background-size:50% auto}
.dropdown-menu{padding:0;background:transparent;border:none;-webkit-box-shadow:none;box-shadow:none}
.dropdown-menu .dropdown-container > ul{border:1px solid #949ea6;background-color:#ffffff;border-radius:2px;padding:0;list-style:none;position:relative;margin-top:7px}
.dropdown-menu .dropdown-container > ul:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-bottom:8px solid #ffffff;position:absolute;left:15px;top:-8px;z-index:101}
@ -872,11 +872,12 @@ div.control-popover.hero .inspector-fields div.custom-select.select2-container .
.select2-drop.ocInspectorDropdown .select2-search:after{position:absolute;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f002";right:8px;top:5px;color:#95a5a6}
.select2-drop.ocInspectorDropdown .select2-search input.select2-input{min-height:26px;background:transparent !important;padding-left:12px;padding-right:12px}
.select2-drop.ocInspectorDropdown.select2-drop-above .select2-search:after{top:7px}
div[data-control="balloon-selector"] ul{padding:0;margin-bottom:0}
div[data-control="balloon-selector"] ul li{list-style:none;display:inline-block;padding:6px 7px 5px;margin-right:5px;text-transform:uppercase;background:#bcc3c7;color:#ffffff;font-size:10px;line-height:100%;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;-webkit-transition:all 0.1s ease;transition:all 0.1s ease}
div[data-control="balloon-selector"] ul li.active{background:#da5700 !important}
div[data-control="balloon-selector"].control-disabled{opacity:0.5;filter:alpha(opacity=50)}
div[data-control="balloon-selector"]:not(.control-disabled) ul li:hover{background:#0181b9;cursor:pointer}
.control-balloon-selector ul{padding:0;margin-top:-5px}
.control-balloon-selector ul li{list-style:none;display:inline-block;padding:6px 7px 5px;margin-right:5px;margin-top:6px;text-transform:uppercase;background:#bcc3c7;color:#ffffff;font-size:10px;line-height:100%;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;-webkit-transition:all 0.1s ease;transition:all 0.1s ease}
.control-balloon-selector ul li.active{background:#da5700 !important}
.control-balloon-selector.control-disabled{opacity:0.5;filter:alpha(opacity=50)}
.control-balloon-selector:not(.control-disabled) ul li:hover{background:#0181b9;cursor:pointer}
.form-group .control-balloon-selector ul{margin-bottom:0}
.report-widget{padding:15px;background:white;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}
.report-widget h3{font-size:14px;color:#7e8c8d;text-transform:uppercase;font-weight:600;margin-top:0;margin-bottom:30px}
.report-widget .height-100{height:100px}

16
modules/backend/assets/css/october.css
View File

@ -2280,6 +2280,7 @@ nav#layout-mainmenu.navbar ul li.icon a{padding:14px}
nav#layout-mainmenu.navbar ul li.power-off i,nav#layout-mainmenu.navbar ul li.preview i{font-size:20px}
nav#layout-mainmenu.navbar ul li.power-off a,nav#layout-mainmenu.navbar ul li.preview a{padding:22px 20px 20px 20px}
nav#layout-mainmenu.navbar ul li.account{margin-right:0;line-height:23px}
nav#layout-mainmenu.navbar ul li.account a{padding-left:35px;padding-right:5px;position:relative;z-index:900}
nav#layout-mainmenu.navbar ul li.account img{width:25px;margin-right:7px;position:relative;top:-2px}
nav#layout-mainmenu.navbar ul.nav{display:inline-block}
nav#layout-mainmenu.navbar .menu-toggle{display:none}
@ -2289,10 +2290,20 @@ nav#layout-mainmenu.navbar .toolbar-item:before{left:-12px}
nav#layout-mainmenu.navbar .toolbar-item:after{right:-12px}
nav#layout-mainmenu.navbar .toolbar-item.scroll-active-before:before{color:#ffffff}
nav#layout-mainmenu.navbar .toolbar-item.scroll-active-after:after{color:#ffffff}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu{position:fixed;top:63px;right:0;width:225px;background:#3d3d3d;z-index:900;display:none}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu.active{display:block}
nav#layout-mainmenu.navbar 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 #3d3d3d;right:101px;top:-12px;position:absolute}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu ul{padding:12px 30px;float:none;display:block}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li{padding:0;font-weight:200;text-align:left;display:block}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li a{display:block;padding:9px 0;text-align:left;opacity:.65}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li a:hover{opacity:1}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li.divider{height:1px;width:100%;margin:9px 0;overflow:hidden;background-color:transparent;border-top:1px solid #343434}
@media (max-width:768px){nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu:after{right:71px}
}
nav#layout-mainmenu.navbar ul li a,nav#layout-mainmenu .menu-toggle,.mainmenu-collapsed li a{padding:14px 0;display:inline-block;font-size:14px;color:inherit;outline:none}
nav#layout-mainmenu.navbar ul li a:hover,nav#layout-mainmenu .menu-toggle:hover,.mainmenu-collapsed li a:hover{background-color:transparent !important}
nav#layout-mainmenu.navbar ul li a:active,nav#layout-mainmenu .menu-toggle:active,.mainmenu-collapsed li a:active,nav#layout-mainmenu.navbar ul li a:focus,nav#layout-mainmenu .menu-toggle:focus,.mainmenu-collapsed li a:focus{text-decoration:none;color:#555555}
nav#layout-mainmenu.navbar ul li a i,nav#layout-mainmenu .menu-toggle i,.mainmenu-collapsed li a i{font-size:35px;vertical-align:middle;margin-right:10px}
nav#layout-mainmenu.navbar ul li a i,nav#layout-mainmenu .menu-toggle i,.mainmenu-collapsed li a i{line-height:1;font-size:35px;vertical-align:middle;margin-right:10px}
.mainmenu-collapsed li a i{width:40px;text-align:left;display:inline-block}
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}
@ -2347,7 +2358,8 @@ body.mainmenu-open .mainmenu-collapsed ul{position:fixed;left:0;top:10px;bottom:
body.side-panel-not-fixed #layout-side-panel{display:none}
body.side-panel-not-fixed #layout-side-panel .fix-button{opacity:0.5;filter:alpha(opacity=50)}
body.display-side-panel #layout-side-panel{display:block;position:absolute;z-index:500;width:300px;-webkit-box-shadow:2px 0px 2px 0 rgba(0,0,0,0.3);box-shadow:2px 0px 2px 0 rgba(0,0,0,0.3)}
body.side-panel-fix-shadow #layout-side-panel{-webkit-box-shadow:none;box-shadow:none}
@media (min-width:992px){body.side-panel-fix-shadow #layout-side-panel{-webkit-box-shadow:none;box-shadow:none}
}
.touch #layout-side-panel .fix-button{display:none}
@media (max-width:768px){#layout-side-panel .fix-button{display:none}
}

1
modules/backend/assets/less/layout/mainmenu.less
View File

@ -173,6 +173,7 @@ nav#layout-mainmenu .menu-toggle,
}
i {
line-height: 1;
font-size: 35px;
vertical-align: middle;
margin-right: 10px;