diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-17 09:58:36 -0400 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-17 09:58:36 -0400 |
| commit | fd5fdb2c1aba95b8dc851e80cb7216551052122d (patch) | |
| tree | 745d4a60a5f029644767cee9e8284b514fcb5a5a /app/assets/stylesheets/pages | |
| parent | 42189e9185e59758deb93ea4ea625e2dc6f99524 (diff) | |
| parent | ec7163ae1db54f4adce7942673abc8a4a073fbd6 (diff) | |
| download | gitlab-ce-fd5fdb2c1aba95b8dc851e80cb7216551052122d.tar.gz | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/assets/stylesheets/pages')
| -rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 135cc5de0a5..1c3d312f7ac 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -1,5 +1,3 @@ -@import './issues/issue_count_badge'; - [v-cloak] { display: none; } diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 86c3dec17ec..19fb99bfa93 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -1,5 +1,3 @@ -@import "./issues/issue_count_badge"; - .issues-list { .issue { padding: 10px 0 10px $gl-padding; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index d865dbc828f..299eda53140 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -455,6 +455,10 @@ ul.notes { white-space: normal; } + .system-note-separator { + color: $gl-text-color-disabled; + } + a:hover { text-decoration: underline; } |