summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-09-19 02:12:28 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-09-19 02:12:28 +0000
commit8cb06b0b5fedaf296bbe8439f2714d826a401ce4 (patch)
treed5ccc5061dc30f2b12d652801b3d4656188b91c9 /app/assets
parent28eb29faabaf027c051c187f050bafc8ddf5e33d (diff)
parent4af85106cb3b25358ab908eb9acbe57e4093a4a4 (diff)
downloadgitlab-ce-8cb06b0b5fedaf296bbe8439f2714d826a401ce4.tar.gz
Merge branch 'repo-editor-ui-fix' into 'master'
Repo editor UI fixes part 2 Closes #37830, #36247, #37829, and #36244 See merge request gitlab-org/gitlab-ce!14261
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/repo.scss10
1 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 7dfcf7b7d9c..4d4d92f9494 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -56,7 +56,6 @@
.tree-content-holder {
display: flex;
- max-height: 100vh;
min-height: 300px;
}
@@ -156,7 +155,7 @@
list-style-type: none;
background: $gray-normal;
display: inline-block;
- padding: 10px 18px;
+ padding: #{$gl-padding / 2} $gl-padding;
border-right: 1px solid $white-dark;
border-bottom: 1px solid $white-dark;
white-space: nowrap;
@@ -180,10 +179,9 @@
a {
@include str-truncated(100px);
color: $black;
- width: 100px;
- text-align: center;
vertical-align: middle;
text-decoration: none;
+ margin-right: 12px;
&.close {
width: auto;
@@ -193,6 +191,10 @@
}
}
+ .close-icon:hover {
+ color: $hint-color;
+ }
+
.close-icon,
.unsaved-icon {
float: right;