diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-19 08:44:16 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-19 08:44:16 -0500 |
| commit | f5562355f4580ea049d33991aa0eaf76f46b17f7 (patch) | |
| tree | 34083b0be65a6b66fb4df2e0d59a67bb7fe7c599 | |
| parent | fbb27a4244994103ed94c4921fc47902a767b860 (diff) | |
| download | gitlab-ce-display-message-when-assignee-cannot-merge.tar.gz | |
Move multiple css rules to multiple lines.display-message-when-assignee-cannot-merge
Removes extra line breaks.
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 70239a74c85..3ec48da9a41 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -28,7 +28,6 @@ $gl-avatar-size: 46px; $secondary-text: #7f8fa4; $error-exclamation-point: #E62958; - /* * Color schema */ diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index b14033720b5..003a4c22f20 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -559,7 +559,8 @@ pre.light-well { } } -.cannot-be-merged, .cannot-be-merged:hover { +.cannot-be-merged, +.cannot-be-merged:hover { color: #E62958; margin-top: 2px; } |