diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-03 15:28:08 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-03 15:28:08 +0300 |
| commit | fc5afc60ace366fd010f1df1484d2f048c162a7b (patch) | |
| tree | aa775b6413682508808c8743aea3cbe7dae56a92 /app/assets/stylesheets/framework/forms.scss | |
| parent | 37ab1120c8a252aa29702ef141ff4ea1163e0e75 (diff) | |
| parent | 6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff) | |
Merge branch 'master' into ui/new-project
Diffstat (limited to 'app/assets/stylesheets/framework/forms.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index 95674c5812b..032d343df44 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -22,9 +22,10 @@ input[type='text'].danger { } .form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; + margin: -$gl-padding; + margin-top: 0; + margin-bottom: -$gl-padding; + padding: $gl-padding; background-color: $background-color; border-top: 1px solid $border-color; } @@ -73,6 +74,8 @@ label { .form-control { @include box-shadow(none); + height: 42px; + padding: 8px $gl-padding; } .wiki-content { @@ -100,3 +103,7 @@ label { border-right: 0; } } + +.help-block { + margin-bottom: 0; +} |