diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-04 20:57:38 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-04 20:57:38 +0000 |
| commit | 7ed3a6944f930718e4e552cf6a5656b7e95dddc1 (patch) | |
| tree | 4a97febb88184aae729fe3e64e9b62c97b7bee77 | |
| parent | 2b4e8d933c1d5c3a9706aab26708b8bed5b63018 (diff) | |
| parent | 606e09c141d39ccc3bcfe47ac200eef6df3861a0 (diff) | |
| download | gitlab-ce-7ed3a6944f930718e4e552cf6a5656b7e95dddc1.tar.gz | |
Merge branch 'fix-files-page-colors' into 'master'
Fix file list page border colors
See merge request !4008
| -rw-r--r-- | app/assets/stylesheets/framework/tables.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss index 75b770ae5a2..b42075c98d0 100644 --- a/app/assets/stylesheets/framework/tables.scss +++ b/app/assets/stylesheets/framework/tables.scss @@ -32,13 +32,11 @@ table { th { background-color: $background-color; font-weight: normal; - font-size: 15px; - border-bottom: 1px solid $border-color; + border-bottom: none; } td { border-color: $table-border-color; - border-bottom: 1px solid $border-color; } } } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index b8ed7e8a74c..92ecfe50488 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -12,7 +12,7 @@ $gutter_inner_width: 258px; */ $border-color: #e5e5e5; $focus-border-color: #3aabf0; -$table-border-color: #eef0f2; +$table-border-color: #ececec; $background-color: #fafafa; /* |