Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix body overflow causing scroll bars #697

Merged
merged 1 commit into from
Oct 17, 2018
Merged

Fix body overflow causing scroll bars #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/dist/styles/bundle.css
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions client/src/components/Menu/Menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@
background-color: $base-menu-bg;
box-shadow: inset $border-color -1px 0 0;
position: relative;
padding: 0 1px 0 0;
justify-content: flex-end;
padding-right: 1px;
border-top: 1px solid rgba($border-color, .5);

@include media-breakpoint-down(sm) {
Expand Down
12 changes: 8 additions & 4 deletions client/src/styles/legacy/_style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,13 +1354,17 @@ form.member-profile-form {

.cms-panel {
.cms-panel-toggle {
display: flex;
justify-content: flex-end;
padding: 0;

.toggle-collapse,
.toggle-expand {
height: 54px;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the parent .cms-panel-toggle is now always display: flex, these no longer need a hard-coded height as they’ll stretch automatically.

display: flex;
flex-direction: column;
justify-content: center;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To vertically centre the <span>&raquo;</span>, without relying on line-height hacks

text-align: right;
text-decoration: none;
line-height: 53px;

&:hover {
background-color: $base-menu;
Expand All @@ -1375,7 +1379,7 @@ form.member-profile-form {
}

.toggle-collapse {
display: block;
display: flex;
}

.toggle-expand {
Expand All @@ -1392,7 +1396,7 @@ form.member-profile-form {
}

.cms-panel-toggle a.toggle-expand {
display: block;
display: flex;
width: auto;
}
}
Expand Down
2 changes: 1 addition & 1 deletion templates/SilverStripe/Admin/Includes/LeftAndMain_Menu.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<% include SilverStripe\\Admin\\LeftAndMain_MenuList %>
</div>

<div class="toolbar toolbar--south cms-panel-toggle vertical-align-items">
<div class="toolbar toolbar--south cms-panel-toggle">
<% include SilverStripe\\Admin\\LeftAndMain_MenuToggle %>
</div>
</div>
Expand Down