diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-23 15:05:33 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-23 15:05:33 -0500 |
| commit | 56de42b73899f26354c36ad0923b87787b9b41a4 (patch) | |
| tree | 14183a888292a5920ef43737804a5401a98bd855 | |
| parent | 51d455d05bfbdba5fac62c799703bd50fe7d70e4 (diff) | |
| download | gitlab-ce-56de42b73899f26354c36ad0923b87787b9b41a4.tar.gz | |
Fix bad merge conflict
| -rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index e742c0b74db..c76ea532912 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -125,7 +125,7 @@ label { &.input-short { width: $input-short-width; - @media (min-width: $screen-md-min) { + @include media-breakpoint-up(md) { width: $input-short-md-width; } } |