diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less index a0c3f02e40..15cb007a01 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less @@ -91,12 +91,17 @@ input.umb-table__input { .umb-table-body .umb-table-row { color: @gray-5; border-top: 1px solid @gray-9; - cursor: pointer; font-size: 14px; position: relative; min-height: 52px; +} +.umb-table-body .umb-table-row.-selectable { + + cursor: pointer; + &:hover { - background-color: @ui-option-hover; + //background-color: @ui-option-hover; + } } @@ -122,7 +127,7 @@ input.umb-table__input { margin: 0 auto; font-size: 20px; line-height: 20px; - color: @gray-7; + color: @ui-option-type; } .umb-table-body__checkicon, @@ -135,9 +140,30 @@ input.umb-table__input { } .umb-table-body .umb-table__name { - color: @black; + color: @ui-option-type; font-size: 14px; font-weight: bold; + a { + color: @ui-option-type; + &:hover, &:focus { + color: @ui-option-type-hover; + text-decoration: underline; + } + } +} +.umb-table-body .umb-table-row.-light { + .umb-table-body__icon { + color: @ui-option-disabled-type; + } + .umb-table__name { + color: @ui-option-disabled-type; + a { + color: @ui-option-disabled-type; + &:hover, &:focus { + color: @ui-option-disabled-type-hover; + } + } + } } // Styles of no items in the listview diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less index d8813e3815..bc85ae90a9 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less @@ -32,17 +32,10 @@ } .umb-user-table-row { - cursor: default; .umb-checkmark { visibility: hidden; } } - - .umb-user-table-row.-selectable { - cursor: pointer; - - - } &.-has-selection { .umb-user-table-row.-selectable { diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less index 19098b8a98..7816516a71 100644 --- a/src/Umbraco.Web.UI.Client/src/less/variables.less +++ b/src/Umbraco.Web.UI.Client/src/less/variables.less @@ -130,8 +130,12 @@ // ------------------------- @ui-option-type: @blueExtraDark; -@ui-option-hover: @sand-7; @ui-option-type-hover: @blueMid; +@ui-option-hover: @sand-7; + +@ui-option-disabled-type: @gray-6; +@ui-option-disabled-type-hover: @gray-5; +@ui-option-disabled-hover: @sand-7; //@ui-active: #346ab3; @ui-active: @pinkLight; diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html index 65955f31eb..63b9c5b787 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html @@ -10,7 +10,6 @@ ng-checked="vm.isSelectedAll()">