diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-07 17:05:42 -0600 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-12-14 20:02:10 -0500 |
commit | 18489218443ea6b8c6fdfd9ab953ff7ef84f69db (patch) | |
tree | 57e29e085855e7e6ecb7e85e813705cb06f3a7ce /app/assets | |
parent | f1d30769f3c3123b93f1e11ea9a76399719435c9 (diff) | |
download | gitlab-ce-18489218443ea6b8c6fdfd9ab953ff7ef84f69db.tar.gz |
Remove pages/snippets cssdelete-more-page-specific-css
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/emojis.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/snippets.scss (renamed from app/assets/stylesheets/pages/snippets.scss) | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/tw_bootstrap.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notifications.scss | 14 |
5 files changed, 6 insertions, 27 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 928ef408722..40bc0579393 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -46,3 +46,4 @@ @import "framework/broadcast-messages"; @import "framework/emojis.scss"; @import "framework/icons.scss"; +@import "framework/snippets.scss"; diff --git a/app/assets/stylesheets/framework/emojis.scss b/app/assets/stylesheets/framework/emojis.scss index f17797b2381..7158de65143 100644 --- a/app/assets/stylesheets/framework/emojis.scss +++ b/app/assets/stylesheets/framework/emojis.scss @@ -1,4 +1,4 @@ -.emoji-0023-20E3 { background-position: 0 0px; } +.emoji-0023-20E3 { background-position: 0 0; } .emoji-002A-20E3 { background-position: -20px 0; } .emoji-0030-20E3 { background-position: 0 -20px; } .emoji-0031-20E3 { background-position: -20px -20px; } diff --git a/app/assets/stylesheets/pages/snippets.scss b/app/assets/stylesheets/framework/snippets.scss index a6037d76797..5f7e1b17cc7 100644 --- a/app/assets/stylesheets/pages/snippets.scss +++ b/app/assets/stylesheets/framework/snippets.scss @@ -22,16 +22,6 @@ .snippet-file-content { border-radius: 3px; - margin-bottom: $gl-padding; - - .btn-clipboard { - @extend .btn; - } -} - -.project-snippets .awards { - border-bottom: 1px solid $white-normal; - padding-bottom: $gl-padding; } .snippet-header { diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss index 1a985ee2a66..d998d654aa4 100644 --- a/app/assets/stylesheets/framework/tw_bootstrap.scss +++ b/app/assets/stylesheets/framework/tw_bootstrap.scss @@ -21,7 +21,7 @@ @import "bootstrap/buttons"; // Components -// @import "bootstrap/component-animations"; +@import "bootstrap/component-animations"; // @import "bootstrap/dropdowns"; @import "bootstrap/button-groups"; @import "bootstrap/input-groups"; @@ -36,8 +36,8 @@ // @import "bootstrap/progress-bars"; @import "bootstrap/list-group"; // @import "bootstrap/wells"; -// @import "bootstrap/close"; -// @import "bootstrap/panels"; +@import "bootstrap/close"; +@import "bootstrap/panels"; // Components w/ JavaScript @import "bootstrap/modals"; diff --git a/app/assets/stylesheets/pages/notifications.scss b/app/assets/stylesheets/pages/notifications.scss index 7d61390a439..bdf07a99daf 100644 --- a/app/assets/stylesheets/pages/notifications.scss +++ b/app/assets/stylesheets/pages/notifications.scss @@ -10,19 +10,7 @@ position: relative; top: 1px; - > .fa { + .fa { font-size: 18px; } } - -.ns-part { - color: $gl-text-green; -} - -.ns-watch { - color: $gl-success; -} - -.ns-mute { - color: $gl-danger; -} |