summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/forms.scss
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-04-09 10:26:28 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-04-09 10:26:28 -0500
commit36143d414fd25c7f82fa95987fa89643bc4e5ce3 (patch)
tree3931b63500d703261594b0314fe50c0a04d94800 /app/assets/stylesheets/framework/forms.scss
parente8490c4121f80af9b39903c0a1be393e1ab99e1a (diff)
downloadgitlab-ce-36143d414fd25c7f82fa95987fa89643bc4e5ce3.tar.gz
Ran migration script
Diffstat (limited to 'app/assets/stylesheets/framework/forms.scss')
-rw-r--r--app/assets/stylesheets/framework/forms.scss24
1 files changed, 12 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index 2c30311b1c1..17e13ecc779 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -31,13 +31,13 @@ label {
margin: 0;
}
- &.label-light {
+ &.badge.badge-pill-light {
font-weight: $gl-font-weight-bold;
}
}
-.control-label {
- @extend .col-sm-2;
+.form-control-label {
+ @extend .col-md-2;
}
.inline-input-group {
@@ -48,21 +48,21 @@ label {
width: 150px;
}
-@media (min-width: $screen-sm-min) {
+@include media-breakpoint-up(sm) {
.custom-form-control {
width: 150px;
}
}
/* Medium devices (desktops, 992px and up) */
-@media (min-width: $screen-md-min) {
+@include media-breakpoint-up(md) {
.custom-form-control {
width: 170px;
}
}
/* Large devices (large desktops, 1200px and up) */
-@media (min-width: $screen-lg-min) {
+@include media-breakpoint-up(lg) {
.custom-form-control {
width: 200px;
}
@@ -72,7 +72,7 @@ label {
margin-left: 0;
margin-right: 0;
- .control-label {
+ .form-control-label {
font-weight: $gl-font-weight-bold;
padding-top: 4px;
}
@@ -102,10 +102,10 @@ label {
}
}
- @media(max-width: $screen-xs-max) {
+ @include media-breakpoint-down(xs) {
padding: 0 $gl-padding;
- .control-label,
+ .form-control-label,
.text-block {
padding-left: 0;
}
@@ -155,8 +155,8 @@ label {
margin-top: 35px;
}
-.form-group .control-label,
-.form-group .control-label-full-width {
+.form-group .form-control-label,
+.form-group .form-control-label-full-width {
font-weight: $gl-font-weight-normal;
}
@@ -221,7 +221,7 @@ label {
}
}
-@media(max-width: $screen-xs-max) {
+@include media-breakpoint-down(xs) {
.remember-me {
.remember-me-checkbox {
margin-top: 0;