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 1f6004a4b8c..6e9567977ef 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 3edbac8567a..5c268be34c8 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 fc88757bec5..c999d495815 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 bfbb16de4bd..e3c4367f8f6 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 2a0d11dedde..74197748276 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 1811aa3b759..9326d1e8a25 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 ad67738a487..72eb2db80f8 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 0efe4591989..f4b40e3cd7c 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 6c881a799b2..c087a0f0596 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 dd0d1e884c1..ad70a532313 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 64203d6d9bb..801b12ace63 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 fee44a35c53..68865f32d07 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 @@
-
+
\ 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 54d5b382fff..80f82088945 100644
--- a/core/profiles/demo_umami/themes/umami/logo.svg
+++ b/core/profiles/demo_umami/themes/umami/logo.svg
@@ -1,5 +1,5 @@
-