diff --git a/src/patterns/04-components/filters/_filters.scss b/src/patterns/04-components/filters/_filters.scss index d643437fe534aaa7378751b50319b7375f5595a9..685ae2a6d6005ff0ddceff6713082997dea788b5 100644 --- a/src/patterns/04-components/filters/_filters.scss +++ b/src/patterns/04-components/filters/_filters.scss @@ -24,44 +24,42 @@ } } } - .form--inline{ - .form-item.form-wrapper { - background: var(--uw-white); - margin: 0; + .form-item.form-wrapper { + background: var(--uw-white); + margin: 0; + .form-item{ + float: inherit; .form-item{ - float: inherit; - .form-item{ - margin: 0; - } + margin: 0; } } - details{ - &.uw-details, - &.seven-details{ - background: var(--uw-white); - border: var(--size-xs) solid var(--gray-3); - border-width: var(--size-xs) var(--size-xs) 0 var(--size-xs); - font-family: var(--font-systembold); - font-size: var(--font-size-000); - margin: 0; - &[open] > .seven-details__summary { - background-color: var(--gray-2); - color: var(--uw-black-primary); - } - &:hover > .seven-details__summary { - background-color: var(--gray-2); - color: var(--uw-black-primary); - } - &:last-of-type{ - border-width: var(--size-xs); - margin-bottom: var(--size-1); - } + } + details{ + &.uw-details, + &.seven-details{ + background: var(--uw-white); + border: var(--size-xs) solid var(--gray-3); + border-width: var(--size-xs) var(--size-xs) 0 var(--size-xs); + font-family: var(--font-systembold); + font-size: var(--font-size-000); + margin: 0; + &[open] > .seven-details__summary { + background-color: var(--gray-2); + color: var(--uw-black-primary); + } + &:hover > .seven-details__summary { + background-color: var(--gray-2); + color: var(--uw-black-primary); } - summary{ - &.seven-details__summary, - &.details__summary { - background-color: var(--uw-white); - } + &:last-of-type{ + border-width: var(--size-xs); + margin-bottom: var(--size-1); + } + } + summary{ + &.seven-details__summary, + &.details__summary { + background-color: var(--uw-white); } } } diff --git a/src/patterns/04-components/form-view-search/_form-view-search.scss b/src/patterns/04-components/form-view-search/_form-view-search.scss index a9e25eb3149a49ef72aa533175c187daf05dcae2..a0f8112061a821ec8c4037ba440507fd440b9987 100644 --- a/src/patterns/04-components/form-view-search/_form-view-search.scss +++ b/src/patterns/04-components/form-view-search/_form-view-search.scss @@ -5,7 +5,7 @@ .catalog-search-form, .service-search-form, - .uw-project-search-form { + .uw-project-search-form{ display: grid; grid-template-columns: auto var(--size-6); padding: 0; diff --git a/src/patterns/04-components/view/_view.scss b/src/patterns/04-components/view/_view.scss index eda93184e2e16791ed9cc499f4251d23ccfa44d4..b7266ccb7cb92a2dc7914b3e860d72d14047625d 100644 --- a/src/patterns/04-components/view/_view.scss +++ b/src/patterns/04-components/view/_view.scss @@ -24,6 +24,20 @@ $sidebar-width: 18.75rem; } } } + &s-projects-container{ + margin-left: auto; + margin-right: auto; + max-width: var(--layout-max-width); + padding: 0 var(--size-2); + position: relative; + width: 100%; + @media(min-width: $screen-xl) { + padding: 0; + } + .views-element-container{ + padding: 0; + } + } display: block; padding: 0; position: relative; @@ -84,6 +98,9 @@ $sidebar-width: 18.75rem; width: 100%; } .view-filters { + .views-projects-container &{ + margin-top: var(--size-9); + } h2{ margin-top: 0; } @@ -206,6 +223,7 @@ $sidebar-width: 18.75rem; .view-uw-view-news-items, .view-uw-view-blogs, .view-uw-view-events, +.view-uw-view-projects, .path-taxonomy, .path-projects, .path-profiles, @@ -229,7 +247,8 @@ $sidebar-width: 18.75rem; } .path-news, .path-blog, -.path-events{ +.path-events, +.path-projects{ .view-content { @media(min-width: $screen-sm){ .views-row{ @@ -248,16 +267,16 @@ $sidebar-width: 18.75rem; } } .view-interact{ - margin-top: -3.25rem; - @media(min-width: $screen-sm) { - margin-top: -4rem; + margin-top: -4rem; + @media(min-width: $screen-md) { + margin-top: 0; } } } - .view-uw-view-news-items, .view-uw-view-blogs, .view-uw-view-events, +.view-uw-view-projects, .view-taxonomy-term{ .view-content { .views-row{ @@ -338,31 +357,57 @@ $sidebar-width: 18.75rem; } } .path-projects{ + .view-content { + @media(min-width: $screen-sm) { + .views-row { + &:first-of-type, + &:nth-of-type(10n) { + grid-column: 1 / 3; + } + } + } + } .view{ &.with-filters{ margin: inherit; + .views-element-container { + grid-column: 1 / 3; + } + .view-interact{ + margin-top: -3.25rem; + @media(min-width: $screen-sm) { + margin-top: -4rem; + } + } > .view-content { margin: inherit; > h2{ - @include uw-contained-width; + grid-column: 1 / 3; margin: inherit; + //padding: 0 var(--size-2); + //@media(min-width: 75rem) { + // padding-left: 0; + // padding-right: 0; + //} width: 100%; } } .view-footer{ - @include uw-contained-width; - margin: inherit; - width: 100%; + padding: var(--size-2); + text-align: center; + @media(min-width: $screen-sm) { + grid-column: 1 / 3; + justify-self: center; + } a{ @include button(); - display: block; - margin: 0 auto; } } } &.view-uw-view-projects{ .view-content{ - margin: inherit; + //grid-template-rows: auto; + //margin: inherit; } &.view-display-id-search{ &_page{