diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-19 11:34:48 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-19 11:34:48 +0200 |
| commit | 7ae139566b46050b31bf01a6302af560fc129819 (patch) | |
| tree | cc342c422373d89d12aa763a8a924d241192b4a1 /app/assets | |
| parent | a32f7766098bf38b1028168b4919516460a562e9 (diff) | |
| parent | 8adeda37b55fc992e3cb15422cae5d9646640630 (diff) | |
| download | gitlab-ce-7ae139566b46050b31bf01a6302af560fc129819.tar.gz | |
Merge branch 'master' into full-width-tablesfull-width-tables
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 7 |
3 files changed, 5 insertions, 8 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index c2118abbf55..35db00281e5 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -10,6 +10,10 @@ border-bottom: 1px solid #E7E9EE; margin-bottom: 1em; + &.readme-holder { + border-bottom: 0; + } + table { @extend .table; } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index a27763ad8f4..41bea0ec5c8 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -544,5 +544,5 @@ pre.light-well { } .project-show-readme .readme-holder { - padding: 7px; + border-top: 0; } diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index b19b710472d..1b0cef481d6 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -1,11 +1,4 @@ .tree-holder { - .tree_progress { - display: none; - margin: 20px; - &.loading { - display: block; - } - } .tree-table { margin-bottom: 0; |