summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2018-06-14 13:12:38 (GMT)
committerGábor Hojtsy2018-06-14 13:12:38 (GMT)
commit7bbc3faedbb0980f554953cdace5008a0f096a7c (patch)
tree9000b3a62a4b5a0a8c358ee3e89a3a65aded37a5
parent41c88ee2b84793f8470e3ef115a9fc81514304b2 (diff)
Issue #2943107 by mherchel, NicholasS, jordana, finnsky, tomphippen, smaz, markconroy, andrewmacpherson, kjay: Umami support for Internet Explorer 11
-rw-r--r--core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css1
-rw-r--r--core/profiles/demo_umami/themes/umami/css/components/blocks/search/search.css3
-rw-r--r--core/profiles/demo_umami/themes/umami/css/components/content-types/recipe/recipe.css13
-rw-r--r--core/profiles/demo_umami/themes/umami/css/components/content/highlighted-medium/highlighted-medium.css4
-rw-r--r--core/profiles/demo_umami/themes/umami/css/components/content/highlighted-small/highlighted-small.css4
-rw-r--r--core/profiles/demo_umami/themes/umami/css/components/content/highlighted-top/highlighted-top.css4
-rw-r--r--core/profiles/demo_umami/themes/umami/css/components/navigation/menu-main/menu-main.css6
-rw-r--r--core/profiles/demo_umami/themes/umami/css/layout/grid-2.css4
-rw-r--r--core/profiles/demo_umami/themes/umami/css/layout/grid-3.css8
-rw-r--r--core/profiles/demo_umami/themes/umami/css/layout/grid-4.css8
-rw-r--r--core/profiles/demo_umami/themes/umami/css/layout/layout-2-col.css5
-rw-r--r--core/profiles/demo_umami/themes/umami/images/svg/search.svg26
-rw-r--r--core/profiles/demo_umami/themes/umami/logo.svg2
13 files changed, 62 insertions, 26 deletions
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 1f6004a..6e95679 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 3edbac8..5c268be 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 fc88757..c999d49 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 bfbb16d..e3c4367 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 2a0d11d..7419774 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 1811aa3..9326d1e 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 ad67738..72eb2db 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 0efe459..f4b40e3 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 6c881a7..c087a0f 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 dd0d1e8..ad70a53 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 64203d6..801b12a 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 fee44a3..68865f3 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 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 600">
- <defs>
- <style>
- .cls-1{fill:none;}.cls-2{fill:#d93760;}
- </style>
- </defs>
- <path class="cls-1" d="M228.37 348.78L110.23 466.92l22.86 22.84 118.12-118.14a165.77 165.77 0 0 1-22.84-22.84zm127.38-236.35a131.82 131.82 0 0 0 0 263.65 131.82 131.82 0 0 0 0-263.64zm-85.83 117.66a12.91 12.91 0 1 1 12.91-12.91 12.91 12.91 0 0 1-12.91 12.91zm28.43-31.3A22.61 22.61 0 1 1 321 176.18a22.61 22.61 0 0 1-22.65 22.61zM344 167.72a12.93 12.93 0 1 1 13-12.93 12.93 12.93 0 0 1-13 12.93z"/>
- <path class="cls-2" d="M355.75 79.47a164.81 164.81 0 0 0-144.5 244 38.93 38.93 0 0 0-11 7.73L90.9 440.58a39 39 0 0 0 0 55.15l13.37 13.37a39 39 0 0 0 55.17 0l109.33-109.34a38.85 38.85 0 0 0 7.74-11 164.78 164.78 0 1 0 79.24-309.29zM133.09 489.76l-22.86-22.84 118.14-118.14a165.77 165.77 0 0 0 22.84 22.84zm222.66-113.69a131.82 131.82 0 1 1 131.81-131.83 131.81 131.81 0 0 1-131.84 131.84z"/>
- <circle class="cls-2" cx="298.35" cy="176.18" r="22.61"/>
- <circle class="cls-2" cx="344.05" cy="154.79" r="12.93"/>
- <circle class="cls-2" cx="269.92" cy="217.18" r="12.91"/>
-</svg>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Search Icon</title>
+ <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="Group">
+ <g id="search">
+ <path d="M5.40705882,9.76579186 L1.13049774,14.0423529 L1.95800905,14.8691403 L6.23384615,10.5925792 C5.93199325,10.3445547 5.65508327,10.0676448 5.40705882,9.76579186 L5.40705882,9.76579186 Z M10.0180995,1.21013575 C7.38262671,1.21013575 5.24615385,3.34660861 5.24615385,5.98208145 C5.24615385,8.61755429 7.38262671,10.7540271 10.0180995,10.7540271 C12.6534724,10.7540271 14.7898643,8.61763532 14.7898643,5.98226244 C14.7898643,3.34688957 12.6534724,1.21049774 10.0180995,1.21049774 L10.0180995,1.21013575 Z M6.91113122,5.46932127 C6.65303181,5.46932127 6.4438009,5.26009036 6.4438009,5.00199095 C6.4438009,4.74389154 6.65303181,4.53466063 6.91113122,4.53466063 C7.16923063,4.53466063 7.37846154,4.74389154 7.37846154,5.00199095 C7.37846154,5.12593466 7.32922509,5.24480195 7.24158366,5.33244339 C7.15394222,5.42008482 7.03507493,5.46932127 6.91113122,5.46932127 Z M7.94027149,4.33628959 C7.48843702,4.33549024 7.12272582,3.96869932 7.12325849,3.51686445 C7.12379115,3.06502958 7.49036615,2.69910196 7.94220126,2.69936794 C8.39403636,2.69963392 8.76018029,3.06599287 8.760181,3.51782805 C8.76018134,3.73514866 8.67375208,3.94354729 8.51994746,4.09708029 C8.36614283,4.2506133 8.15759176,4.33667406 7.94027149,4.33628959 Z M9.59276018,3.21158371 C9.3345954,3.21018605 9.12631234,3.00001615 9.12724286,2.74184926 C9.12817338,2.48368237 9.33796605,2.27501936 9.59613419,2.27548273 C9.85430234,2.27594609 10.0633446,2.48536085 10.0633484,2.74352941 C10.0633502,2.86810541 10.0136898,2.98754248 9.92536382,3.07539289 C9.83703781,3.16324331 9.71733436,3.21225814 9.59276018,3.21158371 L9.59276018,3.21158371 Z" id="Shape"></path>
+ <path d="M10.0180995,0.0170135747 C7.91074463,0.0175014928 5.95997609,1.12971952 4.88615078,2.94296087 C3.81232547,4.75620223 3.7747616,7.00144515 4.78733032,8.84959276 C4.63937697,8.9190674 4.50463812,9.01375207 4.38914027,9.12941176 L0.430769231,13.0888688 C-0.12045472,13.6401793 -0.12045472,14.5339384 0.430769231,15.0852489 L0.914751131,15.5692308 C1.1795314,15.8341616 1.53874087,15.9830108 1.91330317,15.9830108 C2.28786547,15.9830108 2.64707494,15.8341616 2.9118552,15.5692308 L6.86950226,11.6112217 C6.98533647,11.495791 7.08015077,11.361042 7.14968326,11.2130317 C9.3343265,12.4100266 12.0327729,12.1233591 13.9171704,10.4940926 C15.8015678,8.86482619 16.4750474,6.23609712 15.606203,3.90145101 C14.7373587,1.56680491 12.509176,0.0179366079 10.0180995,0.0170135747 L10.0180995,0.0170135747 Z M1.95800905,14.8691403 L1.13049774,14.0423529 L5.40705882,9.76579186 C5.65508327,10.0676448 5.93199325,10.3445547 6.23384615,10.5925792 L1.95800905,14.8691403 Z M10.0180995,10.7536652 C7.38272668,10.7538651 5.2461728,8.61763532 5.24597288,5.98226245 C5.24577296,3.34688959 7.38200271,1.2103357 10.0173756,1.21013577 C12.6527484,1.20993585 14.7893023,3.3461656 14.7895023,5.98153846 C14.7897904,7.24736947 14.2870686,8.46143806 13.3919909,9.35651577 C12.4969132,10.2515935 11.2828446,10.7543153 10.0170136,10.7540271 L10.0180995,10.7536652 Z" id="Shape" fill="#D93760" fill-rule="nonzero"></path>
+ <circle id="Oval" fill="#D93760" fill-rule="nonzero" cx="7.94027149" cy="3.51782805" r="1"></circle>
+ <circle id="Oval" fill="#D93760" fill-rule="nonzero" cx="9.59457014" cy="2.74352941" r="1"></circle>
+ <circle id="Oval" fill="#D93760" fill-rule="nonzero" cx="6.91113122" cy="5.00199095" r="1"></circle>
+ </g>
+ </g>
+ </g>
+</svg> \ 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 54d5b38..80f8208 100644
--- a/core/profiles/demo_umami/themes/umami/logo.svg
+++ b/core/profiles/demo_umami/themes/umami/logo.svg
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="711px" height="206px" viewBox="0 0 711 206" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="205px" height="60px" viewBox="0 0 711 206" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>umami logo</title>
<defs></defs>
<g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">