diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-11-29 23:32:58 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-11-29 23:32:58 +0000 |
| commit | 9ce28bf08b7112bd80f97d9db749cffa5e034c5c (patch) | |
| tree | 11555151e274e95af60a09ad8c6966c01289d99b | |
| parent | fc0258aec12d6bf697274028208d76a6c05307ca (diff) | |
| parent | 0bce564abf8a6f6f5955f64ed7e78a56556f6f4f (diff) | |
| download | gitlab-ce-9ce28bf08b7112bd80f97d9db749cffa5e034c5c.tar.gz | |
Merge branch '50264-add-border-around-the-repository-file-tree' into 'master'
Resolve "Add border around the repository file tree"
Closes #50264
See merge request gitlab-org/gitlab-ce!23018
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 12 | ||||
| -rw-r--r-- | app/views/projects/tree/_tree_content.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/50264-add-border-around-the-repository-file-tree.yml | 5 |
3 files changed, 18 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index dc5ca78ff58..a46b8679a42 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -104,11 +104,23 @@ border-bottom: 1px solid $white-normal; border-top: 1px solid $white-normal; + &:last-of-type { + border-bottom-color: $white-light; + } + td, th { line-height: 21px; } + th { + border-top-color: $gray-light; + } + + td { + border-color: $border-color; + } + &:hover:not(.tree-truncated-warning) { td { background-color: $blue-50; diff --git a/app/views/projects/tree/_tree_content.html.haml b/app/views/projects/tree/_tree_content.html.haml index 5e0523f0b96..889a13339fd 100644 --- a/app/views/projects/tree/_tree_content.html.haml +++ b/app/views/projects/tree/_tree_content.html.haml @@ -1,5 +1,5 @@ .tree-content-holder.js-tree-content{ 'data-logs-path': @logs_path } - .table-holder + .table-holder.bordered-box %table.table#tree-slider{ class: "table_#{@hex_path} tree-table qa-file-tree" } %thead %tr diff --git a/changelogs/unreleased/50264-add-border-around-the-repository-file-tree.yml b/changelogs/unreleased/50264-add-border-around-the-repository-file-tree.yml new file mode 100644 index 00000000000..6315c3e7f36 --- /dev/null +++ b/changelogs/unreleased/50264-add-border-around-the-repository-file-tree.yml @@ -0,0 +1,5 @@ +--- +title: Resolve Add border around the repository file tree +merge_request: 23018 +author: +type: changed |