diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-17 22:21:30 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-17 22:21:30 +0300 |
| commit | d16f42a254d092133d8907fac4be1b448ae36078 (patch) | |
| tree | ce2e7b008d9162bab31d6ec8d700035182f71bea | |
| parent | 16f3813106d5ad2217867ceefac44ccde39791d7 (diff) | |
| parent | de62d3b48c45030b91113e61bae0f3a2f24797e9 (diff) | |
Merge branch '28575-expand-collapse-look' into 'master'
Expand/collapse button -> Change to make it look like a toggle
Closes #28575
See merge request !10720
| -rw-r--r-- | app/assets/javascripts/behaviors/toggler_behavior.js | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/28575-expand-collapse-look.yml | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/javascripts/behaviors/toggler_behavior.js b/app/assets/javascripts/behaviors/toggler_behavior.js index 4c9ad128e6c..77e92ff8caf 100644 --- a/app/assets/javascripts/behaviors/toggler_behavior.js +++ b/app/assets/javascripts/behaviors/toggler_behavior.js @@ -22,6 +22,7 @@ $(() => { } $('body').on('click', '.js-toggle-button', function toggleButton(e) { + e.target.classList.toggle('open'); toggleContainer($(this).closest('.js-toggle-container')); const targetTag = e.currentTarget.tagName.toLowerCase(); diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 0dad91ba128..9e3142c8aa3 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -135,7 +135,7 @@ .text-expander { display: inline-block; - background: $gray-light; + background: $white-light; color: $gl-text-color-secondary; padding: 0 5px; cursor: pointer; @@ -146,6 +146,11 @@ line-height: $gl-font-size; outline: none; + &.open { + background: $gray-light; + box-shadow: inset 0 0 2px rgba($black, 0.2); + } + &:hover { background-color: darken($gray-light, 10%); text-decoration: none; diff --git a/changelogs/unreleased/28575-expand-collapse-look.yml b/changelogs/unreleased/28575-expand-collapse-look.yml new file mode 100644 index 00000000000..d8943316300 --- /dev/null +++ b/changelogs/unreleased/28575-expand-collapse-look.yml @@ -0,0 +1,4 @@ +--- +title: Expand/collapse button -> Change to make it look like a toggle +merge_request: 10720 +author: Jacopo Beschi @jacopo-beschi |