diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-07 12:06:16 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-07 12:06:16 +0300 |
commit | e2b8025abe929007fb82e952b0be954a7598e528 (patch) | |
tree | f831b54cb23214f6434e2a514c39bf9062b3e0f1 /app/assets/stylesheets | |
parent | 4f3d704845c1ead8d39f49b04812305a8f8ab93a (diff) |
Increase input padding and fit issue form in laptop screen
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/base/gl_bootstrap.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/base/gl_variables.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/generic/gfm.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/generic/selects.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 5 |
5 files changed, 13 insertions, 10 deletions
diff --git a/app/assets/stylesheets/base/gl_bootstrap.scss b/app/assets/stylesheets/base/gl_bootstrap.scss index b0e2a678fc3..d1dba6d66b5 100644 --- a/app/assets/stylesheets/base/gl_bootstrap.scss +++ b/app/assets/stylesheets/base/gl_bootstrap.scss @@ -189,3 +189,11 @@ } } } + +.alert { + a { + @extend .alert-link; + color: #fff; + text-decoration: underline; + } +} diff --git a/app/assets/stylesheets/base/gl_variables.scss b/app/assets/stylesheets/base/gl_variables.scss index 090eff7f29b..2aa57e46a0a 100644 --- a/app/assets/stylesheets/base/gl_variables.scss +++ b/app/assets/stylesheets/base/gl_variables.scss @@ -93,8 +93,8 @@ $font-size-base: $gl-font-size; // //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). -// $padding-base-vertical: 6px -// $padding-base-horizontal: 12px +$padding-base-vertical: 8px; +$padding-base-horizontal: 14px; // $padding-large-vertical: 10px // $padding-large-horizontal: 16px diff --git a/app/assets/stylesheets/generic/gfm.scss b/app/assets/stylesheets/generic/gfm.scss index 1427b6a5ae4..617d91154db 100644 --- a/app/assets/stylesheets/generic/gfm.scss +++ b/app/assets/stylesheets/generic/gfm.scss @@ -3,7 +3,7 @@ */ .issue-form, .merge-request-form, .wiki-form { .description { - height: 20em; + height: 18em; border-top-left-radius: 0; } } diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss index 2a2f9e8eb5a..41ed736bbe5 100644 --- a/app/assets/stylesheets/generic/selects.scss +++ b/app/assets/stylesheets/generic/selects.scss @@ -3,7 +3,7 @@ .select2-choice { background: #FFF; border-color: #BBB; - padding: 6px 12px; + padding: 8px 14px; font-size: 13px; line-height: 18px; height: auto; @@ -20,7 +20,7 @@ } .select2-container-multi .select2-choices .select2-search-field input { - padding: 6px 12px; + padding: 8px 14px; font-size: 13px; line-height: 18px; height: auto; diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 98ce4150ff2..bfd05973d75 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -99,11 +99,6 @@ margin-right: 45px; } - .btn, - .form-control { - padding: 6px 9px; - } - .form-control { cursor: auto; @extend .monospace; |