diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-21 20:11:00 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-21 20:11:00 +0000 |
| commit | be039601be06d051c093951f64fa44c2c07bb84f (patch) | |
| tree | 4f7758c7d63f517c19130fd8876e8cf38e1453e9 /app | |
| parent | 355d3119fdeb29d2d5a9764364e1e864c05f79c1 (diff) | |
| parent | 86a4449df2dedb83a57fbc9cb880010a3e6a3770 (diff) | |
| download | gitlab-ce-be039601be06d051c093951f64fa44c2c07bb84f.tar.gz | |
Merge branch 'css-indentation' into 'master'
Fix Indentation lints in CSS.
As discussed in #14299.
cc: @jschatz1
See merge request !3312
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/admin.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/xterm.scss | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index 377bfa174bd..250d6309291 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -1,7 +1,7 @@ /** * Generic mixins */ - @mixin box-shadow($shadow) { +@mixin box-shadow($shadow) { -webkit-box-shadow: $shadow; -moz-box-shadow: $shadow; -ms-box-shadow: $shadow; diff --git a/app/assets/stylesheets/pages/admin.scss b/app/assets/stylesheets/pages/admin.scss index a61161810a3..e05f14e7496 100644 --- a/app/assets/stylesheets/pages/admin.scss +++ b/app/assets/stylesheets/pages/admin.scss @@ -34,9 +34,9 @@ background: #fff } - .visibility-levels { - .controls { - margin-bottom: 9px; + .visibility-levels { + .controls { + margin-bottom: 9px; } i { diff --git a/app/assets/stylesheets/pages/xterm.scss b/app/assets/stylesheets/pages/xterm.scss index 8886c1dff56..3f28e402929 100644 --- a/app/assets/stylesheets/pages/xterm.scss +++ b/app/assets/stylesheets/pages/xterm.scss @@ -21,19 +21,19 @@ $l-white: #fff; .term-bold { - font-weight: bold; + font-weight: bold; } .term-italic { - font-style: italic; + font-style: italic; } .term-conceal { - visibility: hidden; + visibility: hidden; } .term-underline { - text-decoration: underline; + text-decoration: underline; } .term-cross { - text-decoration: line-through; + text-decoration: line-through; } .term-fg-black { |