diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-02 07:57:15 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-06 12:12:11 -0700 |
| commit | ac4e3cfee3e0f060105788db3f44aaf1ba821421 (patch) | |
| tree | 7b9e96923dace19c38a9004845adc0f5845c2559 /app | |
| parent | 940e702468ecd8c811dc2f2f4602c38ebffd9742 (diff) | |
| download | gitlab-ce-ac4e3cfee3e0f060105788db3f44aaf1ba821421.tar.gz | |
Conflict fixes
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index c10e3467bef..32cf2f6aa3e 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -57,7 +57,7 @@ header { .navbar-toggle { min-width: 45px; - padding: 4px $gl-padding; + padding: 0 $gl-padding; margin-right: -7px; font-size: 14px; text-align: center; @@ -73,16 +73,16 @@ header { } } - .fa-times { + .close-icon { display: none; } .menu-expanded { - .fa-ellipsis-v { + .more-icon { display: none; } - .fa-times { + .close-icon { display: block; } } |