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

Tidy up menu toggle buttons #690

Merged
merged 1 commit into from
Oct 16, 2018
Merged

Tidy up menu toggle buttons #690

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/js/bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/dist/styles/bundle.css
View file
Open in desktop

Large diffs are not rendered by default.

62 changes: 43 additions & 19 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,7 +129,7 @@
background-color: $base-menu-bg;
box-shadow: inset $border-color -1px 0 0;
position: relative;
padding-left: 0;
padding: 0 1px 0 0;
justify-content: flex-end;
border-top: 1px solid rgba($border-color, .5);

Expand All @@ -140,49 +140,73 @@
display: none;
}
}

a,
a.toggle-expand {
padding-top: 14px;
padding-bottom: 14px;
}
}



.sticky-toggle {
position: relative;
}

.sticky-toggle__button {
position: relative;
text-indent: -999em;
background-color: transparent;
background-image: url("../images/sticky-toggle-off.png");
background-repeat: no-repeat;
background-position: center center;
border: 0;
transition: position $transition-speed-fast;
width: 24px;
margin-right: -3px;
width: 28px;
height: 54px;
padding: 0 8px;

&:before,
&:after {
position: absolute;
top: 50%;
left: 50%;
border-radius: 50%;
content: "";
transform: translate(-50%, -50%);
}

&:before {
width: 13px;
height: 13px;
border: solid 1px $gray-600;
}

&:after {
display: none;
width: 8px;
height: 8px;
background: $gray-600;
border-radius: 50%;
}

&:hover {
background-color: $base-menu;
box-shadow: 0 0 0;
cursor: pointer;

// When the button is hovered, show the status indicator
+ .sticky-status-indicator {
+ .sticky-toggle__status {
display: block;
}
}

&.active {
background-image: url("../images/sticky-toggle-on.png");
&:after {
display: block;
}
}
}

.sticky-status-indicator {
.sticky-toggle__status {
display: none;
position: absolute;
top: 3px;
right: 22px;
left: 0;
width: 100%;
font-size: 9px;
color: #555d60;
color: $gray-600;
text-align: center;
text-transform: uppercase;
}

Expand Down
Binary file removed client/src/images/sticky-toggle-off.png
View file
Open in desktop
Binary file not shown.
Binary file removed client/src/images/sticky-toggle-on.png
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions client/src/legacy/LeftAndMain.Menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ $.entwine('ss', function($){
/**
* Toggles the manual override of the left menu's automatic expand / collapse behaviour.
*/
$('.cms-menu .sticky-toggle').entwine({
$('.cms-menu .sticky-toggle__button').entwine({

onadd: function () {
var isSticky = $('.cms-menu').getPersistedStickyState() ? true : false;
Expand All @@ -433,7 +433,7 @@ $.entwine('ss', function($){
* @desc Updates the indicator's text based on the sticky state of the menu.
*/
toggleIndicator: function (isSticky) {
this.next('.sticky-status-indicator').text(isSticky ? 'fixed' : 'auto');
this.next('.sticky-toggle__status').text(isSticky ? 'fixed' : 'auto');
},

onclick: function () {
Expand Down
14 changes: 8 additions & 6 deletions client/src/styles/legacy/_style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,17 +1357,20 @@ form.member-profile-form {

.toggle-collapse,
.toggle-expand {
height: 54px;
text-align: right;
padding: 16px 0;
text-decoration: none;
line-height: 20px;
margin: -#{map_get($spacers, xs)} #{0 - $panel-padding-x} -#{map_get($spacers, xs)} 0;
line-height: 53px;

&:hover {
background-color: $base-menu;
}

span {
display: inline-block;
margin: 0 8px;
color: #555d60;
font-size: 16px;
color: $gray-600;
font-size: 18px;
}
}

Expand All @@ -1376,7 +1379,6 @@ form.member-profile-form {
}

.toggle-expand {
width: 60px; // will set the collapsed width
display: none;
}
}
Expand Down
6 changes: 4 additions & 2 deletions templates/SilverStripe/Admin/Includes/LeftAndMain_MenuToggle.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
<% end_if %>
</div>

<button class="sticky-toggle" type="button" title="<%t SilverStripe\Admin\LeftAndMain.MenuToggleStickyNav "Sticky nav" %>"><%t SilverStripe\Admin\LeftAndMain.MenuToggleStickyNav "Sticky nav" %></button>
<span class="sticky-status-indicator"><%t SilverStripe\Admin\LeftAndMain.MenuToggleAuto "Auto" %></span>
<div class="sticky-toggle">
<button class="sticky-toggle__button" type="button" title="<%t SilverStripe\Admin\LeftAndMain.MenuToggleStickyNav "Sticky nav" %>"><%t SilverStripe\Admin\LeftAndMain.MenuToggleStickyNav "Sticky nav" %></button>
<span class="sticky-toggle__status sticky-status-indicator"><%t SilverStripe\Admin\LeftAndMain.MenuToggleAuto "Auto" %></span>
</div>

<a class="toggle-expand" href="#" data-toggle="tooltip" title="<%t SilverStripe\Admin\LeftAndMain.ExpandPanel "Expand panel" %>" aria-label="<%t SilverStripe\Admin\LeftAndMain.ExpandPanel "Expand panel" %>"><span>&raquo;</span></a>
<a class="toggle-collapse" href="#" data-toggle="tooltip" title="<%t SilverStripe\Admin\LeftAndMain.CollapsePanel "Collapse panel" %>" aria-label="<%t SilverStripe\Admin\LeftAndMain.CollapsePanel "Collapse panel" %>"><span>&laquo;</span></a>