diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less index e07e6f69f2..658c690f39 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less @@ -27,7 +27,7 @@ .umb-packages { - margin: 0 -10px; + // margin: 0 -10px; } @@ -225,31 +225,32 @@ margin-bottom: 30px; } + + .umb-packages-category { display: flex; align-items: center; flex: 1 0 auto; - max-width: 25%; - background-color: @blue; - padding: 10px; - font-size: 13px; - border-radius: 3px; - color: @white; - box-sizing: border-box; - flex: 1 0 auto; - margin: 5px; justify-content: center; - &:hover { - background-color: @blueDark; - //box-shadow: 0 3px 8px rgba(0,0,0,0.2); - } + opacity: .6; + + max-width: 25%; + + font-size: 13px; + font-weight: bold; + color: @black; + + box-sizing: border-box; + + justify-content: center; } + .umb-packages-category:hover, .umb-packages-category:focus { text-decoration: none; - color: @white; + opacity: 1; } .umb-packages-category-icon { @@ -258,3 +259,26 @@ display: none; } + +// Collapsed +.umb-packages-categories.-collapsed { + margin-bottom: 0; +} + +.umb-packages-categories.-collapsed .umb-packages-category { + margin-right: 20px; + + &:last-child { + margin-right: 0; + } +} + +.-ma0 { + margin: 0 !important; +} + +.-collapsed .umb-packages-category.-active { + color: @black; + opacity: 1; + border-bottom: 2px solid @black; +} diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js index 1030266e23..3dbf0403a0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js @@ -13,7 +13,13 @@ vm.categories = [ { "icon": "icon-male-and-female", - "name": "Collaboration" + "name": "All", + "active": false + }, + { + "icon": "icon-male-and-female", + "name": "Collaboration", + "active": true }, { "icon": "icon-molecular-network", diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html index 0262b2c8ae..a012264d75 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html @@ -1,4 +1,4 @@ -