summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-06 17:53:47 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-06 17:53:47 +0000
commit39865feb8324a022df30c594853632a0d1edf3ac (patch)
tree14383c5d377a930c1ad631b698f36ad787bdadd0 /app
parentbaf94a26a4cfd727fa7c38a6dfc0852d2d2cbadb (diff)
parent252443893ce6e4ca2caaca8eefe75c918c20ffff (diff)
downloadgitlab-ce-39865feb8324a022df30c594853632a0d1edf3ac.tar.gz
Merge branch 'forms-action-padding-fix' into 'master'
Forms action padding fix The padding on the forms action is not adjusted based on screen width: ![Screen Shot 2015-01-05 at 9.48.30 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/09aa26807e/Screen_Shot_2015-01-05_at_9.48.30_PM.png) I added a media query for .forms-action at min-width: $screen-sm-min and moved the padding-left: 17% into it: ![Screen Shot 2015-01-05 at 9.48.35 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/8bbd8eef8c/Screen_Shot_2015-01-05_at_9.48.35_PM.png) Full width padding remains as is: ![Screen Shot 2015-01-05 at 9.53.30 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/a6232959cb/Screen_Shot_2015-01-05_at_9.53.30_PM.png) As this is a purely css change, I don't believe it will break any tests. form-actions occur everywhere there are form actions. See merge request !280
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/generic/forms.scss7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/generic/forms.scss b/app/assets/stylesheets/generic/forms.scss
index 865253d4a77..1a832569953 100644
--- a/app/assets/stylesheets/generic/forms.scss
+++ b/app/assets/stylesheets/generic/forms.scss
@@ -31,7 +31,12 @@ fieldset legend {
margin-bottom: 18px;
background-color: whitesmoke;
border-top: 1px solid #e5e5e5;
- padding-left: 17%;
+}
+
+@media (min-width: $screen-sm-min) {
+ .form-actions {
+ padding-left: 17%;
+ }
}
label {