summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2018-11-23 11:43:55 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2018-12-12 15:41:25 -0800
commit44ce070d1cf4b3a768b49b4a8af57fc2e86bdf98 (patch)
treeb940daa81e8e16fd2c58bec4c9d9df582556e4ba
parentb4c9044c433582050083df5c40993ef58d696be4 (diff)
downloadgitlab-ce-44ce070d1cf4b3a768b49b4a8af57fc2e86bdf98.tar.gz
Integrate .nav-links li a CSS for mobile to the specific CSS
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
-rw-r--r--app/assets/stylesheets/framework/header.scss8
-rw-r--r--app/assets/stylesheets/framework/mobile.scss8
2 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 45a52d99302..82906e5d427 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -602,3 +602,11 @@
@include emoji-menu-toggle-button;
}
}
+
+.nav-links > li > a {
+ .badge.badge-pill {
+ @include media-breakpoint-down(xs) { display: none; }
+ }
+
+ @include media-breakpoint-down(xs) { margin-right: 3px; }
+}
diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss
index b8ddc6cebc1..a3998c267db 100644
--- a/app/assets/stylesheets/framework/mobile.scss
+++ b/app/assets/stylesheets/framework/mobile.scss
@@ -4,14 +4,6 @@
margin-top: 20px;
}
- .nav-links > li > a {
- margin-right: 3px;
-
- .badge.badge-pill {
- display: none;
- }
- }
-
.container .title {
padding-left: 15px !important;
}