Skip to content

Commit

Permalink
Merge pull request #2055 from WikiWatershed/mjm/deactivated-layer
Browse files Browse the repository at this point in the history
Add tooltip to inactive layers
  • Loading branch information
Matthew McFarland committed Jul 19, 2017
2 parents e975bfe + 0713ab4 commit 3a72252
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/mmw/js/src/core/templates/layerPickerLayer.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="layerpicker-layer">
<button
class="{{layerClass}}"
{% if isDisabled %} disabled {% endif %}
{% if isDisabled %}title="This layer is unavailable at this location" disabled {% endif %}
>
{{ layerDisplay }}
</button>
Expand Down
4 changes: 2 additions & 2 deletions src/mmw/sass/components/_layerpicker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
border: 0;
outline: 0;
background: none;
color: #999;
color: $ui-primary;
&:hover {
color: inherit;
}
&.active {
color: $brand-primary;
}
&:disabled {
color: $ui-light;
color: $ui-medium-light;
}
}

Expand Down
1 change: 1 addition & 0 deletions src/mmw/sass/utils/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ $paper: #ffffff;
$ui-primary: #273238; /*Dark Grey*/
$ui-secondary: #394750; /*Medium Grey*/
$ui-light: #eceff1; /*Light Grey*/
$ui-medium-light: #BDBDBD; /* Medium Light Grey */
$ui-grey: #787878 ; /* Output Tab Bar */
$ui-danger: #e0412d; /*Errors*/
$ui-warning: #e4b72f; /*Warnings*/
Expand Down

0 comments on commit 3a72252

Please sign in to comment.