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

Improve paddings and set new colors for links

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 7f045a6b
...@@ -21,7 +21,6 @@ html { ...@@ -21,7 +21,6 @@ html {
margin-top: 30px; margin-top: 30px;
} }
.container-limited { .container-limited {
max-width: $fixed-layout-width; max-width: $fixed-layout-width;
} }
$style_color: #474D57; $style_color: #474D57;
$hover: #FFFAF1; $hover: #FFFAF1;
$gl-text-color: #222222; $gl-text-color: #222222;
$gl-link-color: #446e9b; $gl-link-color: #4c4e54;
$nprogress-color: #c0392b; $nprogress-color: #c0392b;
$gl-font-size: 16px; $gl-font-size: 16px;
$list-font-size: 16px; $list-font-size: 16px;
...@@ -14,6 +14,7 @@ $border-color: #E5E5E5; ...@@ -14,6 +14,7 @@ $border-color: #E5E5E5;
$background-color: #f5f5f5; $background-color: #f5f5f5;
$header-height: 73px; $header-height: 73px;
$fixed-layout-width: 1200px; $fixed-layout-width: 1200px;
$gl-gray: #7f8fa4;
/* /*
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
} }
.gray-content-block { .gray-content-block {
margin: -15px; margin: -18px;
background-color: #f8fafc; background-color: #f8fafc;
padding: 18px; padding: 18px;
margin-bottom: 0px; margin-bottom: 0px;
......
/** COLORS **/ /** COLORS **/
.cgray { color: gray } .cgray { color: $gl-gray; }
.clgray { color: #BBB } .clgray { color: #BBB }
.cred { color: #D12F19 } .cred { color: #D12F19 }
.cgreen { color: #4a2 } .cgreen { color: #4a2 }
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
.underlined-link { text-decoration: underline; } .underlined-link { text-decoration: underline; }
.hint { font-style: italic; color: #999; } .hint { font-style: italic; color: #999; }
.light { color: #888 } .light { color: $gl-gray; }
.slead { .slead {
color: #666; color: #666;
...@@ -376,10 +376,10 @@ table { ...@@ -376,10 +376,10 @@ table {
list-style: none; list-style: none;
text-align: center; text-align: center;
margin-top: 5px; margin-top: 5px;
margin-bottom: 12px; margin-bottom: 19px;
height: 60px; height: 60px;
margin-top: -15px; margin-top: -18px;
padding-top: 15px; padding-top: 18px;
li { li {
display: inline-block; display: inline-block;
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
.select2-choice { .select2-choice {
background: #FFF; background: #FFF;
border-color: #DDD; border-color: #DDD;
height: 34px; height: 42px;
padding: 6px 14px; padding: 8px 18px;
font-size: 14px; font-size: $gl-font-size;
line-height: 1.42857143; line-height: 1.42857143;
@include border-radius(4px); @include border-radius(4px);
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
.select2-arrow { .select2-arrow {
background: #FFF; background: #FFF;
border-left: none; border-left: none;
padding-top: 3px; padding-top: 5px;
} }
} }
} }
......
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
.container-fluid { .container-fluid {
background: #FFF; background: #FFF;
padding-top: 15px; padding: 18px;
padding-bottom: 15px;
border: 1px solid #e7e9ed; border: 1px solid #e7e9ed;
min-height: 90vh; min-height: 90vh;
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.event-item { .event-item {
font-size: 16px; font-size: 16px;
padding: 18px; padding: 18px;
margin: 0 -15px; margin: 0 -18px;
border-bottom: 1px solid #f1f2f4; border-bottom: 1px solid #f1f2f4;
color: #7f8fa4; color: #7f8fa4;
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
} }
.event-body { .event-body {
margin-left: 60px; margin-left: 63px;
margin-right: 80px; margin-right: 80px;
.event-note { .event-note {
......
...@@ -253,7 +253,7 @@ pre.light-well { ...@@ -253,7 +253,7 @@ pre.light-well {
} }
.projects-search-form { .projects-search-form {
margin: -15px; margin: -18px;
background-color: #f8fafc; background-color: #f8fafc;
padding: 18px; padding: 18px;
margin-bottom: 0px; margin-bottom: 0px;
...@@ -281,7 +281,7 @@ pre.light-well { ...@@ -281,7 +281,7 @@ pre.light-well {
.project-row { .project-row {
padding: 18px; padding: 18px;
border-color: #f1f2f4; border-color: #f1f2f4;
margin: 0 -15px; margin: 0 -18px;
&.no-description { &.no-description {
.project { .project {
......
...@@ -63,15 +63,15 @@ ...@@ -63,15 +63,15 @@
padding-right: 8px; padding-right: 8px;
.commit-author-name { .commit-author-name {
color: gray; color: $gl-gray;
} }
} }
.tree_commit { .tree_commit {
color: gray; color: $gl-gray;
.tree-commit-link { .tree-commit-link {
color: gray; color: $gl-gray;
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
......
%li.commit %li.commit
.commit-row-title .commit-row-title
= link_to truncate_sha(commit[:id]), namespace_project_commit_path(project.namespace, project, commit[:id]), class: "commit_short_id", alt: '' = link_to truncate_sha(commit[:id]), namespace_project_commit_path(project.namespace, project, commit[:id]), class: "commit_short_id", alt: ''
&nbsp; &middot;
= gfm event_commit_title(commit[:message]), project: project = gfm event_commit_title(commit[:message]), project: project
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