diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-26 10:40:13 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-26 13:21:00 -0500 |
| commit | ed43b580caf0a5b3b6e161faf2b62909c15baf80 (patch) | |
| tree | 748d052aad689e515c7d4098cedd28b067e0d039 | |
| parent | a7b8c02b0587c22da26dea6d9c3ebe9964ea17c5 (diff) | |
| download | gitlab-ce-enable-duplicate-property-scss-lint.tar.gz | |
Disable DuplicateProperty for phantomJS in boardsenable-duplicate-property-scss-lint
| -rw-r--r-- | .scss-lint.yml | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.scss-lint.yml b/.scss-lint.yml index 084287a74b5..db234ad739c 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -75,11 +75,7 @@ linters: # when adding lines to the file, since SCM systems such as git won't # think that you touched the last line. FinalNewline: -<<<<<<< 7911f1c0877247f943d2c5dc1cb26de19fe69c8c enabled: true -======= - enabled: false ->>>>>>> Enable DuplicateProperty scss-lint # HEX colors should use three-character values where possible. HexLength: diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 057f7192683..ebe662136d5 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -71,7 +71,10 @@ white-space: nowrap; @media (min-width: $screen-sm-min) { + height: 475px; // Needed for PhantomJS + // scss-lint:disable DuplicateProperty height: calc(100vh - 222px); + // scss-lint:enable DuplicateProperty min-height: 475px; transition: width .2s; |