Commit 1c8ec154 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Refactor colors

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 89df4a79
$style_color: #474D57;
$hover: #FFFAF1; $hover: #FFFAF1;
$gl-text-color: #7f8fa4; $gl-text-color: #54565b;
$gl-header-color: #4c4e54; $gl-header-color: #4c4e54;
$gl-link-color: #333c48; $gl-link-color: #333c48;
$nprogress-color: #c0392b; $nprogress-color: #c0392b;
......
.light-well { .light-well {
background: #f9f9f9; background-color: #f8fafc;
padding: 15px; padding: 15px;
} }
.centered-light-block { .centered-light-block {
text-align: center; text-align: center;
color: #888; color: $gl-gray;
margin: 20px; margin: 20px;
} }
.nothing-here-block { .nothing-here-block {
text-align: center; text-align: center;
padding: 20px; padding: 20px;
color: #666; color: $gl-gray;
font-weight: normal; font-weight: normal;
font-size: 16px; font-size: 16px;
line-height: 36px; line-height: 36px;
...@@ -25,4 +25,9 @@ ...@@ -25,4 +25,9 @@
margin-bottom: 0px; margin-bottom: 0px;
border-top: 1px solid #e7e9ed; border-top: 1px solid #e7e9ed;
border-bottom: 1px solid #e7e9ed; border-bottom: 1px solid #e7e9ed;
color: $gl-gray;
.title {
color: $gl-text-color;
}
} }
...@@ -74,8 +74,6 @@ pre { ...@@ -74,8 +74,6 @@ pre {
color: $gl-link-color; color: $gl-link-color;
} }
.help li { color:$style_color; }
.back-link { .back-link {
font-size: 14px; font-size: 14px;
} }
......
...@@ -109,10 +109,16 @@ ul.content-list { ...@@ -109,10 +109,16 @@ ul.content-list {
padding: 18px; padding: 18px;
border-color: #f1f2f4; border-color: #f1f2f4;
margin: 0 -18px; margin: 0 -18px;
color: $gl-gray;
.avatar { .avatar {
margin-right: 15px; margin-right: 15px;
} }
.controls {
padding-top: 10px;
float: right;
}
} }
} }
...@@ -61,10 +61,6 @@ ...@@ -61,10 +61,6 @@
} }
} }
.file-stats a {
color: $style_color;
}
.file-stats { .file-stats {
.new-file { .new-file {
a { a {
......
...@@ -7,8 +7,7 @@ ...@@ -7,8 +7,7 @@
= link_to new_group_path, class: "btn btn-new" do = link_to new_group_path, class: "btn btn-new" do
%i.fa.fa-plus %i.fa.fa-plus
New Group New Group
Welcome to the groups! .title Welcome to the groups!
%br
Group members have access to all group projects. Group members have access to all group projects.
%ul.content-list %ul.content-list
......
- group_member = local_assigns[:group_member] - group_member = local_assigns[:group_member]
%li %li
- if group_member - if group_member
.pull-right.hidden-xs .controls.hidden-xs
- if can?(current_user, :admin_group, group) - if can?(current_user, :admin_group, group)
= link_to edit_group_path(group), class: "btn-sm btn btn-grouped" do = link_to edit_group_path(group), class: "btn-sm btn btn-grouped" do
%i.fa.fa-cogs %i.fa.fa-cogs
......
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