diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-26 20:23:43 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-26 20:23:43 +0000 |
| commit | 95c644dfa2b433e9658f7ea1e76c08bf1fcc74ab (patch) | |
| tree | c98c6bc8838762445cc298cbedc919bafca021ee | |
| parent | d672e6f8414ffa79222337b7f0fcd3eb42002b13 (diff) | |
| parent | a98bf00ca6be419ba3406dcce0d78d23b297d006 (diff) | |
| download | gitlab-ce-95c644dfa2b433e9658f7ea1e76c08bf1fcc74ab.tar.gz | |
Merge branch 'bug/jschatz1/file-browser-lines' into 'master'
Bug/jschatz1/file browser lines
Fixes #12725
See merge request !2615
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/tables.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index a4791cf6b34..00cb756b376 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -7,6 +7,7 @@ border: 1px solid $border-color; &.readme-holder { + margin-top: 10px; border-bottom: 0; } diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss index b5134f44ded..75b770ae5a2 100644 --- a/app/assets/stylesheets/framework/tables.scss +++ b/app/assets/stylesheets/framework/tables.scss @@ -38,7 +38,7 @@ table { td { border-color: $table-border-color; - border-bottom: 1px solid; + border-bottom: 1px solid $border-color; } } } diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 6a6dd7dfc85..c7411617cb3 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -22,8 +22,6 @@ &:hover { td { background: $hover; - border-top: 1px solid #ADF; - border-bottom: 1px solid #ADF; } cursor: pointer; } |