diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-25 11:30:50 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-25 11:30:50 +0000 |
| commit | be85fde6632d1058c17cb3083fa6a9b54fc9871c (patch) | |
| tree | 671ae22382173386977b7a3aa618b6fc6ec33fc4 /app/assets | |
| parent | 35c7763c6c9b64008d3aa421e3effc10ab1bb043 (diff) | |
| parent | 37973bc1435f78f040d1e3f2c3398a4e2668b567 (diff) | |
| download | gitlab-ce-be85fde6632d1058c17cb3083fa6a9b54fc9871c.tar.gz | |
Merge branch 'scss-empty-rule' into 'master'
Enable the EmptyRule SCSS Linter
Prevents empty SCSS rules from being included in the SCSS.
Also fixes the handful of lints caught by the linter.
Regarding the `.gh` rule in monokai.scss, which was added in [this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/bf079c24afb8ad2991a4eaf60a71a7bc45dd775d), it appears to be empty in [the original file as well](https://github.com/richleland/pygments-css/blob/master/monokai.css). So I think it's fine to delete the selector.
cc: @jschatz1
See merge request !3769
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/selects.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/highlight/monokai.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/graph.scss | 3 |
4 files changed, 0 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 32cc15113f2..61d9954c6c8 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -84,10 +84,6 @@ } } - &.blob_file { - - } - &.blob-no-preview { background: #eee; text-shadow: 0 1px 2px #fff; diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index b2fab387e17..eae5f062dda 100644 --- a/app/assets/stylesheets/framework/selects.scss +++ b/app/assets/stylesheets/framework/selects.scss @@ -121,9 +121,6 @@ } } -.select2-container-multi .select2-choices .select2-search-choice { -} - .select2-drop-active { margin-top: 6px; font-size: 14px; diff --git a/app/assets/stylesheets/highlight/monokai.scss b/app/assets/stylesheets/highlight/monokai.scss index 28253d4ccb4..80a509a7c1a 100644 --- a/app/assets/stylesheets/highlight/monokai.scss +++ b/app/assets/stylesheets/highlight/monokai.scss @@ -111,8 +111,6 @@ .vg { color: #f8f8f2 } /* Name.Variable.Global */ .vi { color: #f8f8f2 } /* Name.Variable.Instance */ .il { color: #ae81ff } /* Literal.Number.Integer.Long */ - - .gh { } /* Generic Heading & Diff Header */ .gu { color: #75715e; } /* Generic.Subheading & Diff Unified/Comment? */ .gd { color: #f92672; } /* Generic.Deleted & Diff Deleted */ .gi { color: #a6e22e; } /* Generic.Inserted & Diff Inserted */ diff --git a/app/assets/stylesheets/pages/graph.scss b/app/assets/stylesheets/pages/graph.scss index 4e5c4ed84b6..f7f9a9bb770 100644 --- a/app/assets/stylesheets/pages/graph.scss +++ b/app/assets/stylesheets/pages/graph.scss @@ -18,9 +18,6 @@ } .graphs { - .graph-author-commits-count { - } - .graph-author-email { float: right; color: #777; |