tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6294 from open-sausages/pulls/4.0/safari-layout-bugs

Browse Source 
Safari layout bugs for page actions toolbar and menu toggle area
This commit is contained in:
Daniel Hensby 2016-11-07 13:11:54 +00:00 committed by GitHub
commit 3f1be23c57
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/client/dist/styles/bundle.css vendored
View File

@ -12044,10 +12044,6 @@ li.class-ErrorPage>a .jstree-pageicon{
display:none; display:none;
} }
.cms-menu.collapsed.cms-panel .cms-panel-content{
display:block;
}
.cms-menu.collapsed .cms-menu-list li a{ .cms-menu.collapsed .cms-menu-list li a{
padding-left:18px; padding-left:18px;
padding-right:18px; padding-right:18px;
@ -12062,6 +12058,7 @@ li.class-ErrorPage>a .jstree-pageicon{
height:53px; height:53px;
background-color:#e9f0f4; background-color:#e9f0f4;
box-shadow:inset -1px 0 0 #c1c7cc; box-shadow:inset -1px 0 0 #c1c7cc;
position:relative;
} }
.cms-menu .cms-panel-toggle a,.cms-menu .cms-panel-toggle a.toggle-expand{ .cms-menu .cms-panel-toggle a,.cms-menu .cms-panel-toggle a.toggle-expand{

5
admin/client/src/styles/legacy/_menu.scss
View File

@ -149,10 +149,6 @@
} }
} }
&.cms-panel .cms-panel-content {
display: block; // override panel defaults
}
.cms-menu-list li a { .cms-menu-list li a {
padding-left: 18px; padding-left: 18px;
padding-right: 18px; padding-right: 18px;
@ -168,6 +164,7 @@
height: $toolbar-total-height; height: $toolbar-total-height;
background-color: $color-theme-bg; background-color: $color-theme-bg;
box-shadow: inset $color-separator -1px 0 0; box-shadow: inset $color-separator -1px 0 0;
position: relative;
a, a,
a.toggle-expand { a.toggle-expand {

6
admin/templates/SilverStripe/Admin/Includes/LeftAndMain_Menu.ss
View File

@ -1,10 +1,10 @@
<div class="cms-menu cms-panel cms-panel-layout" id="cms-menu" data-layout-type="border"> <div class="fill-height cms-menu cms-panel cms-panel-layout" id="cms-menu" data-layout-type="border">
<div class="cms-logo-header north"> <div class="cms-logo-header">
<% include SilverStripe\\Admin\\LeftAndMain_MenuLogo %> <% include SilverStripe\\Admin\\LeftAndMain_MenuLogo %>
<% include SilverStripe\\Admin\\LeftAndMain_MenuStatus %> <% include SilverStripe\\Admin\\LeftAndMain_MenuStatus %>
</div> </div>
<div class="panel--scrollable panel--triple-toolbar cms-panel-content"> <div class="flexbox-area-grow panel--scrollable panel--triple-toolbar cms-panel-content">
<% include SilverStripe\\Admin\\LeftAndMain_MenuList %> <% include SilverStripe\\Admin\\LeftAndMain_MenuList %>
</div> </div>

2
admin/templates/SilverStripe/Admin/Includes/LeftAndMain_MenuToggle.ss
View File

@ -1,4 +1,4 @@
<button class="sticky-toggle" type="button" title="Sticky nav">Sticky nav</button> <button class="sticky-toggle" type="button" title="Sticky nav">Sticky nav</button>
<span class="sticky-status-indicator">auto</span> <span class="sticky-status-indicator">Auto</span>
<a class="toggle-expand" href="#"><span>&raquo;</span></a> <a class="toggle-expand" href="#"><span>&raquo;</span></a>
<a class="toggle-collapse" href="#"><span>&laquo;</span></a> <a class="toggle-collapse" href="#"><span>&laquo;</span></a>