diff --git a/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css b/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css index 1f6004a4b8c0cd9fcc2af1549bfce864528814db..6e9567977ef5f347e041521c60a935f35bb7b8df 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css +++ b/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css @@ -62,6 +62,7 @@ margin: 0 auto; display: flex; padding: 0 1em; + height: 0; /* Required for flexbox vertical centering in IE11. Min-height will take precedence. */ min-height: 43vw; align-items: center; } diff --git a/core/profiles/demo_umami/themes/umami/css/components/blocks/search/search.css b/core/profiles/demo_umami/themes/umami/css/components/blocks/search/search.css index 3edbac8567ae44fb84264ebe684f255d5034b2db..5c268be34c8f7dbdd6a081f0e7b34d92f1fef036 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/blocks/search/search.css +++ b/core/profiles/demo_umami/themes/umami/css/components/blocks/search/search.css @@ -67,6 +67,7 @@ margin-top: 0; margin-bottom: 0; } + .form-search { width: 20em; max-width: calc(100vw - 6.25em); @@ -79,9 +80,9 @@ font-size: 0.875rem; line-height: normal; background: url(../../../../images/svg/search.svg) no-repeat 0.5em center #fff; - background-size: 1.5em; color: #464646; } + .form-search:focus { outline: none; margin: 0 0 -2px -2px; diff --git a/core/profiles/demo_umami/themes/umami/css/components/content-types/recipe/recipe.css b/core/profiles/demo_umami/themes/umami/css/components/content-types/recipe/recipe.css index fc88757bec583e82aff185a9b316c91f2ef46902..c999d4958154d306c8c0287b414e2bbd93b79894 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/content-types/recipe/recipe.css +++ b/core/profiles/demo_umami/themes/umami/css/components/content-types/recipe/recipe.css @@ -36,7 +36,8 @@ .node--type-recipe.node--view-mode-full .layout__region--top-first, .node--type-recipe.node--view-mode-full .layout__region--top-second { - flex: 0 0 calc(50% - 1rem); + flex: 0 0; + flex-basis: calc(50% - 1rem); /* fixed IE11 bug calc in shorthand */ } /* Recipe meta */ @@ -98,13 +99,13 @@ } } -.node--type-recipe.node--view-mode-full .layout__region--top-second .field { +.node--type-recipe.node--view-mode-full .layout__region--top-second .recipe-meta .field { flex: 1 0 auto; } /* Large */ @media screen and (min-width: 60rem) { /* 960px */ - .node--type-recipe.node--view-mode-full .layout__region--top-second .field { - flex: 0 0 100%; + .node--type-recipe.node--view-mode-full .layout__region--top-second .recipe-meta .field { + width: 100%; } } .node--type-recipe.node--view-mode-full .layout__region--top-second .field .field__label, @@ -143,7 +144,7 @@ } } .node--type-recipe.node--view-mode-full .layout__region--bottom > h2 { - flex: 0 0 100%; + flex: 0 1 100%; font-family: 'Scope One', Georgia, serif; font-size: 1.424em; font-weight: 400; @@ -169,6 +170,7 @@ .node--type-recipe.node--view-mode-full .layout__region--bottom-first { flex: 0 0 33%; padding: 0 2.369em 2.369em 2.369em; + max-width: 33%; /* fixed IE11 bug */ } } @@ -180,6 +182,7 @@ .node--type-recipe.node--view-mode-full .layout__region--bottom-second { flex: 0 0 67%; padding: 0 2.369em 2.369em 2.369em; + max-width: 67%; /* fixed IE11 bug */ } } diff --git a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-medium/highlighted-medium.css b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-medium/highlighted-medium.css index bfbb16de4bde09e3324769b6e3a312791bc2b904..e3c4367f8f636a4ff4da58d4bfdd9b01a2bb7075 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-medium/highlighted-medium.css +++ b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-medium/highlighted-medium.css @@ -10,6 +10,10 @@ flex-direction: column; } +.node--view-mode-highlighted-medium .node__content { + flex: 0 0 auto; +} + .node--view-mode-highlighted-medium .node__meta { padding: 1rem 1.5rem 0 1.5rem; } diff --git a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-small/highlighted-small.css b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-small/highlighted-small.css index 2a0d11dedde546105b45d22db093050afdd4239c..741977482766adeaf2d5655bd4cf1e5281c8e545 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-small/highlighted-small.css +++ b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-small/highlighted-small.css @@ -10,6 +10,10 @@ flex-direction: column; } +.node--view-mode-highlighted-small .node__content { + flex: 0 0 auto; +} + .node--view-mode-highlighted-small .node__meta { padding: 1rem 1.5rem 0 1.5rem; } diff --git a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-top/highlighted-top.css b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-top/highlighted-top.css index 1811aa3b759c4d9c86dde9f969b7916aaef0a69a..9326d1e8a2513a1bc18b002935c701f6534da593 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-top/highlighted-top.css +++ b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-top/highlighted-top.css @@ -31,6 +31,10 @@ /* Large */ @media screen and (min-width: 60rem) { /* 960px */ + .view-promoted-items--single .node--view-mode-highlighted-top .node__content { + flex: 0 0 auto; + } + .view-promoted-items--single .node--view-mode-highlighted-top .node__meta { order: -1; } diff --git a/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-main/menu-main.css b/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-main/menu-main.css index ad67738a487685e2e37c89366468b48525d424ec..72eb2db80f8b08964208a311525e20f080a1ff55 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-main/menu-main.css +++ b/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-main/menu-main.css @@ -75,7 +75,7 @@ display: flex; justify-content: flex-end; flex-wrap: wrap; - max-height: initial; + max-height: none; overflow: auto; } .menu-main-toggle { @@ -111,7 +111,9 @@ @media screen and (min-width: 48em) { .menu-main__wrapper { order: 4; - flex: 0 1 calc(100% - 220px); + flex-grow: 0; + flex-shrink: 1; + flex-basis: calc(100% - 220px); text-align: right; } } diff --git a/core/profiles/demo_umami/themes/umami/css/layout/grid-2.css b/core/profiles/demo_umami/themes/umami/css/layout/grid-2.css index 0efe45919896a6cc3c3bccc9676692be0d82408d..f4b40e3cd7c63309ff0e5ad4401cdfbe5cb962e6 100644 --- a/core/profiles/demo_umami/themes/umami/css/layout/grid-2.css +++ b/core/profiles/demo_umami/themes/umami/css/layout/grid-2.css @@ -19,7 +19,9 @@ } .grid--2 .views-row { display: flex; - flex: 0 0 calc(50% - 28px); + flex-grow: 0; + flex-shrink: 0; + flex-basis: calc(50% - 28px); margin: 0 14px 28px; padding: 0; } diff --git a/core/profiles/demo_umami/themes/umami/css/layout/grid-3.css b/core/profiles/demo_umami/themes/umami/css/layout/grid-3.css index 6c881a799b20f26b778d23d1cfe0628377d0450b..c087a0f0596203adea719d1dadd8c545e3f5276b 100644 --- a/core/profiles/demo_umami/themes/umami/css/layout/grid-3.css +++ b/core/profiles/demo_umami/themes/umami/css/layout/grid-3.css @@ -19,7 +19,9 @@ } .grid--3 .views-row { display: flex; - flex: 0 0 calc(50% - 28px); + flex-grow: 0; + flex-shrink: 0; + flex-basis: calc(50% - 28px); margin: 0 14px 28px; padding: 0; } @@ -27,7 +29,9 @@ @media screen and (min-width: 60em) { .grid--3 .views-row { - flex: 0 0 calc(33% - 28px); + flex-grow: 0; + flex-shrink: 0; + flex-basis: calc(33% - 28px); } } diff --git a/core/profiles/demo_umami/themes/umami/css/layout/grid-4.css b/core/profiles/demo_umami/themes/umami/css/layout/grid-4.css index dd0d1e884c19c722b5b47c9af354ee70e804f070..ad70a532313b32a6eaedf32fffe9d13ba79eaac6 100644 --- a/core/profiles/demo_umami/themes/umami/css/layout/grid-4.css +++ b/core/profiles/demo_umami/themes/umami/css/layout/grid-4.css @@ -20,7 +20,9 @@ .grid--4 .views-row { display: flex; - flex: 0 0 calc(50% - 28px); + flex-grow: 0; + flex-shrink: 0; + flex-basis: calc(50% - 28px); margin: 0 14px 28px; padding: 0; } @@ -28,7 +30,9 @@ @media screen and (min-width: 60em) { .grid--4 .views-row { - flex: 0 0 calc(25% - 28px); + flex-grow: 0; + flex-shrink: 0; + flex-basis: calc(25% - 28px); } } diff --git a/core/profiles/demo_umami/themes/umami/css/layout/layout-2-col.css b/core/profiles/demo_umami/themes/umami/css/layout/layout-2-col.css index 64203d6d9bb5b1ea7714a9696f8cbac2a6f0e126..801b12ace63183b47bda3aca23fe6f170605cb50 100644 --- a/core/profiles/demo_umami/themes/umami/css/layout/layout-2-col.css +++ b/core/profiles/demo_umami/themes/umami/css/layout/layout-2-col.css @@ -12,7 +12,12 @@ justify-content: space-between; } + .two-columns .main .layout-content { + flex: 0 0 75%; + } + .layout-sidebar { + flex: 0 0 25%; min-width: 300px; width: 25%; } diff --git a/core/profiles/demo_umami/themes/umami/images/svg/search.svg b/core/profiles/demo_umami/themes/umami/images/svg/search.svg index fee44a35c530d1ac031e3c2855b77de25c963e2d..68865f32d07121c5599ad29e7795e56d258ef21d 100644 --- a/core/profiles/demo_umami/themes/umami/images/svg/search.svg +++ b/core/profiles/demo_umami/themes/umami/images/svg/search.svg @@ -1,12 +1,14 @@ - - - - - - - - - - + + Search Icon + + + + + + + + + + + + \ No newline at end of file diff --git a/core/profiles/demo_umami/themes/umami/logo.svg b/core/profiles/demo_umami/themes/umami/logo.svg index 54d5b382fff4214a44bc90c36744469f44fec3b0..80f82088945dfcdb7bc87f63f857770fc183ca92 100644 --- a/core/profiles/demo_umami/themes/umami/logo.svg +++ b/core/profiles/demo_umami/themes/umami/logo.svg @@ -1,5 +1,5 @@ - + umami logo