diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less index db0d96b79d..eec23869b5 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less @@ -27,17 +27,12 @@ .umb-nested-content__item { position: relative; text-align: left; - border-top: solid 1px transparent; background: @white; } -.umb-nested-content__item--active:not(.umb-nested-content__item--single) { - background: @gray-10; -} - .umb-nested-content__item.ui-sortable-placeholder { background: @gray-10; - border: 1px dashed @gray-8; + border: 1px solid @gray-9; visibility: visible !important; height: 55px; margin-top: -1px; @@ -52,9 +47,7 @@ } .umb-nested-content__header-bar { - padding: 15px 20px; - border-bottom: 1px dashed @gray-8; - text-align: right; + border-bottom: 1px solid @gray-9; cursor: pointer; background-color: @white; @@ -68,25 +61,28 @@ .umb-nested-content__heading { line-height: 20px; position: relative; - - &.-with-icon { - padding-left: 20px; + margin-top:1px; + padding: 15px 20px; + color:@ui-option-type; + border-radius: 3px 3px 0 0; + + &:hover { + color:@ui-option-type-hover; } i { - color: @gray-2; - position: absolute; - left: 0; + display: inline; + margin-right: 10px; } .umb-nested-content__item-name { + display: inline; max-height: 20px; - text-align: left; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - display: block; } + } .umb-nested-content__icons { @@ -110,12 +106,30 @@ } } +.umb-nested-content__item--active { + .umb-nested-content__heading { + background-color: @ui-active; + &:hover { + color:@ui-option-type; + } + } + .umb-nested-content__icons { + background-color: @ui-active; + &:before { + background: linear-gradient(90deg, rgba(255,255,255,0), @ui-active); + } + } +} + + .umb-nested-content__header-bar:hover .umb-nested-content__icons, .umb-nested-content__item--active > .umb-nested-content__header-bar .umb-nested-content__icons { opacity: 1; } + + .umb-nested-content__icon, .umb-nested-content__icon.umb-nested-content__icon--disabled:hover { display: inline-block; @@ -127,6 +141,7 @@ border-radius: 200px; text-decoration: none !important; } + .umb-nested-content__icon.umb-nested-content__icon--disabled:hover { cursor: default; } @@ -157,13 +172,47 @@ } + + .umb-nested-content__footer-bar { - text-align: center; - padding-top: 20px; + margin-top: 20px; } +.umb-nested-content__add-content { + display: flex; + align-items: center; + justify-content: center; + border: 1px dashed @ui-action-discreet-border; + color: @ui-action-discreet-type; + font-weight: bold; + padding: 5px 15px; + box-sizing: border-box; +} + +.umb-nested-content__add-content:hover { + color: @ui-action-discreet-type-hover; + border-color: @ui-action-discreet-border-hover; + text-decoration: none; +} + +.umb-nested-content__add-content.--disabled, +.umb-nested-content__add-content.--disabled:hover { + color: @gray-7; + border-color: @gray-7; + cursor: default; +} + + .umb-nested-content__content { - border-bottom: 1px dashed @gray-8; + border-top: 1px solid transparent; + border-bottom: 1px solid @gray-9; + border-left: 1px solid @gray-9; + border-right: 1px solid @gray-9; + border-radius: 0 0 3px 3px; +} + +.umb-nested-content__item--active:not(.umb-nested-content__item--single) .umb-nested-content__content { + background: @brownGrayExtraLight; } .umb-nested-content__content .umb-control-group { diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less index d856714dd6..cc9dced7df 100644 --- a/src/Umbraco.Web.UI.Client/src/less/variables.less +++ b/src/Umbraco.Web.UI.Client/src/less/variables.less @@ -119,6 +119,7 @@ @brown: #9d8057;// added 2019 @brownLight: #e4e0dd;// added 2019 @brownGrayLight: #f6f4f4;// added 2019 +@brownGrayExtraLight: #faf9f9;// added 2019 @orange: #ff9412;// added 2019 //@u-greyLight: #f2ebe6;// added 2019 diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html index bca767f650..610da769cf 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html @@ -9,7 +9,7 @@