kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

[skip ci] Convert navbar-toggle to navbar-toggler

This commit is contained in:
Clement Ho 2018-04-10 13:10:52 -05:00
parent 46031d63cd
commit 737854e6c9
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/main.js
View File

@ -189,7 +189,7 @@ document.addEventListener('DOMContentLoaded', () => {
$container.remove(); $container.remove();
}); });
$('.navbar-toggle').on('click', () => { $('.navbar-toggler').on('click', () => {
$('.header-content').toggleClass('menu-expanded'); $('.header-content').toggleClass('menu-expanded');
gl.lazyLoader.loadCheck(); gl.lazyLoader.loadCheck();
}); });

6
app/assets/stylesheets/framework/gitlab_theme.scss
View File

@ -21,7 +21,7 @@
} }
.container-fluid { .container-fluid {
.navbar-toggle { .navbar-toggler {
border-left: 1px solid lighten($color-700, 10%); border-left: 1px solid lighten($color-700, 10%);
} }
} }
@ -289,8 +289,8 @@ body {
} }
.container-fluid { .container-fluid {
.navbar-toggle, .navbar-toggler,
.navbar-toggle:hover { .navbar-toggler:hover {
color: $theme-gray-700; color: $theme-gray-700;
border-left: 1px solid $theme-gray-200; border-left: 1px solid $theme-gray-200;
} }

2
app/assets/stylesheets/framework/header.scss
View File

@ -156,7 +156,7 @@
} }
} }
.navbar-toggle { .navbar-toggler {
right: -10px; right: -10px;
border-radius: 0; border-radius: 0;
min-width: 45px; min-width: 45px;

2
app/views/layouts/header/_default.html.haml
View File

@ -78,7 +78,7 @@
%div %div
= link_to "Sign in / Register", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in' = link_to "Sign in / Register", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in'
%button.navbar-toggle.d-block.d-sm-none{ type: 'button' } %button.navbar-toggler.d-block.d-sm-none{ type: 'button' }
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
= sprite_icon('more', size: 12, css_class: 'more-icon js-navbar-toggle-right') = sprite_icon('more', size: 12, css_class: 'more-icon js-navbar-toggle-right')
= sprite_icon('close', size: 12, css_class: 'close-icon js-navbar-toggle-left') = sprite_icon('close', size: 12, css_class: 'close-icon js-navbar-toggle-left')