Skip to content

Commit e16529b

Browse files
authored
Merge pull request #4928 from guardian/09-10-make_metadata_arrows_consistent_with_usages_and_collections
Make expandable image metadata group arrows consistent with usages and collections
2 parents acc8710 + 25c349e commit e16529b

4 files changed

Lines changed: 16 additions & 6 deletions

File tree

kahuna/public/js/components/gr-display-crops/gr-display-crops.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@
1212
justify-content: flex-start;
1313
}
1414

15+
.gr-display-crops + dd {
16+
width: 100%;
17+
}

kahuna/public/js/components/gr-display-crops/gr-display-crops.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="image-info">
2-
<dl class="image-info__group image-info__wrap" ng-if="ctrl.crops.length > 0">
2+
<dl class="image-info__group image-info__wrap image-info__group--expandable" ng-if="ctrl.crops.length > 0">
33
<div class="gr-display-crops">
44
<button class="gr-display-crops"
55
ng-click="ctrl.showCrops = !ctrl.showCrops">
6-
<span ng-hide="ctrl.showCrops"> Show</span>
7-
<span ng-show="ctrl.showCrops"> Hide</span>
6+
<span ng-hide="ctrl.showCrops"><gr-icon>chevron_right</gr-icon> Show</span>
7+
<span ng-show="ctrl.showCrops"><gr-icon>expand_more</gr-icon> Hide</span>
88
crops
99
</button>
1010
</div>

kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -735,12 +735,12 @@
735735
</dl>
736736
</div>
737737

738-
<div ng-if="ctrl.singleImage && !ctrl.isAdditionalMetadataEmpty()" class="image-info__group image-info__group--full-metadata" role="region" aria-label="Additional metadata">
738+
<div ng-if="ctrl.singleImage && !ctrl.isAdditionalMetadataEmpty()" class="image-info__group image-info__group--full-metadata image-info__group--expandable" role="region" aria-label="Additional metadata">
739739
<button class="metadata-reveal"
740740
ng-click="ctrl.showMetadataSection('additionalMetadata')"
741741
aria-label="{{ctrl.isMetadataSectionHidden('additionalMetadata') ? 'Show' : 'Hide'}} additional metadata section">
742-
<span ng-show="ctrl.isMetadataSectionHidden('additionalMetadata')"> Show</span>
743-
<span ng-hide="ctrl.isMetadataSectionHidden('additionalMetadata')"> Hide</span>
742+
<span ng-show="ctrl.isMetadataSectionHidden('additionalMetadata')"><gr-icon>chevron_right</gr-icon> Show</span>
743+
<span ng-hide="ctrl.isMetadataSectionHidden('additionalMetadata')"><gr-icon>expand_more</gr-icon> Hide</span>
744744
additional metadata
745745
</button>
746746

kahuna/public/stylesheets/main.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2202,6 +2202,13 @@ FIXME: what to do with touch devices
22022202
position: relative;
22032203
}
22042204

2205+
.image-info__group--expandable {
2206+
display: flex;
2207+
flex-direction: column;
2208+
align-items: flex-start;
2209+
gap: 10px;
2210+
}
2211+
22052212
.image-info__title {
22062213
color: #eee;
22072214
}

0 commit comments

Comments
 (0)