diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-10-31 19:40:32 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-10-31 19:40:32 +0000 |
| commit | 95a87689778a1944104e562f82d3c347a0fa6241 (patch) | |
| tree | f219cc21f16c5afd5adfe9b5e24afa607ed76233 /app/assets | |
| parent | 5e65d498b019ddcae7b5224d21e7e62638a9b497 (diff) | |
| parent | 3f1778140e5b459d46b4d24b16a4b8af71394354 (diff) | |
| download | gitlab-ce-95a87689778a1944104e562f82d3c347a0fa6241.tar.gz | |
Merge branch 'gt-fix-quick-links-button-styles' into 'master'
Fix quick links button styles
Closes #52220 and #52063
See merge request gitlab-org/gitlab-ce!22657
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/secondary_navigation_elements.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/secondary_navigation_elements.scss b/app/assets/stylesheets/framework/secondary_navigation_elements.scss index f47dfe1b563..de9e7c37695 100644 --- a/app/assets/stylesheets/framework/secondary_navigation_elements.scss +++ b/app/assets/stylesheets/framework/secondary_navigation_elements.scss @@ -1,6 +1,6 @@ // For tabbed navigation links, scrolling tabs, etc. For all top/main navigation, // please check nav.scss -.nav-links { +.nav-links:not(.quick-links) { display: flex; padding: 0; margin: 0; @@ -106,7 +106,7 @@ display: inline-block; float: right; text-align: right; - padding: 11px 0; + padding: $gl-padding-8 0; margin-bottom: 0; > .btn, |