BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 73520b43 by Dmitriy Zaporozhets
Options

Merge branch 'style-changed-files' into 'master'

Improve UI for list of changed files * fix paddings * re-use system colors ## Before ![Screenshot_2015-10-01_12.46.24](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3a02fe2beb47637c664eb914dbec352c/Screenshot_2015-10-01_12.46.24.png) ## After ![Screenshot_2015-10-01_12.54.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/39b1bf78983b862b559fcc89c52d5690/Screenshot_2015-10-01_12.54.39.png) cc @skyruler Signed-off-by: 's avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1484
parents d330046f 3871498b
Showing with 21 additions and 15 deletions
app/assets/stylesheets/base/variables.scss
$hover: #FFFAF1; $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-header-color: #4c4e54;
$gl-link-color: #333c48; $gl-link-color: #333c48;
$md-text-color: #444; $md-text-color: #444;
......
app/assets/stylesheets/generic/common.scss
/** COLORS **/ /** COLORS **/
.cgray { color: $gl-gray; } .cgray { color: $gl-gray; }
.clgray { color: #BBB } .clgray { color: #BBB }
.cred { color: #D12F19 } .cred { color: $gl-text-red; }
.cgreen { color: #4a2 } .cgreen { color: $gl-text-green; }
.cdark { color: #444 } .cdark { color: #444 }
/** COMMON CLASSES **/ /** COMMON CLASSES **/
......
app/assets/stylesheets/pages/commit.scss
...@@ -49,30 +49,33 @@ ...@@ -49,30 +49,33 @@
} }
.file-stats { .file-stats {
ul {
list-style: none;
margin: 0;
padding: 10px 0;
li {
padding: 3px 0px;
}
}
.new-file { .new-file {
a { a {
color: #090; color: $gl-text-green;
}
i {
color: #1BCF00;
} }
} }
.renamed-file { .renamed-file {
i { a {
color: #FE9300; color: $gl-text-orange;
} }
} }
.deleted-file { .deleted-file {
a { a {
color: #B00; color: $gl-text-red;
}
i {
color: #EE0000;
} }
} }
.edit-file{ .edit-file{
i{ a {
color: #555; color: $gl-text-color;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment