diff options
| author | Phil Hughes <me@iamphill.com> | 2018-06-13 11:44:14 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-06-14 17:42:55 +0300 |
| commit | 30ef25452182cb9a956f895595cf0cd4afc51c57 (patch) | |
| tree | 33035fb1bbf6cd12130b2f925e887c176374c280 /app/assets/stylesheets/pages/repo.scss | |
| parent | 2d5e47bfc3c6c9a77dbb61694cd65c18f45a11cc (diff) | |
fixed hover styling caused by dropdown
fixed karma specs
added CHANGELOG item
Diffstat (limited to 'app/assets/stylesheets/pages/repo.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 0b0a435b6f4..36a514a5055 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -540,27 +540,12 @@ margin-right: -$grid-size; min-height: 60px; - .multi-file-commit-list-item { - margin-left: 0; - margin-right: 0; - } - &.form-text.text-muted { margin-left: 0; right: 0; } } -.multi-file-commit-list-item { - &.is-active { - background-color: $white-normal; - } - - .multi-file-discard-btn { - margin-top: -2px; - } -} - .multi-file-addition, .multi-file-addition-solid { color: $green-500; @@ -590,7 +575,7 @@ } } -.multi-file-commit-list-item, +.multi-file-commit-list-path, .ide-file-list .file { display: flex; align-items: center; @@ -607,11 +592,9 @@ } .multi-file-commit-list-path { - padding: 0; - background: none; - border: 0; - text-align: left; - width: 100%; + &.is-active { + background-color: $white-normal; + } &:hover, &:focus { @@ -637,6 +620,12 @@ } } +.multi-file-discard-btn { + top: 0; + right: 8px; + bottom: 0; +} + .multi-file-commit-form { position: relative; background-color: $white-light; @@ -832,7 +821,13 @@ .ide-staged-action-btn { width: 22px; - border: 1px solid $white-dark; + margin-left: -1px; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + + > svg { + top: 0; + } } .ide-commit-file-count { |