diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 13:53:38 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 13:53:38 +0000 |
| commit | 73520b4307a70f948acca586a9df56c9618feba6 (patch) | |
| tree | 8e4f16a871e90952b2e3cc30d4a92235c2171137 /app/assets | |
| parent | d330046fc11b0b7589199be648d09ce6e53ec3e2 (diff) | |
| parent | 3871498b32a706ae27894f4a96ab326382e22afd (diff) | |
| download | gitlab-ce-73520b4307a70f948acca586a9df56c9618feba6.tar.gz | |
Merge branch 'style-changed-files' into 'master'
Improve UI for list of changed files
* fix paddings
* re-use system colors
## Before
## After
cc @skyruler
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1484
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/base/variables.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/generic/common.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/commit.scss | 27 |
3 files changed, 21 insertions, 15 deletions
diff --git a/app/assets/stylesheets/base/variables.scss b/app/assets/stylesheets/base/variables.scss index f6bdea9a897..befd63832d5 100644 --- a/app/assets/stylesheets/base/variables.scss +++ b/app/assets/stylesheets/base/variables.scss @@ -1,5 +1,8 @@ $hover: #FFFAF1; -$gl-text-color: #54565b; +$gl-text-color: #54565B; +$gl-text-green: #4A2; +$gl-text-red: #D12F19; +$gl-text-orange: #D90; $gl-header-color: #4c4e54; $gl-link-color: #333c48; $md-text-color: #444; diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index 96fb791c242..016cc015e9c 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -1,8 +1,8 @@ /** COLORS **/ .cgray { color: $gl-gray; } .clgray { color: #BBB } -.cred { color: #D12F19 } -.cgreen { color: #4a2 } +.cred { color: $gl-text-red; } +.cgreen { color: $gl-text-green; } .cdark { color: #444 } /** COMMON CLASSES **/ diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index 051ca3792c3..741ff9051a2 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -49,30 +49,33 @@ } .file-stats { + ul { + list-style: none; + margin: 0; + padding: 10px 0; + + li { + padding: 3px 0px; + } + } .new-file { a { - color: #090; - } - i { - color: #1BCF00; + color: $gl-text-green; } } .renamed-file { - i { - color: #FE9300; + a { + color: $gl-text-orange; } } .deleted-file { a { - color: #B00; - } - i { - color: #EE0000; + color: $gl-text-red; } } .edit-file{ - i{ - color: #555; + a { + color: $gl-text-color; } } } |