diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-03 14:43:31 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-03 14:43:31 +0200 |
commit | 1d6a65a2aba6382564f761ec7881e582fc6d055f (patch) | |
tree | 494e7a8620ec433531c0c220648bdd74e0aebede /app/assets/stylesheets/generic | |
parent | 7f045a6b4a2fadce8aa6bf6d1b1378519fc4000f (diff) | |
download | gitlab-ce-1d6a65a2aba6382564f761ec7881e582fc6d055f.tar.gz |
Improve paddings and set new colors for links
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/stylesheets/generic')
-rw-r--r-- | app/assets/stylesheets/generic/blocks.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/generic/common.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/generic/selects.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/generic/sidebar.scss | 3 |
4 files changed, 11 insertions, 12 deletions
diff --git a/app/assets/stylesheets/generic/blocks.scss b/app/assets/stylesheets/generic/blocks.scss index 1080bc1baa0..16619502a5b 100644 --- a/app/assets/stylesheets/generic/blocks.scss +++ b/app/assets/stylesheets/generic/blocks.scss @@ -19,7 +19,7 @@ } .gray-content-block { - margin: -15px; + margin: -18px; background-color: #f8fafc; padding: 18px; margin-bottom: 0px; diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index eaa1fe07b01..17dec228611 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -1,5 +1,5 @@ /** COLORS **/ -.cgray { color: gray } +.cgray { color: $gl-gray; } .clgray { color: #BBB } .cred { color: #D12F19 } .cgreen { color: #4a2 } @@ -20,7 +20,7 @@ .underlined-link { text-decoration: underline; } .hint { font-style: italic; color: #999; } -.light { color: #888 } +.light { color: $gl-gray; } .slead { color: #666; @@ -376,10 +376,10 @@ table { list-style: none; text-align: center; margin-top: 5px; - margin-bottom: 12px; + margin-bottom: 19px; height: 60px; - margin-top: -15px; - padding-top: 15px; + margin-top: -18px; + padding-top: 18px; li { display: inline-block; diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss index d8e0dc028d1..c6a1047e019 100644 --- a/app/assets/stylesheets/generic/selects.scss +++ b/app/assets/stylesheets/generic/selects.scss @@ -3,9 +3,9 @@ .select2-choice { background: #FFF; border-color: #DDD; - height: 34px; - padding: 6px 14px; - font-size: 14px; + height: 42px; + padding: 8px 18px; + font-size: $gl-font-size; line-height: 1.42857143; @include border-radius(4px); @@ -13,7 +13,7 @@ .select2-arrow { background: #FFF; border-left: none; - padding-top: 3px; + padding-top: 5px; } } } diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss index 88d6c7ca6d6..7f3688801aa 100644 --- a/app/assets/stylesheets/generic/sidebar.scss +++ b/app/assets/stylesheets/generic/sidebar.scss @@ -25,8 +25,7 @@ .container-fluid { background: #FFF; - padding-top: 15px; - padding-bottom: 15px; + padding: 18px; border: 1px solid #e7e9ed; min-height: 90vh; } |