From b1c23ff8f28c24f3fa03e685c7bdc50f1d70f140 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 5 Apr 2019 10:32:32 +0300 Subject: [PATCH 01/45] Initial changes to hero big --- css/styles.css | 52 ++++++++++++++++++++++++++++++++ sass/components/_hero.scss | 46 ++++++++++++++++++++++++++++ sass/icons/__icon_font.scss | 1 - sass/icons/__variables.scss | 2 -- sass/variables/_breakpoints.scss | 8 ++--- 5 files changed, 102 insertions(+), 7 deletions(-) diff --git a/css/styles.css b/css/styles.css index 19e0103..cb6e04d 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4557,6 +4557,58 @@ dl, ol, ul { z-index: 1; } +.hero-big:not(.hero-big--centered) { + -ms-flex-align: end; + align-items: flex-end; + display: -ms-flexbox; + display: flex; + height: calc(100vh - 80px); +} + +.hero-big:not(.hero-big--centered):after { + display: none; +} + +.hero-big:not(.hero-big--centered) .hero-big__content { + -ms-flex-align: start; + align-items: flex-start; + display: -ms-flexbox; + display: flex; + -ms-flex-direction: column; + flex-direction: column; +} + +.hero-big:not(.hero-big--centered) .hero-big__title { + font-size: 6vh; + padding: 1rem; +} + +@media (min-width: 62.5em) { + .hero-big:not(.hero-big--centered) .hero-big__title { + font-size: 8vh; + } +} + +.hero-big:not(.hero-big--centered) .hero-big__ingress { + font-size: .9rem; + padding: .25rem 1rem; +} + +.hero-big:not(.hero-big--centered) .hero-big__title, +.hero-big:not(.hero-big--centered) .hero-big__ingress { + display: inline-block; + -webkit-box-decoration-break: clone; + box-decoration-break: clone; + background-color: rgba(34, 34, 34, 0.61); +} + +@media (min-width: 48em) { + .hero-big:not(.hero-big--centered) .hero-big__title, + .hero-big:not(.hero-big--centered) .hero-big__ingress { + margin-bottom: 1rem; + } +} + .hero-big__top { margin: 0 auto; max-width: 75em; diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index b13449f..95edbc7 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -62,6 +62,52 @@ top: 0; z-index: 1; } + + &:not(.hero-big--centered) { + @include breakpoint($medium) { + + } + + align-items: flex-end; + display: flex; + height: calc(100vh - 80px); + + &:after { + display: none; + } + + .hero-big__content { + align-items: flex-start; + display: flex; + flex-direction: column; + } + + .hero-big__title { + font-size: 6vh; + padding: 1rem; + + @include breakpoint($medium) { + font-size: 8vh; + } + } + + .hero-big__ingress { + font-size: .9rem; + padding: .25rem 1rem; + } + + .hero-big__title, + .hero-big__ingress { + display: inline-block; + -webkit-box-decoration-break: clone; + box-decoration-break: clone; + background-color: rgba($black, 0.61); + + @include breakpoint($small) { + margin-bottom: 1rem; + } + } + } } .hero-big__top { diff --git a/sass/icons/__icon_font.scss b/sass/icons/__icon_font.scss index 2f1e0d7..8c389b7 100644 --- a/sass/icons/__icon_font.scss +++ b/sass/icons/__icon_font.scss @@ -160,7 +160,6 @@ .icon--listoflinks:after { @include icon("\EA59"); } .icon--play:after { @include icon("\EA5A"); } .icon--wrench:after { @include icon("\EA5B"); } -.icon--youtube:after { @include icon("\EA5D"); } .icon--link-arrow-down:after { @include icon("\EA5E"); } .icon--link-arrow-left:after { @include icon("\EA5F"); } .icon--link-arrow-up:after { @include icon("\EA60"); } diff --git a/sass/icons/__variables.scss b/sass/icons/__variables.scss index fbba8f7..f43b34a 100644 --- a/sass/icons/__variables.scss +++ b/sass/icons/__variables.scss @@ -173,8 +173,6 @@ $icon-play: "\EA5A"; $icon-wrench: "\EA5B"; -$icon-youtube: "\EA5D"; - $icon-link-arrow-down: "\EA5E"; $icon-link-arrow-left: "\EA5F"; diff --git a/sass/variables/_breakpoints.scss b/sass/variables/_breakpoints.scss index d56a569..bb51e46 100644 --- a/sass/variables/_breakpoints.scss +++ b/sass/variables/_breakpoints.scss @@ -2,10 +2,10 @@ $vert-spacing-unit: 30px; $horz-spacing-unit: 30px; -$bp-small: 48em; -$bp-medium: 62.5em; -$bp-large: 75em; -$bp-xlarge: 100em; +$bp-small: 48em; // 768px +$bp-medium: 62.5em; // 1000px +$bp-large: 75em; // 1200px +$bp-xlarge: 100em; // 1600px $mobile-only: max-width $bp-small; $small: $bp-small, "no-query" ".lt-ie9"; From 1ed001726f002c2328104497ff68362b5342f3a5 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 5 Apr 2019 11:36:06 +0300 Subject: [PATCH 02/45] Minor style change --- css/styles.css | 5 +++++ sass/components/_hero.scss | 3 +++ 2 files changed, 8 insertions(+) diff --git a/css/styles.css b/css/styles.css index cb6e04d..6690a7f 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4576,11 +4576,16 @@ dl, ol, ul { display: flex; -ms-flex-direction: column; flex-direction: column; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + -ms-flex-preferred-size: auto; + flex-basis: auto; } .hero-big:not(.hero-big--centered) .hero-big__title { font-size: 6vh; padding: 1rem; + width: 100%; } @media (min-width: 62.5em) { diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 95edbc7..caea6be 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -80,11 +80,14 @@ align-items: flex-start; display: flex; flex-direction: column; + flex-wrap: wrap; + flex-basis: auto; } .hero-big__title { font-size: 6vh; padding: 1rem; + width: 100%; @include breakpoint($medium) { font-size: 8vh; From baf0344da3dc61f5667323a44a79c432e0dc046f Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 5 Apr 2019 12:13:27 +0300 Subject: [PATCH 03/45] Some changes to ie support --- css/styles.css | 3 ++- sass/components/_hero.scss | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 6690a7f..b383f8a 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4563,6 +4563,7 @@ dl, ol, ul { display: -ms-flexbox; display: flex; height: calc(100vh - 80px); + max-height: 800px; } .hero-big:not(.hero-big--centered):after { @@ -4585,7 +4586,7 @@ dl, ol, ul { .hero-big:not(.hero-big--centered) .hero-big__title { font-size: 6vh; padding: 1rem; - width: 100%; + max-width: 100%; } @media (min-width: 62.5em) { diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index caea6be..63e3c3c 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -71,6 +71,7 @@ align-items: flex-end; display: flex; height: calc(100vh - 80px); + max-height: 800px; &:after { display: none; @@ -87,7 +88,7 @@ .hero-big__title { font-size: 6vh; padding: 1rem; - width: 100%; + max-width: 100%; @include breakpoint($medium) { font-size: 8vh; From fd01aa398e874a6d6f1734bdfddf948a521defc8 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 5 Apr 2019 13:01:18 +0300 Subject: [PATCH 04/45] New wrapper element to enable box-decoration --- css/styles.css | 21 +++++++++++++++------ sass/components/_hero.scss | 22 +++++++++++++--------- templates/16_1_2-hero-big.html | 8 +++++--- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/css/styles.css b/css/styles.css index b383f8a..f798d6a 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4570,22 +4570,30 @@ dl, ol, ul { display: none; } +.hero-big:not(.hero-big--centered) .hero-big__top { + margin-bottom: 1rem; +} + .hero-big:not(.hero-big--centered) .hero-big__content { -ms-flex-align: start; align-items: flex-start; display: -ms-flexbox; display: flex; + -ms-flex-preferred-size: auto; + flex-basis: auto; -ms-flex-direction: column; flex-direction: column; -ms-flex-wrap: wrap; flex-wrap: wrap; - -ms-flex-preferred-size: auto; - flex-basis: auto; +} + +.hero-big:not(.hero-big--centered) .hero-big__title--wrapper { + margin: 1rem 0; } .hero-big:not(.hero-big--centered) .hero-big__title { font-size: 6vh; - padding: 1rem; + padding: 0 1rem; max-width: 100%; } @@ -4602,10 +4610,11 @@ dl, ol, ul { .hero-big:not(.hero-big--centered) .hero-big__title, .hero-big:not(.hero-big--centered) .hero-big__ingress { - display: inline-block; - -webkit-box-decoration-break: clone; - box-decoration-break: clone; background-color: rgba(34, 34, 34, 0.61); + -webkit-box-decoration-break: clone; + box-decoration-break: clone; + display: inline; + line-height: normal; } @media (min-width: 48em) { diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 63e3c3c..b3928f9 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -64,10 +64,6 @@ } &:not(.hero-big--centered) { - @include breakpoint($medium) { - - } - align-items: flex-end; display: flex; height: calc(100vh - 80px); @@ -77,17 +73,25 @@ display: none; } + .hero-big__top { + margin-bottom: 1rem; + } + .hero-big__content { align-items: flex-start; display: flex; + flex-basis: auto; flex-direction: column; flex-wrap: wrap; - flex-basis: auto; + } + + .hero-big__title--wrapper { + margin: 1rem 0; } .hero-big__title { font-size: 6vh; - padding: 1rem; + padding: 0 1rem; max-width: 100%; @include breakpoint($medium) { @@ -102,10 +106,10 @@ .hero-big__title, .hero-big__ingress { - display: inline-block; - -webkit-box-decoration-break: clone; - box-decoration-break: clone; background-color: rgba($black, 0.61); + box-decoration-break: clone; + display: inline; + line-height: normal; @include breakpoint($small) { margin-bottom: 1rem; diff --git a/templates/16_1_2-hero-big.html b/templates/16_1_2-hero-big.html index 2ccac99..6a81882 100644 --- a/templates/16_1_2-hero-big.html +++ b/templates/16_1_2-hero-big.html @@ -1,9 +1,11 @@
-

- Ole yksi* parhaista -

+
+

+ Ole yksi* parhaista ja lisää sisältöä tähän otsikkoon +

+
* Kuulumme maailman tutkimusyliopistojen parhaan 1% joukkoon
From 72238709debc4458f4bcf5af7cf362198f62b7c7 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 5 Apr 2019 13:24:21 +0300 Subject: [PATCH 05/45] More style changes --- css/styles.css | 14 +++++++++++--- sass/components/_hero.scss | 12 +++++++++--- templates/16_1_2-hero-big.html | 6 ++++-- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/css/styles.css b/css/styles.css index f798d6a..24c3aa8 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4587,14 +4587,22 @@ dl, ol, ul { flex-wrap: wrap; } -.hero-big:not(.hero-big--centered) .hero-big__title--wrapper { +.hero-big:not(.hero-big--centered) .hero-big__title--wrapper, +.hero-big:not(.hero-big--centered) .hero-big__ingress--wrapper { margin: 1rem 0; } .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 6vh; + font-size: 2.125rem; padding: 0 1rem; max-width: 100%; + line-height: normal; +} + +@media (min-width: 48em) { + .hero-big:not(.hero-big--centered) .hero-big__title { + font-size: 6vh; + } } @media (min-width: 62.5em) { @@ -4605,6 +4613,7 @@ dl, ol, ul { .hero-big:not(.hero-big--centered) .hero-big__ingress { font-size: .9rem; + line-height: 1.715rem; padding: .25rem 1rem; } @@ -4614,7 +4623,6 @@ dl, ol, ul { -webkit-box-decoration-break: clone; box-decoration-break: clone; display: inline; - line-height: normal; } @media (min-width: 48em) { diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index b3928f9..b67b0a3 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -85,14 +85,20 @@ flex-wrap: wrap; } - .hero-big__title--wrapper { + .hero-big__title--wrapper, + .hero-big__ingress--wrapper { margin: 1rem 0; } .hero-big__title { - font-size: 6vh; + font-size: 2.125rem; padding: 0 1rem; max-width: 100%; + line-height: normal; + + @include breakpoint($small) { + font-size: 6vh; + } @include breakpoint($medium) { font-size: 8vh; @@ -101,6 +107,7 @@ .hero-big__ingress { font-size: .9rem; + line-height: 1.715rem; padding: .25rem 1rem; } @@ -109,7 +116,6 @@ background-color: rgba($black, 0.61); box-decoration-break: clone; display: inline; - line-height: normal; @include breakpoint($small) { margin-bottom: 1rem; diff --git a/templates/16_1_2-hero-big.html b/templates/16_1_2-hero-big.html index 6a81882..638f14f 100644 --- a/templates/16_1_2-hero-big.html +++ b/templates/16_1_2-hero-big.html @@ -6,8 +6,10 @@

Ole yksi* parhaista ja lisää sisältöä tähän otsikkoon

-
- * Kuulumme maailman tutkimusyliopistojen parhaan 1% joukkoon +
+
+ * Kuulumme maailman tutkimusyliopistojen parhaan 1% joukkoon +
From f1fe1623f27b5138a6ca19745eb22e38e32e8846 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 5 Apr 2019 14:01:35 +0300 Subject: [PATCH 06/45] Background for video link as well --- css/styles.css | 7 +++++++ sass/components/_hero.scss | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/css/styles.css b/css/styles.css index 24c3aa8..03c9f80 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4617,6 +4617,13 @@ dl, ol, ul { padding: .25rem 1rem; } +.hero-big:not(.hero-big--centered) .hero-big__play { + background-color: rgba(34, 34, 34, 0.61); + -webkit-box-decoration-break: clone; + box-decoration-break: clone; + padding: 0 1rem; +} + .hero-big:not(.hero-big--centered) .hero-big__title, .hero-big:not(.hero-big--centered) .hero-big__ingress { background-color: rgba(34, 34, 34, 0.61); diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index b67b0a3..e9b0679 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -111,6 +111,12 @@ padding: .25rem 1rem; } + .hero-big__play { + background-color: rgba($black, 0.61); + box-decoration-break: clone; + padding: 0 1rem; + } + .hero-big__title, .hero-big__ingress { background-color: rgba($black, 0.61); From 12c1bc6811681fdf7c81825a0ba672ac2522165b Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 5 Apr 2019 15:53:18 +0300 Subject: [PATCH 07/45] Refactored classname --- css/styles.css | 4 ++-- sass/components/_hero.scss | 4 ++-- templates/16_1_2-hero-big.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/css/styles.css b/css/styles.css index 03c9f80..9ad7c77 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4587,8 +4587,8 @@ dl, ol, ul { flex-wrap: wrap; } -.hero-big:not(.hero-big--centered) .hero-big__title--wrapper, -.hero-big:not(.hero-big--centered) .hero-big__ingress--wrapper { +.hero-big:not(.hero-big--centered) .hero-big__title__container, +.hero-big:not(.hero-big--centered) .hero-big__ingress__container { margin: 1rem 0; } diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index e9b0679..603f6a7 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -85,8 +85,8 @@ flex-wrap: wrap; } - .hero-big__title--wrapper, - .hero-big__ingress--wrapper { + .hero-big__title__container, + .hero-big__ingress__container { margin: 1rem 0; } diff --git a/templates/16_1_2-hero-big.html b/templates/16_1_2-hero-big.html index 638f14f..12d4675 100644 --- a/templates/16_1_2-hero-big.html +++ b/templates/16_1_2-hero-big.html @@ -1,12 +1,12 @@
-
+

Ole yksi* parhaista ja lisää sisältöä tähän otsikkoon

-
+
* Kuulumme maailman tutkimusyliopistojen parhaan 1% joukkoon
From f06d3c477d584c3413fee3ff1aae33d1f1df4431 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 5 Apr 2019 16:10:12 +0300 Subject: [PATCH 08/45] Youtube icon back --- sass/icons/__icon_font.scss | 1 + sass/icons/__variables.scss | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sass/icons/__icon_font.scss b/sass/icons/__icon_font.scss index 8c389b7..2f1e0d7 100644 --- a/sass/icons/__icon_font.scss +++ b/sass/icons/__icon_font.scss @@ -160,6 +160,7 @@ .icon--listoflinks:after { @include icon("\EA59"); } .icon--play:after { @include icon("\EA5A"); } .icon--wrench:after { @include icon("\EA5B"); } +.icon--youtube:after { @include icon("\EA5D"); } .icon--link-arrow-down:after { @include icon("\EA5E"); } .icon--link-arrow-left:after { @include icon("\EA5F"); } .icon--link-arrow-up:after { @include icon("\EA60"); } diff --git a/sass/icons/__variables.scss b/sass/icons/__variables.scss index f43b34a..fbba8f7 100644 --- a/sass/icons/__variables.scss +++ b/sass/icons/__variables.scss @@ -173,6 +173,8 @@ $icon-play: "\EA5A"; $icon-wrench: "\EA5B"; +$icon-youtube: "\EA5D"; + $icon-link-arrow-down: "\EA5E"; $icon-link-arrow-left: "\EA5F"; From 15d71c929007375ea0d53f5421eb1e4ba6843c81 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Mon, 8 Apr 2019 08:50:33 +0300 Subject: [PATCH 09/45] Removed max-height and play button bg --- css/styles.css | 14 ++++++-------- sass/components/_hero.scss | 6 +++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/css/styles.css b/css/styles.css index 9ad7c77..954955d 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4563,7 +4563,11 @@ dl, ol, ul { display: -ms-flexbox; display: flex; height: calc(100vh - 80px); - max-height: 800px; + /* .hero-big__play { + background-color: rgba($black, 0.61); + box-decoration-break: clone; + padding: 0 1rem; + } */ } .hero-big:not(.hero-big--centered):after { @@ -4590,6 +4594,7 @@ dl, ol, ul { .hero-big:not(.hero-big--centered) .hero-big__title__container, .hero-big:not(.hero-big--centered) .hero-big__ingress__container { margin: 1rem 0; + width: 100%; } .hero-big:not(.hero-big--centered) .hero-big__title { @@ -4617,13 +4622,6 @@ dl, ol, ul { padding: .25rem 1rem; } -.hero-big:not(.hero-big--centered) .hero-big__play { - background-color: rgba(34, 34, 34, 0.61); - -webkit-box-decoration-break: clone; - box-decoration-break: clone; - padding: 0 1rem; -} - .hero-big:not(.hero-big--centered) .hero-big__title, .hero-big:not(.hero-big--centered) .hero-big__ingress { background-color: rgba(34, 34, 34, 0.61); diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 603f6a7..9aa2aa0 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -67,7 +67,6 @@ align-items: flex-end; display: flex; height: calc(100vh - 80px); - max-height: 800px; &:after { display: none; @@ -88,6 +87,7 @@ .hero-big__title__container, .hero-big__ingress__container { margin: 1rem 0; + width: 100%; } .hero-big__title { @@ -111,11 +111,11 @@ padding: .25rem 1rem; } - .hero-big__play { +/* .hero-big__play { background-color: rgba($black, 0.61); box-decoration-break: clone; padding: 0 1rem; - } + } */ .hero-big__title, .hero-big__ingress { From 9e7330f2c70d8a76700c3595f5dc75f1651375cf Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 12 Apr 2019 09:41:30 +0300 Subject: [PATCH 10/45] Hero font-size changes --- css/styles.css | 12 ++++++------ fonts/hy-icons.eot | Bin 27960 -> 27960 bytes fonts/hy-icons.ttf | Bin 27792 -> 27792 bytes fonts/hy-icons.woff | Bin 16812 -> 16812 bytes sass/components/_hero.scss | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/css/styles.css b/css/styles.css index 954955d..2f37499 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4562,7 +4562,7 @@ dl, ol, ul { align-items: flex-end; display: -ms-flexbox; display: flex; - height: calc(100vh - 80px); + height: 75vh; /* .hero-big__play { background-color: rgba($black, 0.61); box-decoration-break: clone; @@ -4598,7 +4598,7 @@ dl, ol, ul { } .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 2.125rem; + font-size: 2.625rem; padding: 0 1rem; max-width: 100%; line-height: normal; @@ -4606,19 +4606,19 @@ dl, ol, ul { @media (min-width: 48em) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 6vh; + font-size: 4vh; } } @media (min-width: 62.5em) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 8vh; + font-size: 6vh; } } .hero-big:not(.hero-big--centered) .hero-big__ingress { - font-size: .9rem; - line-height: 1.715rem; + font-size: 1.125rem; + line-height: 1.915rem; padding: .25rem 1rem; } diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 8dae3bcb930b8111a1bcca68eb24bd64485c7492..682c42b4f95aeb1a753788671ff070b418b60770 100644 GIT binary patch delta 58 zcmdmSi*d&-#tAko&)MJcPjuM9BHGDaI`PjG8UANE864fe<~jQ#)A(+Jzjn delta 65 zcmV-H0KWgMg8{6A0g#LY6q(y+v5=WMD#25e#pC&HzA|t#zW|Cb+=%lIg3 Date: Fri, 12 Apr 2019 09:51:03 +0300 Subject: [PATCH 11/45] Minor font tweaks --- css/styles.css | 4 ++-- fonts/hy-icons.eot | Bin 27960 -> 27960 bytes fonts/hy-icons.ttf | Bin 27792 -> 27792 bytes fonts/hy-icons.woff | Bin 16812 -> 16812 bytes sass/components/_hero.scss | 6 +++--- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/css/styles.css b/css/styles.css index 2f37499..6bf7115 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4606,7 +4606,7 @@ dl, ol, ul { @media (min-width: 48em) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 4vh; + font-size: 4.5vh; } } @@ -4618,7 +4618,7 @@ dl, ol, ul { .hero-big:not(.hero-big--centered) .hero-big__ingress { font-size: 1.125rem; - line-height: 1.915rem; + line-height: 2.15rem; padding: .25rem 1rem; } diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 682c42b4f95aeb1a753788671ff070b418b60770..a57a00c293af7d14c6dea21548c6992d9e6a8162 100644 GIT binary patch delta 54 zcmdmSi*d&-#tAme{r}!hwBOAnpg8f*ROz?>`s4X+zA|t#zhD4@8&{vMhtZqYF!p2v E0IaPTQvd(} delta 54 zcmdmSi*d&-#tAme&)MHiwBOCdT{`j4ROxr@&*S-RzA|t#zhD4@8&@Ak!syLw7<;k- Dg5?&r diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index 3bd465a20dc59ff72e0ab496f213bd62afbffea9..001cfeefa2e808f071f078781b8b5b86317784cf 100644 GIT binary patch delta 47 ucmbPmlW_tN1u+RIP7IkU{q|pfJipCX25#mT3_x(>>eKZwdNT`SPc{I+0}{Ug delta 47 ucmbPmlW_tN1u=1#P7IkU{f_;4JipCX25#mT3_x(>>f=Zly_tovCmR5<3=zNp diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 87fac867bbfe47f651d9d2b28346bdf2786774bd..00a6ddbd0919d45a6cb243ed4ef37873121d5338 100644 GIT binary patch delta 61 zcmV-D0K)&Qg8{6A0g#RY5FxRUn>r|(i{trizA|t#zW|Cb+_?I5J&gYU`~P>A!_3ct TTn+{%kSGAB0T7I{Q#)A(gx(xV delta 61 zcmV-D0K)&Qg8{6A0g#RY3w5!On>r{)zvKCBzA|t#zW|Cb+_?HU5=Q_3{r@}5Vdm#R TE(Ze>NE864fe<~jQ#)A(Y=9c! diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 9aa0960..b89ed16 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -97,7 +97,7 @@ line-height: normal; @include breakpoint($small) { - font-size: 4vh; + font-size: 4.5vh; } @include breakpoint($medium) { @@ -106,8 +106,8 @@ } .hero-big__ingress { - font-size: 1.125rem; - line-height: 1.915rem; + @include font-size(18px); + line-height: 2.15rem; padding: .25rem 1rem; } From c48f1fb5e936fff3eaf6d759b4fe1aa66141fedf Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 12 Apr 2019 10:03:05 +0300 Subject: [PATCH 12/45] More changes --- css/styles.css | 6 +++--- fonts/hy-icons.eot | Bin 27960 -> 27960 bytes fonts/hy-icons.ttf | Bin 27792 -> 27792 bytes fonts/hy-icons.woff | Bin 16812 -> 16812 bytes sass/components/_hero.scss | 6 +++--- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/css/styles.css b/css/styles.css index 6bf7115..120e1a3 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4606,19 +4606,19 @@ dl, ol, ul { @media (min-width: 48em) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 4.5vh; + font-size: 6.5vh; } } @media (min-width: 62.5em) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 6vh; + font-size: 7vh; } } .hero-big:not(.hero-big--centered) .hero-big__ingress { font-size: 1.125rem; - line-height: 2.15rem; + line-height: 2.055rem; padding: .25rem 1rem; } diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index a57a00c293af7d14c6dea21548c6992d9e6a8162..1bf493fb9557ca5bc324df97ec09dfc889d01d9b 100644 GIT binary patch delta 52 zcmdmSi*d&-#tAk|w?9v`+ruPUJ@L;psn56L`E9;3a5KMP0D>D=U&O%Z&1)EYvH@|y B7P$Zb delta 52 zcmdmSi*d&-#tAk|{r@J~?O_s7ocL#&)W80Cew(ih+{`Z+fZ)c}r|V(#<~58x*#KA( B7I**v diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index 001cfeefa2e808f071f078781b8b5b86317784cf..8ea1f6b3a487365ce636b9aef00c9668c76f9edd 100644 GIT binary patch delta 46 tcmbPmlW_tN1u=b$>3SHwnT4?@8vvZ;5z+tv diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 00a6ddbd0919d45a6cb243ed4ef37873121d5338..c7773c35d8ed93ce88c34f8b04f16f5c7d40c2ff 100644 GIT binary patch delta 61 zcmV-D0K)&Qg8{6A0g#RY6??Ien>r|R@8kJxzA|t#zW|Cb+_?H821ft?{r@}5Vdm#R TE(Ze>NE860hY&5ZQ#)A(dz2d; delta 61 zcmV-D0K)&Qg8{6A0g#RY5FxRUn>r|(i{trizA|t#zW|Cb+_?I5J&gYU`~P>A!_3ct TTn+{%kSGAB0T7I{Q#)A(gx(xV diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index b89ed16..6a40ac2 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -97,17 +97,17 @@ line-height: normal; @include breakpoint($small) { - font-size: 4.5vh; + font-size: 6.5vh; } @include breakpoint($medium) { - font-size: 6vh; + font-size: 7vh; } } .hero-big__ingress { @include font-size(18px); - line-height: 2.15rem; + line-height: 2.055rem; padding: .25rem 1rem; } From 4d09d27abd6cc04e79da786ff5c8324144340e93 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 12 Apr 2019 10:09:29 +0300 Subject: [PATCH 13/45] More font tweaks --- css/styles.css | 4 ++-- fonts/hy-icons.eot | Bin 27960 -> 27960 bytes fonts/hy-icons.ttf | Bin 27792 -> 27792 bytes fonts/hy-icons.woff | Bin 16812 -> 16812 bytes sass/components/_hero.scss | 6 ++++-- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/css/styles.css b/css/styles.css index 120e1a3..9fade7a 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4606,13 +4606,13 @@ dl, ol, ul { @media (min-width: 48em) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 6.5vh; + font-size: 4.0625rem; } } @media (min-width: 62.5em) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 7vh; + font-size: 5rem; } } diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 1bf493fb9557ca5bc324df97ec09dfc889d01d9b..e5dc76c12a37b2887db6bb0a2c13c8f6359128d4 100644 GIT binary patch delta 52 zcmdmSi*d&-#tAk|)^8`;?O~EQJ@L;pskheg{5D@1xS3xt0Ktu`uUKI8<~58x*#Jjo B6%+sf delta 52 zcmdmSi*d&-#tAk|w?9v`+ruPUJ@L;psn56L`E9;3a5KMP0D>D=U&O%Z&1)EYvH@|y B7P$Zb diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index 8ea1f6b3a487365ce636b9aef00c9668c76f9edd..5522aacdc2224d98e9ee5efdc298a92021c67005 100644 GIT binary patch delta 46 tcmbPmlW_tN1u;pSo)|Js>aBG=zs*+$Zsr#ZKyc&gD;5~NnT4?@8vvak5Yqqv delta 46 tcmbPmlW_tN1u=r{G{_*@aUm3WWUjRiIZd`rE0;B)`{{NljF!OUD TmxF-`Bnkj{FAm$YQ#)A(Xo?#^ delta 61 zcmV-D0K)&Qg8{6A0g#RY6??Ien>r|R@8kJxzA|t#zW|Cb+_?H821ft?{r@}5Vdm#R TE(Ze>NE860hY&5ZQ#)A(dz2d; diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 6a40ac2..b7e385a 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -97,11 +97,13 @@ line-height: normal; @include breakpoint($small) { - font-size: 6.5vh; + @include font-size(65px); + //font-size: 6.5vh; } @include breakpoint($medium) { - font-size: 7vh; + @include font-size(80px); + //font-size: 7vh; } } From e47413ecd13f3e3716bb0bc14f18b97560c81ccc Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 12 Apr 2019 10:17:19 +0300 Subject: [PATCH 14/45] Removed test text from template --- fonts/hy-icons.eot | Bin 27960 -> 27960 bytes fonts/hy-icons.ttf | Bin 27792 -> 27792 bytes fonts/hy-icons.woff | Bin 16812 -> 16812 bytes templates/16_1_2-hero-big.html | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index e5dc76c12a37b2887db6bb0a2c13c8f6359128d4..bdae1f6fdbf28b3bca2ee1d8d3e546fb5edbef98 100644 GIT binary patch delta 52 zcmdmSi*d&-#tAk|x1UY4+ruRNd*YvIQqOM3^V@u7;AVco00cL#zMcc4H?Lvr$p!$1 CEElT) delta 52 zcmdmSi*d&-#tAk|)^8`;?O~EQJ@L;pskheg{5D@1xS3xt0Ktu`uUKI8<~58x*#Jjo B6%+sf diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index 5522aacdc2224d98e9ee5efdc298a92021c67005..87a1c1dadb50a38530aaf1f9352d08eaa3498bd1 100644 GIT binary patch delta 46 tcmbPmlW_tN1u;qgo)|Js>e=mhew(ih+{`Z+fZ)c}*K=U>W){YtYyiS6643wv delta 46 tcmbPmlW_tN1u;pSo)|Js>aBG=zs*+$Zsr#ZKyc&gD;5~NnT4?@8vvak5Yqqv diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 9b2e17783f8ed847c6937a31d8e416eb291b2974..d06d5ca8a77f21c4f90796f0b59f044a04c75ba5 100644 GIT binary patch delta 61 zcmV-D0K)&Qg8{6A0g#RY8~d@4n>r|h@8kJxzA|t#zW|Cb+_?IB4vhZ)`~P>A!_3ct TTn+{%kSGAHTM(wRQ#)A(zN{V0 delta 61 zcmV-D0K)&Qg8{6A0g#RY7|XGcn>r{G{_*@aUm3WWUjRiIZd`rE0;B)`{{NljF!OUD TmxF-`Bnkj{FAm$YQ#)A(Xo?#^ diff --git a/templates/16_1_2-hero-big.html b/templates/16_1_2-hero-big.html index 12d4675..f84976b 100644 --- a/templates/16_1_2-hero-big.html +++ b/templates/16_1_2-hero-big.html @@ -3,7 +3,7 @@

- Ole yksi* parhaista ja lisää sisältöä tähän otsikkoon + Ole yksi* parhaista

From 04e61b939fefbb452544f6dab3605c4922950b97 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Wed, 24 Apr 2019 11:15:06 +0300 Subject: [PATCH 15/45] Pause and play buttons for hero-big-video --- css/styles.css | 50 +++++++++++++++++++++++++++++++- fonts/hy-icons.eot | Bin 27960 -> 28168 bytes fonts/hy-icons.ttf | Bin 27792 -> 28000 bytes fonts/hy-icons.woff | Bin 16812 -> 16928 bytes icons/dest/uEA89-pause.svg | 1 + icons/dest/uEA8A-play-arrow.svg | 1 + icons/src/pause.svg | 1 + icons/src/play-arrow.svg | 1 + icons/unicodes.json | 2 +- sass/components/_hero.scss | 25 +++++++++++++++- sass/icons/__icon_font.scss | 2 ++ sass/icons/__variables.scss | 4 +++ templates/16_1_2-hero-big.html | 4 +++ templates/2_1_icons.html | 4 +++ 14 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 icons/dest/uEA89-pause.svg create mode 100644 icons/dest/uEA8A-play-arrow.svg create mode 100644 icons/src/pause.svg create mode 100644 icons/src/play-arrow.svg diff --git a/css/styles.css b/css/styles.css index 9fade7a..d17df9f 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1939,6 +1939,28 @@ th { content: ""; } +.icon--pause:after { + display: inline-block; + font-family: "hy-icons"; + font-style: normal; + font-weight: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + vertical-align: bottom; + content: ""; +} + +.icon--play-arrow:after { + display: inline-block; + font-family: "hy-icons"; + font-style: normal; + font-weight: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + vertical-align: bottom; + content: ""; +} + .bar, .tube { display: block; padding-bottom: 1em; @@ -4563,6 +4585,7 @@ dl, ol, ul { display: -ms-flexbox; display: flex; height: 75vh; + max-height: 600px; /* .hero-big__play { background-color: rgba($black, 0.61); box-decoration-break: clone; @@ -4624,7 +4647,7 @@ dl, ol, ul { .hero-big:not(.hero-big--centered) .hero-big__title, .hero-big:not(.hero-big--centered) .hero-big__ingress { - background-color: rgba(34, 34, 34, 0.61); + background-color: rgba(34, 34, 34, 0.7); -webkit-box-decoration-break: clone; box-decoration-break: clone; display: inline; @@ -4637,6 +4660,31 @@ dl, ol, ul { } } +.hero-big__video__controls { + bottom: 0; + position: absolute; + right: 0; +} + +.hero-big__video-button { + background-color: rgba(0, 0, 0, 0.6); + border: none; + color: #FFF; + cursor: pointer; + display: -ms-flexbox; + display: flex; + -ms-flex: 1; + flex: 1; + font-size: 1.2rem; + height: 2.5rem; + -ms-flex-pack: center; + justify-content: center; + padding: 0; + transition-duration: .3s; + transition-property: all; + width: 3rem; +} + .hero-big__top { margin: 0 auto; max-width: 75em; diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index bdae1f6fdbf28b3bca2ee1d8d3e546fb5edbef98..de4bd9598b3feb4f57c5cbca379dbe96849b9f9b 100644 GIT binary patch delta 571 zcmZ8dJ!sTm7=FGam*mpMr1hFu2mh+2cy+Pup(yImMLX9+5Nv4U1-;yb=EM|iBM$a@ z7NNwcQ$>dkE)ozCT^z(t6}+L!4GtBgh>O&rw5M;bh~Nj$`^WP<@5lS{Gpjb3D3^dS zcR|bv>%(<_;lhKk0kAs&E|0sG7rZI;0sIF*eo-h+UB7?hk`Jg=AphO5t%lhks0&nkvP%Vm;(}EnsRLyn28j%DP$YjU$MOBN8| z@4!i;t0N<3*^%C%j=|jF|N2^>nWh%#rpc9(s0X@X@T;c2J)d-ZC5iv))_KVP9RC(= z#K>E?)ZKx&Sp6+IraPjhs%#ln`rLUuQPEv4(+xAuKsJvEVFo?kold<`WDI z9JA7MD$}m>?^(&fz?;Cp5FU|{nwTQmDg7I$_5l!^WdH>@{;~!G*?WLkB_p?_;!*4W z&p`980P&Zc{NzOK)%KSd7yB*JO^Ob>{`2|pf;l|b1b71u3 zHH?yswUduAE@bT3oWaDw3lNcCVfTAEXb$~P%Se%710>~F) z5CDoWy<&W2^UCX$|EuU%nXmF*b!JX)rJ_UtnP1*p{ACnbwx&Rm{M^+rhvP z{w5(k{q5nSv&AS4`e{%AZ6T{oHPcSg> z0QEC6PRkUofB23DXPGZ5V@KCo&A#txt;NS_Xn<^qeeFvbA+LJR^x z5vEs+uWVjBbUae+TQARcoGh(xd<0m8s+$9#x^ z8)&+TnK+}E2sz>% delta 361 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 diff --git a/icons/dest/uEA8A-play-arrow.svg b/icons/dest/uEA8A-play-arrow.svg new file mode 100644 index 0000000..0ae30aa --- /dev/null +++ b/icons/dest/uEA8A-play-arrow.svg @@ -0,0 +1 @@ +icon-play \ No newline at end of file diff --git a/icons/src/pause.svg b/icons/src/pause.svg new file mode 100644 index 0000000..13adf0e --- /dev/null +++ b/icons/src/pause.svg @@ -0,0 +1 @@ +icon-pause diff --git a/icons/src/play-arrow.svg b/icons/src/play-arrow.svg new file mode 100644 index 0000000..0ae30aa --- /dev/null +++ b/icons/src/play-arrow.svg @@ -0,0 +1 @@ +icon-play \ No newline at end of file diff --git a/icons/unicodes.json b/icons/unicodes.json index b53d99f..3f45d7c 100644 --- a/icons/unicodes.json +++ b/icons/unicodes.json @@ -1 +1 @@ -{"add-to-todo-list.svg":"uEA01","arrow.svg":"uEA03","avatar-group.svg":"uEA04","avatar.svg":"uEA05","bachelor.svg":"uEA06","camera.svg":"uEA07","chat.svg":"uEA08","date.svg":"uEA09","discover.svg":"uEA0A","done.svg":"uEA0B","download.svg":"uEA0C","drag.svg":"uEA0D","drop-down.svg":"uEA0E","edit-event.svg":"uEA0F","edit.svg":"uEA10","events.svg":"uEA11","facebook.svg":"uEA12","favorites.svg":"uEA13","grid.svg":"uEA14","hamburger.svg":"uEA15","home.svg":"uEA16","hy-logo.svg":"uEA17","info-stroke.svg":"uEA18","info.svg":"uEA19","link-arrow-offsite.svg":"uEA1A","link-arrow.svg":"uEA1B","linkedin.svg":"uEA1C","list.svg":"uEA1D","location.svg":"uEA1E","log.svg":"uEA1F","logout.svg":"uEA20","magnify-minus.svg":"uEA21","magnify-plus.svg":"uEA22","master.svg":"uEA23","minus.svg":"uEA24","modify.svg":"uEA25","navi-triangle.svg":"uEA26","new-group.svg":"uEA27","new-person.svg":"uEA28","notification.svg":"uEA29","opinder-logo-new.svg":"uEA2A","pdf.svg":"uEA2B","people.svg":"uEA2C","person-outline.svg":"uEA2D","person.svg":"uEA2E","plus.svg":"uEA2F","profile.svg":"uEA30","question.svg":"uEA31","remove.svg":"uEA32","rotate-left.svg":"uEA33","rotate-right.svg":"uEA34","search.svg":"uEA35","time.svg":"uEA36","todo-list.svg":"uEA37","tour.svg":"uEA38","twitter.svg":"uEA39","units-and-faculties.svg":"uEA3A","video.svg":"uEA3B","warning.svg":"uEA3C","you-tube.svg":"uEA3D","id-number.svg":"uEA3E","mail.svg":"uEA3F","mobile.svg":"uEA40","opinder-logo.svg":"uEA41","permission-all.svg":"uEA42","permission-group.svg":"uEA43","permission-private.svg":"uEA44","phone.svg":"uEA45","preview.svg":"uEA46","url.svg":"uEA47","instagram.svg":"uEA48","login.svg":"uEA49","spinner.svg":"uEA4A","you-tuubi.svg":"uEA4B","bullet-list.svg":"uEA4C","contentlink.svg":"uEA4D","customlink.svg":"uEA4E","dragbutton.svg":"uEA4F","embed-new (1).svg":"uEA50","embed.svg":"uEA51","feed.svg":"uEA52","file-text.svg":"uEA53","helsinginyliopisto.svg":"uEA54","horizontal-resize.svg":"uEA55","image-gallery.svg":"uEA56","images.svg":"uEA57","leiki-list.svg":"uEA58","listoflinks.svg":"uEA59","play.svg":"uEA5A","wrench.svg":"uEA5B","youtube.svg":"uEA5D","link-arrow-down.svg":"uEA5E","link-arrow-left.svg":"uEA5F","link-arrow-up.svg":"uEA60","code-fork.svg":"uEA61","cogs.svg":"uEA62","external-link.svg":"uEA63","globe.svg":"uEA64","image.svg":"uEA65","arrow-down.svg":"uEA66","arrow-left.svg":"uEA67","arrow-right.svg":"uEA68","arrow-up.svg":"uEA69","arrow-offsite.svg":"uEA6C","caret-down.svg":"uEA6D","caret-left.svg":"uEA6E","caret-right.svg":"uEA71","caret-up.svg":"uEA70","list-as-blocks.svg":"uEA72","social-media.svg":"uEA73","dot.svg":"uEA74","google-plus.svg":"uEA75","share.svg":"uEA76","heart.svg":"uEA77","retweet.svg":"uEA78","square-checked.svg":"uEA79","square.svg":"uEA7A","eye-slash.svg":"uEA7B","full-screen.svg":"uEA7C","alert.svg":"uEA7D","archive.svg":"uEA7E","copy.svg":"uEA7F","file-chart.svg":"uEA80","item-close.svg":"uEA81","item-edit.svg":"uEA82","item-set.svg":"uEA83","item-single.svg":"uEA84","new-version.svg":"uEA85","trash.svg":"uEA86","version-history.svg":"uEA87","whatsapp.svg":"uEA88"} \ No newline at end of file +{"add-to-todo-list.svg":"uEA01","arrow.svg":"uEA03","avatar-group.svg":"uEA04","avatar.svg":"uEA05","bachelor.svg":"uEA06","camera.svg":"uEA07","chat.svg":"uEA08","date.svg":"uEA09","discover.svg":"uEA0A","done.svg":"uEA0B","download.svg":"uEA0C","drag.svg":"uEA0D","drop-down.svg":"uEA0E","edit-event.svg":"uEA0F","edit.svg":"uEA10","events.svg":"uEA11","facebook.svg":"uEA12","favorites.svg":"uEA13","grid.svg":"uEA14","hamburger.svg":"uEA15","home.svg":"uEA16","hy-logo.svg":"uEA17","info-stroke.svg":"uEA18","info.svg":"uEA19","link-arrow-offsite.svg":"uEA1A","link-arrow.svg":"uEA1B","linkedin.svg":"uEA1C","list.svg":"uEA1D","location.svg":"uEA1E","log.svg":"uEA1F","logout.svg":"uEA20","magnify-minus.svg":"uEA21","magnify-plus.svg":"uEA22","master.svg":"uEA23","minus.svg":"uEA24","modify.svg":"uEA25","navi-triangle.svg":"uEA26","new-group.svg":"uEA27","new-person.svg":"uEA28","notification.svg":"uEA29","opinder-logo-new.svg":"uEA2A","pdf.svg":"uEA2B","people.svg":"uEA2C","person-outline.svg":"uEA2D","person.svg":"uEA2E","plus.svg":"uEA2F","profile.svg":"uEA30","question.svg":"uEA31","remove.svg":"uEA32","rotate-left.svg":"uEA33","rotate-right.svg":"uEA34","search.svg":"uEA35","time.svg":"uEA36","todo-list.svg":"uEA37","tour.svg":"uEA38","twitter.svg":"uEA39","units-and-faculties.svg":"uEA3A","video.svg":"uEA3B","warning.svg":"uEA3C","you-tube.svg":"uEA3D","id-number.svg":"uEA3E","mail.svg":"uEA3F","mobile.svg":"uEA40","opinder-logo.svg":"uEA41","permission-all.svg":"uEA42","permission-group.svg":"uEA43","permission-private.svg":"uEA44","phone.svg":"uEA45","preview.svg":"uEA46","url.svg":"uEA47","instagram.svg":"uEA48","login.svg":"uEA49","spinner.svg":"uEA4A","you-tuubi.svg":"uEA4B","bullet-list.svg":"uEA4C","contentlink.svg":"uEA4D","customlink.svg":"uEA4E","dragbutton.svg":"uEA4F","embed-new (1).svg":"uEA50","embed.svg":"uEA51","feed.svg":"uEA52","file-text.svg":"uEA53","helsinginyliopisto.svg":"uEA54","horizontal-resize.svg":"uEA55","image-gallery.svg":"uEA56","images.svg":"uEA57","leiki-list.svg":"uEA58","listoflinks.svg":"uEA59","play.svg":"uEA5A","wrench.svg":"uEA5B","youtube.svg":"uEA5D","link-arrow-down.svg":"uEA5E","link-arrow-left.svg":"uEA5F","link-arrow-up.svg":"uEA60","code-fork.svg":"uEA61","cogs.svg":"uEA62","external-link.svg":"uEA63","globe.svg":"uEA64","image.svg":"uEA65","arrow-down.svg":"uEA66","arrow-left.svg":"uEA67","arrow-right.svg":"uEA68","arrow-up.svg":"uEA69","arrow-offsite.svg":"uEA6C","caret-down.svg":"uEA6D","caret-left.svg":"uEA6E","caret-right.svg":"uEA71","caret-up.svg":"uEA70","list-as-blocks.svg":"uEA72","social-media.svg":"uEA73","dot.svg":"uEA74","google-plus.svg":"uEA75","share.svg":"uEA76","heart.svg":"uEA77","retweet.svg":"uEA78","square-checked.svg":"uEA79","square.svg":"uEA7A","eye-slash.svg":"uEA7B","full-screen.svg":"uEA7C","alert.svg":"uEA7D","archive.svg":"uEA7E","copy.svg":"uEA7F","file-chart.svg":"uEA80","item-close.svg":"uEA81","item-edit.svg":"uEA82","item-set.svg":"uEA83","item-single.svg":"uEA84","new-version.svg":"uEA85","trash.svg":"uEA86","version-history.svg":"uEA87","whatsapp.svg":"uEA88","pause.svg":"uEA89","play-arrow.svg":"uEA8A"} \ No newline at end of file diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index b7e385a..4a1faea 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -67,6 +67,7 @@ align-items: flex-end; display: flex; height: 75vh; + max-height: 600px; &:after { display: none; @@ -121,7 +122,7 @@ .hero-big__title, .hero-big__ingress { - background-color: rgba($black, 0.61); + background-color: rgba($black, 0.7); box-decoration-break: clone; display: inline; @@ -132,6 +133,28 @@ } } +.hero-big__video__controls { + bottom: 0; + position: absolute; + right: 0; +} + +.hero-big__video-button { + background-color: rgba(0, 0, 0, 0.6); + border: none; + color: $white; + cursor: pointer; + display: flex; + flex: 1; + font-size: 1.2rem; + height: 2.5rem; + justify-content: center; + padding: 0; + transition-duration: .3s; + transition-property: all; + width: 3rem; +} + .hero-big__top { margin: 0 auto; max-width: 75em; diff --git a/sass/icons/__icon_font.scss b/sass/icons/__icon_font.scss index 2f1e0d7..ec23637 100644 --- a/sass/icons/__icon_font.scss +++ b/sass/icons/__icon_font.scss @@ -201,3 +201,5 @@ .icon--trash:after { @include icon("\EA86"); } .icon--version-history:after { @include icon("\EA87"); } .icon--whatsapp:after { @include icon("\EA88"); } +.icon--pause:after { @include icon("\EA89"); } +.icon--play-arrow:after { @include icon("\EA8A"); } diff --git a/sass/icons/__variables.scss b/sass/icons/__variables.scss index fbba8f7..983dd44 100644 --- a/sass/icons/__variables.scss +++ b/sass/icons/__variables.scss @@ -254,3 +254,7 @@ $icon-trash: "\EA86"; $icon-version-history: "\EA87"; $icon-whatsapp: "\EA88"; + +$icon-pause: "\EA89"; + +$icon-play-arrow: "\EA8A"; diff --git a/templates/16_1_2-hero-big.html b/templates/16_1_2-hero-big.html index f84976b..62c6ba6 100644 --- a/templates/16_1_2-hero-big.html +++ b/templates/16_1_2-hero-big.html @@ -25,5 +25,9 @@

+
+ + +

diff --git a/templates/2_1_icons.html b/templates/2_1_icons.html index c93e5af..2a251e5 100644 --- a/templates/2_1_icons.html +++ b/templates/2_1_icons.html @@ -121,6 +121,8 @@ + +


@@ -244,6 +246,8 @@ + +
From cfb06ec7546ca71718e7b9f2535668133c3c4991 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Wed, 24 Apr 2019 11:19:49 +0300 Subject: [PATCH 16/45] Fonts --- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index de4bd9598b3feb4f57c5cbca379dbe96849b9f9b..d85d97de47adcf116b9f494f84c2986e504816c7 100644 GIT binary patch delta 52 zcmeCU!`N|$ae@s~gUv*{Jxq7nC;pixWz!JPZ}XLboB0I;5Zrir`VoxYyoNC*2LL$( B70&Hszs*+$Zsr#ZKyc&f$&)a8^BTsO8~{!e B7CQg{ diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index d4b1355bfd43079f666487fd8918f581c38007ef..8730c8a858d9cc1fede7bd49c18a92d27b46f091 100644 GIT binary patch delta 46 vcmaEGi}ArN#tA`8ciJb0Op~%{i08NY%D~P1f&mC_JU#sgMsH?ejL882&Vds6 delta 46 vcmaEGi}ArN#tA`8H$o?dOp|hX63=h*m4Tc21p^S=czW_AjNZ(`7?T44(RC8| diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index b56d74d35b3a948400e5e65add2a88b5469722f5..8dadb08c1217668a86cdd19011fc6c033aea24f9 100644 GIT binary patch delta 61 zcmV-D0K)&EgaM$00g#RY+=sD{|2ils9`XD(Um3WWUjRiIZah8x2uA<^{r@}5Vdm#R TE(Ze>NE86JtPu#aw>xPDQyUsJ delta 61 zcmV-D0K)&EgaM$00g#RY*j2HR|2il+YvTEBzA|t#zW|Cb+<1EOB#i$5`~P>A!_3ct TTn+{%kSGAd`Vl^}w>xPDtTY|- From 1399f8986d5641a5727e114dee5ff7733fccf437 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Wed, 24 Apr 2019 11:59:50 +0300 Subject: [PATCH 17/45] Fonts questionmark --- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index d85d97de47adcf116b9f494f84c2986e504816c7..f060babe514eddcea9b149f191a75563465dc65e 100644 GIT binary patch delta 52 zcmeCU!`N|$ae@s~fXGCN^;{c@1Ms4ge?n B6?Xst delta 52 zcmeCU!`N|$ae@s~gUv*{Jxq7nC;pixWz!JPZ}XLboB0I;5Zrir`VoxYyoNC*2LL$( B70&tUm3WWUjRiIZalsE4o3g~{r@}5Vdm#R TE(Ze>NE868#1P!Gw>xPDaLXIT delta 61 zcmV-D0K)&EgaM$00g#RY+=sD{|2ils9`XD(Um3WWUjRiIZah8x2uA<^{r@}5Vdm#R TE(Ze>NE86JtPu#aw>xPDQyUsJ From 9dad28b5a7c82dd061768ed5585c9797e413fa99 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Wed, 24 Apr 2019 15:18:47 +0300 Subject: [PATCH 18/45] Minor style tweaks --- css/styles.css | 19 +++++++------------ fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 9 ++++++--- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/css/styles.css b/css/styles.css index d17df9f..97570f4 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1477,17 +1477,6 @@ th { content: ""; } -.icon--wrench:after { - display: inline-block; - font-family: "hy-icons"; - font-style: normal; - font-weight: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - vertical-align: bottom; - content: ""; -} - .icon--youtube:after { display: inline-block; font-family: "hy-icons"; @@ -4641,7 +4630,7 @@ dl, ol, ul { .hero-big:not(.hero-big--centered) .hero-big__ingress { font-size: 1.125rem; - line-height: 2.055rem; + line-height: 2.14rem; padding: .25rem 1rem; } @@ -4667,6 +4656,8 @@ dl, ol, ul { } .hero-big__video-button { + -ms-flex-align: center; + align-items: center; background-color: rgba(0, 0, 0, 0.6); border: none; color: #FFF; @@ -4685,6 +4676,10 @@ dl, ol, ul { width: 3rem; } +.hero-big__video-button:hover { + background-color: black; +} + .hero-big__top { margin: 0 auto; max-width: 75em; diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index f060babe514eddcea9b149f191a75563465dc65e..b0f2f4454832c5a8ec0937f1742b85aa6a253a7f 100644 GIT binary patch delta 55 zcmeCU!`N|$ae@uAN7Uts_Pdx@`YxXMXR7q&D35r4o39Mq%r6*#;KnnS0vNq{4P#6W E0CIg52mk;8 delta 55 zcmeCU!`N|$ae@tVfXJ1J_Pdx@e3(D+&s6CvA_4LIHeVUInO`sf!HuU^-@)k3YZzm4 E0F#av$N&HU diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index e8e7fff4f7cd81257975f72bba41092ab51d104e..7c0c04b61c8b6215209cd6bf5d18662611602180 100644 GIT binary patch delta 48 xcmaEGi}ArN#tDJUD}5JF44Eo@Im#oR-{va=H}eYyAh_|2r2s~6W?_uU0RZ4e5qAIp delta 48 xcmaEGi}ArN#tDJUD?ZGh7&2A*iby~_zs*+$Zsr#ZKyc&f)psy@GYex(4gd@o6m$Rp diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 5b63060b5efc519a9b48fd9dd972ed0a8cc26a2b..6d4689e331058cef8e8ddb76051d3a78287a2cdb 100644 GIT binary patch delta 63 zcmV-F0KosCgaM$00g#OYsZFD?kp4O;i%kOY{5D@1xS3x7MHp^8V<~{q|9}7g&T^Rf VIgrc2zyuNn0C=SieY3YaX$GH?9OwW5 delta 63 zcmV-F0KosCgaM$00g#OYsPLb$kp4O;OEwbm{5D@1xS3x7MHp^8z4{JD|Ns5}JIi6_ V=Rht80~1IT0IS3h+_SekX$Gvh9Jl}g diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 4a1faea..b054225 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -99,18 +99,16 @@ @include breakpoint($small) { @include font-size(65px); - //font-size: 6.5vh; } @include breakpoint($medium) { @include font-size(80px); - //font-size: 7vh; } } .hero-big__ingress { @include font-size(18px); - line-height: 2.055rem; + line-height: 2.14rem; padding: .25rem 1rem; } @@ -140,6 +138,7 @@ } .hero-big__video-button { + align-items: center; background-color: rgba(0, 0, 0, 0.6); border: none; color: $white; @@ -153,6 +152,10 @@ transition-duration: .3s; transition-property: all; width: 3rem; + + &:hover { + background-color: rgba(0, 0, 0, 1); + } } .hero-big__top { From c67e829f7f6a716a5c819e116d113e3f3cdc4fa1 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Wed, 24 Apr 2019 15:40:17 +0300 Subject: [PATCH 19/45] Added wrench back, for whatever reason it was removed --- css/styles.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/css/styles.css b/css/styles.css index 97570f4..38e0242 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1477,6 +1477,17 @@ th { content: ""; } +.icon--wrench:after { + display: inline-block; + font-family: "hy-icons"; + font-style: normal; + font-weight: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + vertical-align: bottom; + content: ""; +} + .icon--youtube:after { display: inline-block; font-family: "hy-icons"; From a9c6c5ad26063f7b995b79424e096edaf184c389 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Wed, 24 Apr 2019 15:40:43 +0300 Subject: [PATCH 20/45] Font binary --- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index b0f2f4454832c5a8ec0937f1742b85aa6a253a7f..747d7b9e29fef7c0ffcdf39d8f5867dc584df040 100644 GIT binary patch delta 52 zcmeCU!`N|$ae@t#g4;y9Jxt--C;pix<)#qNZ}XLboB0I;5ZrjiSp}mvuVIYI0Ra0! B5_|vv delta 52 zcmeCU!`N|$ae@t#N7O{SJxsofC;pix73C4nZ}XLboB0I;5ZrjiQUIejuVIYI0RRT{ B61V^W diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index 7c0c04b61c8b6215209cd6bf5d18662611602180..cfc24ed82cfa6eabb344e44e74222303a16e9324 100644 GIT binary patch delta 46 ucmaEGi}ArN#tA`8;oB#MOp|g`i08NY%D~P1f&mC_Jmai_(VJNqV{!nWN)P)0 delta 46 ucmaEGi}ArN#tA`8zKbV@Op}W8i08NY%D~P1f&mC_JYy+<(VJNqV{!nX?hpF_ diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 6d4689e331058cef8e8ddb76051d3a78287a2cdb..8d27cef82b72b4e41b6a9bb71f8650295f5feaa8 100644 GIT binary patch delta 61 zcmV-D0K)&EgaM$00g#RYSGTc{|2inSFXH)azA|t#zW|Cb+<3-W1*8A}{{NljF!OUD TmxF-`BnkkW4G&(kw>xPDo=_a2 delta 61 zcmV-D0K)&EgaM$00g#RYO{1}p|2im50`dGdUm3WWUjRiIZaiZtfYJYd|NqW%nE5%7 T%fY||5(NNwr4D_ww>xPDSdAOB From 288f0242345990588c4f1b80e163ef9037ef6d54 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Mon, 29 Apr 2019 09:48:41 +0300 Subject: [PATCH 21/45] Added headphones icon --- css/styles.css | 11 +++++++++++ fonts/hy-icons.eot | Bin 27960 -> 28188 bytes fonts/hy-icons.ttf | Bin 27792 -> 28020 bytes fonts/hy-icons.woff | Bin 16812 -> 16988 bytes icons/dest/uEA89-headphones.svg | 1 + icons/src/headphones.svg | 1 + icons/unicodes.json | 2 +- sass/icons/__icon_font.scss | 1 + sass/icons/__variables.scss | 2 ++ templates/2_1_icons.html | 2 ++ 10 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 icons/dest/uEA89-headphones.svg create mode 100644 icons/src/headphones.svg diff --git a/css/styles.css b/css/styles.css index 19e0103..1865ec7 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1939,6 +1939,17 @@ th { content: ""; } +.icon--headphones:after { + display: inline-block; + font-family: "hy-icons"; + font-style: normal; + font-weight: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + vertical-align: bottom; + content: ""; +} + .bar, .tube { display: block; padding-bottom: 1em; diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 8dae3bcb930b8111a1bcca68eb24bd64485c7492..026f650807f5688b9e84e0bd58413afbbce79da1 100644 GIT binary patch delta 590 zcmXw0O=uHA6n<}KGfCrSH@4eoB^dE1f`(R%Y(Pt6KqdBIdl0Juk(h3?N;e5~4;5^K z2P;7jmi1J6h~`qzi!6c_=}D!acn}3q4{AZ$SOrC~R84#db>N%#=6mn^9y4?Q4Nkv9 z9?St)<|Nm|{t8b`9=uw73xF2^;6%nu7lw}9)&bZv0MATz_`;BJceV`Rvj9#84Lv>B ze(%F?>U~ep3?e*#UB@YZNZ4+e*662P{TuncB&-bQGwFfZ_zM7u^iVU?qXn$sSE_BK z^OjuN)Q?6tRdxaB*8zk;AwObGC4VgdWM=?ePwhe6wqqQSnh7ah=|7`%|AcjHkr;Tr zd~EuEwC`XCj@wW0CYBsS@Cf_ZV!cLH7l9EX1d(Q3Yq|kW5ZmyLQ1mu=5mR>&LE z@c_EUXePIjuiAdzqDa&VJlNQ2U2?o`fqSbZfCga9mVAH2hz#I(!*tjZQ( zKe=p`u{DIz4Vy8JJ-Cx~qJlDpFs#LTaBqNkcT5X+VVJua4}>tF#W5PwT00ScTv?i6 zhg-rbw)t*Je%!Mb+ci0noO?c(Ovo`+@Jkg*#V%B+M@2Q9@E&59m)OVB=h}BmnJ3+P z(&4LSqDqg>FQ4u0>+8*YIrrGtMm4`w+r5^|D;6r%l5<+`7U(^vva13Xof}43l)a7b MFBtipK0;Ui2Yri^p#T5? delta 380 zcmbPphjGU(MmCFF28Iba6WPpIm^01@PITz5zs117Si``;5SE;qSa6m(cNPN!^9cq9 zj#=qBm1)=c_pD@K;7wp)2#?4}O-vD)c{?4b_5l!^WdH>@{;~!G*?WLkB_p?_;!*4W z&p`980P&Zc{NzOK)%KSd7dHFQ5!75Hka@4iK{d&F=!6#K71B6a|^71EjgY;w+32K)w)z z08oVK72_+LS6;9DUq!#le3kdAWAi>1Yet|Bw#AHWj6y(lJV4CACIBLVpkcEBI}_Vv g8QwpeW%we)H(RDzFae!Xl<{kGUgiQ8pv4Rf0Dw?la{vGU diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index 0182aabc4f1664b6644034873b878225cdee308a..3dfd908fd90b18154ac1bbc9c43783d956829432 100644 GIT binary patch delta 611 zcmXw1O=uHQ5T4n$*~YlpUDIt8DUDc(prI858_>`YP>DG-3Sw{@d)8jD2}-^ZRiJ84f5TSs?_CAow$J-}Qt$YHs@p8m~Y VMQ>(ic*$Y?kz%%xPfgI3{{i9LoN)jE delta 364 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 Q%RxSVH2N1aaM@)50Bi6u&j0`b delta 15353 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 \ No newline at end of file diff --git a/icons/src/headphones.svg b/icons/src/headphones.svg new file mode 100644 index 0000000..b8efad2 --- /dev/null +++ b/icons/src/headphones.svg @@ -0,0 +1 @@ +Headphones \ No newline at end of file diff --git a/icons/unicodes.json b/icons/unicodes.json index b53d99f..bdde2a5 100644 --- a/icons/unicodes.json +++ b/icons/unicodes.json @@ -1 +1 @@ -{"add-to-todo-list.svg":"uEA01","arrow.svg":"uEA03","avatar-group.svg":"uEA04","avatar.svg":"uEA05","bachelor.svg":"uEA06","camera.svg":"uEA07","chat.svg":"uEA08","date.svg":"uEA09","discover.svg":"uEA0A","done.svg":"uEA0B","download.svg":"uEA0C","drag.svg":"uEA0D","drop-down.svg":"uEA0E","edit-event.svg":"uEA0F","edit.svg":"uEA10","events.svg":"uEA11","facebook.svg":"uEA12","favorites.svg":"uEA13","grid.svg":"uEA14","hamburger.svg":"uEA15","home.svg":"uEA16","hy-logo.svg":"uEA17","info-stroke.svg":"uEA18","info.svg":"uEA19","link-arrow-offsite.svg":"uEA1A","link-arrow.svg":"uEA1B","linkedin.svg":"uEA1C","list.svg":"uEA1D","location.svg":"uEA1E","log.svg":"uEA1F","logout.svg":"uEA20","magnify-minus.svg":"uEA21","magnify-plus.svg":"uEA22","master.svg":"uEA23","minus.svg":"uEA24","modify.svg":"uEA25","navi-triangle.svg":"uEA26","new-group.svg":"uEA27","new-person.svg":"uEA28","notification.svg":"uEA29","opinder-logo-new.svg":"uEA2A","pdf.svg":"uEA2B","people.svg":"uEA2C","person-outline.svg":"uEA2D","person.svg":"uEA2E","plus.svg":"uEA2F","profile.svg":"uEA30","question.svg":"uEA31","remove.svg":"uEA32","rotate-left.svg":"uEA33","rotate-right.svg":"uEA34","search.svg":"uEA35","time.svg":"uEA36","todo-list.svg":"uEA37","tour.svg":"uEA38","twitter.svg":"uEA39","units-and-faculties.svg":"uEA3A","video.svg":"uEA3B","warning.svg":"uEA3C","you-tube.svg":"uEA3D","id-number.svg":"uEA3E","mail.svg":"uEA3F","mobile.svg":"uEA40","opinder-logo.svg":"uEA41","permission-all.svg":"uEA42","permission-group.svg":"uEA43","permission-private.svg":"uEA44","phone.svg":"uEA45","preview.svg":"uEA46","url.svg":"uEA47","instagram.svg":"uEA48","login.svg":"uEA49","spinner.svg":"uEA4A","you-tuubi.svg":"uEA4B","bullet-list.svg":"uEA4C","contentlink.svg":"uEA4D","customlink.svg":"uEA4E","dragbutton.svg":"uEA4F","embed-new (1).svg":"uEA50","embed.svg":"uEA51","feed.svg":"uEA52","file-text.svg":"uEA53","helsinginyliopisto.svg":"uEA54","horizontal-resize.svg":"uEA55","image-gallery.svg":"uEA56","images.svg":"uEA57","leiki-list.svg":"uEA58","listoflinks.svg":"uEA59","play.svg":"uEA5A","wrench.svg":"uEA5B","youtube.svg":"uEA5D","link-arrow-down.svg":"uEA5E","link-arrow-left.svg":"uEA5F","link-arrow-up.svg":"uEA60","code-fork.svg":"uEA61","cogs.svg":"uEA62","external-link.svg":"uEA63","globe.svg":"uEA64","image.svg":"uEA65","arrow-down.svg":"uEA66","arrow-left.svg":"uEA67","arrow-right.svg":"uEA68","arrow-up.svg":"uEA69","arrow-offsite.svg":"uEA6C","caret-down.svg":"uEA6D","caret-left.svg":"uEA6E","caret-right.svg":"uEA71","caret-up.svg":"uEA70","list-as-blocks.svg":"uEA72","social-media.svg":"uEA73","dot.svg":"uEA74","google-plus.svg":"uEA75","share.svg":"uEA76","heart.svg":"uEA77","retweet.svg":"uEA78","square-checked.svg":"uEA79","square.svg":"uEA7A","eye-slash.svg":"uEA7B","full-screen.svg":"uEA7C","alert.svg":"uEA7D","archive.svg":"uEA7E","copy.svg":"uEA7F","file-chart.svg":"uEA80","item-close.svg":"uEA81","item-edit.svg":"uEA82","item-set.svg":"uEA83","item-single.svg":"uEA84","new-version.svg":"uEA85","trash.svg":"uEA86","version-history.svg":"uEA87","whatsapp.svg":"uEA88"} \ No newline at end of file +{"add-to-todo-list.svg":"uEA01","arrow.svg":"uEA03","avatar-group.svg":"uEA04","avatar.svg":"uEA05","bachelor.svg":"uEA06","camera.svg":"uEA07","chat.svg":"uEA08","date.svg":"uEA09","discover.svg":"uEA0A","done.svg":"uEA0B","download.svg":"uEA0C","drag.svg":"uEA0D","drop-down.svg":"uEA0E","edit-event.svg":"uEA0F","edit.svg":"uEA10","events.svg":"uEA11","facebook.svg":"uEA12","favorites.svg":"uEA13","grid.svg":"uEA14","hamburger.svg":"uEA15","home.svg":"uEA16","hy-logo.svg":"uEA17","info-stroke.svg":"uEA18","info.svg":"uEA19","link-arrow-offsite.svg":"uEA1A","link-arrow.svg":"uEA1B","linkedin.svg":"uEA1C","list.svg":"uEA1D","location.svg":"uEA1E","log.svg":"uEA1F","logout.svg":"uEA20","magnify-minus.svg":"uEA21","magnify-plus.svg":"uEA22","master.svg":"uEA23","minus.svg":"uEA24","modify.svg":"uEA25","navi-triangle.svg":"uEA26","new-group.svg":"uEA27","new-person.svg":"uEA28","notification.svg":"uEA29","opinder-logo-new.svg":"uEA2A","pdf.svg":"uEA2B","people.svg":"uEA2C","person-outline.svg":"uEA2D","person.svg":"uEA2E","plus.svg":"uEA2F","profile.svg":"uEA30","question.svg":"uEA31","remove.svg":"uEA32","rotate-left.svg":"uEA33","rotate-right.svg":"uEA34","search.svg":"uEA35","time.svg":"uEA36","todo-list.svg":"uEA37","tour.svg":"uEA38","twitter.svg":"uEA39","units-and-faculties.svg":"uEA3A","video.svg":"uEA3B","warning.svg":"uEA3C","you-tube.svg":"uEA3D","id-number.svg":"uEA3E","mail.svg":"uEA3F","mobile.svg":"uEA40","opinder-logo.svg":"uEA41","permission-all.svg":"uEA42","permission-group.svg":"uEA43","permission-private.svg":"uEA44","phone.svg":"uEA45","preview.svg":"uEA46","url.svg":"uEA47","instagram.svg":"uEA48","login.svg":"uEA49","spinner.svg":"uEA4A","you-tuubi.svg":"uEA4B","bullet-list.svg":"uEA4C","contentlink.svg":"uEA4D","customlink.svg":"uEA4E","dragbutton.svg":"uEA4F","embed-new (1).svg":"uEA50","embed.svg":"uEA51","feed.svg":"uEA52","file-text.svg":"uEA53","helsinginyliopisto.svg":"uEA54","horizontal-resize.svg":"uEA55","image-gallery.svg":"uEA56","images.svg":"uEA57","leiki-list.svg":"uEA58","listoflinks.svg":"uEA59","play.svg":"uEA5A","wrench.svg":"uEA5B","youtube.svg":"uEA5D","link-arrow-down.svg":"uEA5E","link-arrow-left.svg":"uEA5F","link-arrow-up.svg":"uEA60","code-fork.svg":"uEA61","cogs.svg":"uEA62","external-link.svg":"uEA63","globe.svg":"uEA64","image.svg":"uEA65","arrow-down.svg":"uEA66","arrow-left.svg":"uEA67","arrow-right.svg":"uEA68","arrow-up.svg":"uEA69","arrow-offsite.svg":"uEA6C","caret-down.svg":"uEA6D","caret-left.svg":"uEA6E","caret-right.svg":"uEA71","caret-up.svg":"uEA70","list-as-blocks.svg":"uEA72","social-media.svg":"uEA73","dot.svg":"uEA74","google-plus.svg":"uEA75","share.svg":"uEA76","heart.svg":"uEA77","retweet.svg":"uEA78","square-checked.svg":"uEA79","square.svg":"uEA7A","eye-slash.svg":"uEA7B","full-screen.svg":"uEA7C","alert.svg":"uEA7D","archive.svg":"uEA7E","copy.svg":"uEA7F","file-chart.svg":"uEA80","item-close.svg":"uEA81","item-edit.svg":"uEA82","item-set.svg":"uEA83","item-single.svg":"uEA84","new-version.svg":"uEA85","trash.svg":"uEA86","version-history.svg":"uEA87","whatsapp.svg":"uEA88","headphones.svg":"uEA89"} \ No newline at end of file diff --git a/sass/icons/__icon_font.scss b/sass/icons/__icon_font.scss index 2f1e0d7..5712140 100644 --- a/sass/icons/__icon_font.scss +++ b/sass/icons/__icon_font.scss @@ -201,3 +201,4 @@ .icon--trash:after { @include icon("\EA86"); } .icon--version-history:after { @include icon("\EA87"); } .icon--whatsapp:after { @include icon("\EA88"); } +.icon--headphones:after { @include icon("\EA89"); } diff --git a/sass/icons/__variables.scss b/sass/icons/__variables.scss index fbba8f7..d95ca49 100644 --- a/sass/icons/__variables.scss +++ b/sass/icons/__variables.scss @@ -254,3 +254,5 @@ $icon-trash: "\EA86"; $icon-version-history: "\EA87"; $icon-whatsapp: "\EA88"; + +$icon-headphones: "\EA89"; diff --git a/templates/2_1_icons.html b/templates/2_1_icons.html index c93e5af..7e6ec69 100644 --- a/templates/2_1_icons.html +++ b/templates/2_1_icons.html @@ -121,6 +121,7 @@ +


@@ -244,6 +245,7 @@ +
From 5f9385ed8bb8571b89bfb70807294478a59221b1 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Thu, 9 May 2019 11:31:26 +0300 Subject: [PATCH 22/45] Added new partial overlay to hero big --- css/styles.css | 4 ++-- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/css/styles.css b/css/styles.css index 38e0242..00484fc 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4594,7 +4594,7 @@ dl, ol, ul { } .hero-big:not(.hero-big--centered):after { - display: none; + background: linear-gradient(rgba(34, 34, 34, 0.9), rgba(34, 34, 34, 0)); } .hero-big:not(.hero-big--centered) .hero-big__top { @@ -4635,7 +4635,7 @@ dl, ol, ul { @media (min-width: 62.5em) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 5rem; + font-size: 4.6875rem; } } diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 747d7b9e29fef7c0ffcdf39d8f5867dc584df040..9642a9586ceb1bdab43c6ce8b0770ec4e8159372 100644 GIT binary patch delta 55 zcmeCU!`N|$ae@tVf@teR`(4Zz3dAS=nJV2Xnh?)#^Ob>{`2_44Eo@*-asy-{va=H}eYyAh_|2vkFFUW?_uU0RY~>5qAIp diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 8d27cef82b72b4e41b6a9bb71f8650295f5feaa8..874471078f5db1e880847358abdd57328f0a7738 100644 GIT binary patch delta 63 zcmV-F0KosCgaM$00g#OY&~O*Akp4O;W?PMTew(ih+{`b4A`CZvPF)3~|Ns8~o#im| Vb0C+4fe9oE0E}%9zO%PGX$F|J9BKdn delta 63 zcmV-F0KosCgaM$00g#OYsaLnLkp4O;i@7i2`E9;3a5KLEiZI-G##sfU|Ns8~o#im| Vb0C+4fe9oE0GtgEUbDA5X$IwU9n}B; diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index b054225..756d8b4 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -70,7 +70,7 @@ max-height: 600px; &:after { - display: none; + background: linear-gradient(rgba($black, .9), rgba($black, 0)); } .hero-big__top { @@ -102,7 +102,7 @@ } @include breakpoint($medium) { - @include font-size(80px); + @include font-size(75px); } } From 63537e410c14bb034b9e73919fec89403581134f Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Thu, 9 May 2019 11:42:48 +0300 Subject: [PATCH 23/45] Revert font-size back to 5rem --- css/styles.css | 2 +- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 00484fc..3ac9146 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4635,7 +4635,7 @@ dl, ol, ul { @media (min-width: 62.5em) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 4.6875rem; + font-size: 5rem; } } diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 9642a9586ceb1bdab43c6ce8b0770ec4e8159372..a9511804b2b94806c2b6ee56807e9cec575edac9 100644 GIT binary patch delta 51 zcmeCU!`N|$ae^%)*F?KLOr_H&{+TAll@QNw^Ob>{`2_o3r25V!x)nT0QFT9 AMgRZ+ delta 51 zcmeCU!`N|$ae^(Q=tR3cOamqc^iK#^eA1tS%8D delta 46 vcmaEGi}ArN#tA`81>zG!rb&q=#Pi#HW#DFh!2kp|eokElqc^iK#^eA1pNJ75 diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 874471078f5db1e880847358abdd57328f0a7738..d0cb453b7d86e204b4ddb1f926c60867c28f896b 100644 GIT binary patch delta 61 zcmV-D0K)&EgaM$00g#RYb(gV_|2ilmjd*^WuMFJGFMuKpH-65@g3xPDkMtcW delta 61 zcmV-D0K)&EgaM$00g#RYa2K(V|2imJjd*^WuMFJGFMuKpH-1iC1*8A}{{NljF!OUD TmxF-`BnkkGZ4bV)w>xPDP=y;b diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 756d8b4..73ee818 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -102,7 +102,7 @@ } @include breakpoint($medium) { - @include font-size(75px); + @include font-size(80px); } } From df4c0dba376e12ea6246baa9b6579fb75698ef99 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Thu, 9 May 2019 12:06:07 +0300 Subject: [PATCH 24/45] Minor adjustment to overlay --- css/styles.css | 1 + fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 2 ++ 5 files changed, 3 insertions(+) diff --git a/css/styles.css b/css/styles.css index 3ac9146..c2ea8cc 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4595,6 +4595,7 @@ dl, ol, ul { .hero-big:not(.hero-big--centered):after { background: linear-gradient(rgba(34, 34, 34, 0.9), rgba(34, 34, 34, 0)); + margin-bottom: 40px; } .hero-big:not(.hero-big--centered) .hero-big__top { diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index a9511804b2b94806c2b6ee56807e9cec575edac9..21d9a555dc988e5a5afad3ce01a0195d452f1b7f 100644 GIT binary patch delta 54 zcmeCU!`N|$ae@u=gfA@{`2_@xPDj3peH delta 61 zcmV-D0K)&EgaM$00g#RYb(gV_|2ilmjd*^WuMFJGFMuKpH-65@g3xPDkMtcW diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 73ee818..d8b6bd1 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -71,6 +71,8 @@ &:after { background: linear-gradient(rgba($black, .9), rgba($black, 0)); + // Overlay will block video pause button, prevent it by giving margin to bottom. + margin-bottom: 40px; } .hero-big__top { From ea553702510b7872abf501afa27cfeed2f030a63 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Tue, 14 May 2019 10:05:41 +0300 Subject: [PATCH 25/45] Minor style adjustments --- css/styles.css | 10 +++++++--- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 10 +++++++--- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/css/styles.css b/css/styles.css index c2ea8cc..2c2d543 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4617,10 +4617,14 @@ dl, ol, ul { .hero-big:not(.hero-big--centered) .hero-big__title__container, .hero-big:not(.hero-big--centered) .hero-big__ingress__container { - margin: 1rem 0; + margin: .5rem 0; width: 100%; } +.hero-big:not(.hero-big--centered) .hero-big__content-bottom { + margin-top: .5rem; +} + .hero-big:not(.hero-big--centered) .hero-big__title { font-size: 2.625rem; padding: 0 1rem; @@ -4630,13 +4634,13 @@ dl, ol, ul { @media (min-width: 48em) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 4.0625rem; + font-size: 3.4375rem; } } @media (min-width: 62.5em) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 5rem; + font-size: 4.375rem; } } diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 21d9a555dc988e5a5afad3ce01a0195d452f1b7f..9549c7d65845f39005fef4105349f27e761b7dba 100644 GIT binary patch delta 55 zcmeCU!`N|$ae@u=3ij-Y_PdzxmVKW1XR35I`-*seo39Mq%r6*#;3k8l1dQIihA}1w E09Jz%uK)l5 delta 55 zcmeCU!`N|$ae@u=gfA@XsDm~XR36|mkIIwHeVUInO`sf!Hu7D@4@KJYZzm4 E0KN7Ym;e9( diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index 7e9a9b9834a275210a79f97272e27eb90d31e2bd..4dbf8aebcde5ddea5d05a5b8863fa153da0937a9 100644 GIT binary patch delta 48 xcmaEGi}ArN#tDJUcgsFc44EpO&AuX@-{va=H}eYyAh^jODFLH5voOZw007g24|xCp delta 48 xcmaEGi}ArN#tDJU7aHm(hD?=i`7$A%-{va=H}eYyAh_{!?mZa2nT0VX2LKUZ6m$Rp diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 0cfaea367ed967fe8fb7bfc00745a25fc0563bcd..20ccca3627aeda01a2c6a71ab651edb7739495da 100644 GIT binary patch delta 69 zcmV-L0J{I6gaM$00g#6YG5`PoHWl4=^RbZrIw?&3f_Q$LuMFJGFMuKpHyI=)VD$gr b|G%>wW_}LjaxgG~L;)|M3(^3yw>xPD@Zucv delta 69 zcmV-L0J{I6gaM$00g#6YGXMYpHWko-f3cAMIw@wEhxPD1)m;F diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index d8b6bd1..1883a45 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -89,10 +89,14 @@ .hero-big__title__container, .hero-big__ingress__container { - margin: 1rem 0; + margin: .5rem 0; width: 100%; } + .hero-big__content-bottom { + margin-top: .5rem; + } + .hero-big__title { @include font-size(42px); padding: 0 1rem; @@ -100,11 +104,11 @@ line-height: normal; @include breakpoint($small) { - @include font-size(65px); + @include font-size(55px); } @include breakpoint($medium) { - @include font-size(80px); + @include font-size(70px); } } From 2a26cc81cb1ba1d87e228e1b7d224bb99163ca12 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Tue, 14 May 2019 10:13:38 +0300 Subject: [PATCH 26/45] More tweaks --- css/styles.css | 2 +- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 2c2d543..c45ded4 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4599,7 +4599,7 @@ dl, ol, ul { } .hero-big:not(.hero-big--centered) .hero-big__top { - margin-bottom: 1rem; + margin-bottom: .5rem; } .hero-big:not(.hero-big--centered) .hero-big__content { diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 9549c7d65845f39005fef4105349f27e761b7dba..ab851c21db1893dbb9947dc1e77baad6559159b8 100644 GIT binary patch delta 52 zcmeCU!`N|$ae@t#1H(kSJxo>0C;pix#o!RnZ}XLboB0I;5Zq*t`UImluVIYI0RZTl B5sLr- delta 52 zcmeCU!`N|$ae@ug3igS1dzi{TPy91YihV^qzs*+$Zsr#ZKyZ^mQUXSAUc(rZ0{{U| B5c>cC diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index 4dbf8aebcde5ddea5d05a5b8863fa153da0937a9..b0a84477b560f772b4c70fec2a1ff02d2b045318 100644 GIT binary patch delta 46 ucmaEGi}ArN#tA`8Rm&%aOp{`8i08NY%D~P1f&mC_GDv-b(VJNqV{!nJzYj0~ delta 46 ucmaEGi}ArN#tA`8WuGU8Op{_?5zlY)m4Tc21p^S=WRR4A(VJNqV{!nP#ttz6 diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 20ccca3627aeda01a2c6a71ab651edb7739495da..9b591ee240e5664a803729f8c38cf64cd3017480 100644 GIT binary patch delta 68 zcmV-K0K5O7gaM$00g#6YGXMYpHWl4^r?HU#Iw%c}cz&C&4BX5wfFcYx8KgeJ=>Na} ae`h(&{2a*TU|<4?0sur&4H>hyJ81^Qha6b| delta 68 zcmV-K0K5O7gaM$00g#6YG5`PoHWl4=^RbZsIw<{ucz&C&4BX5wfFcYx86+iO^#9-g azq1@>eh%bvFff5c0WYBo(g3r!J81^mY#gTm diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 1883a45..cb9f804 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -76,7 +76,7 @@ } .hero-big__top { - margin-bottom: 1rem; + margin-bottom: .5rem; } .hero-big__content { From a7e62d2b5104cdabd679f5fafc29aae4601f5566 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Tue, 14 May 2019 10:16:44 +0300 Subject: [PATCH 27/45] Small margin tweak --- css/styles.css | 25 ++----------------------- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 3 ++- 5 files changed, 4 insertions(+), 24 deletions(-) diff --git a/css/styles.css b/css/styles.css index c45ded4..561b0a1 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1477,28 +1477,6 @@ th { content: ""; } -.icon--wrench:after { - display: inline-block; - font-family: "hy-icons"; - font-style: normal; - font-weight: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - vertical-align: bottom; - content: ""; -} - -.icon--youtube:after { - display: inline-block; - font-family: "hy-icons"; - font-style: normal; - font-weight: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - vertical-align: bottom; - content: ""; -} - .icon--link-arrow-down:after { display: inline-block; font-family: "hy-icons"; @@ -4599,7 +4577,7 @@ dl, ol, ul { } .hero-big:not(.hero-big--centered) .hero-big__top { - margin-bottom: .5rem; + margin-bottom: 1rem; } .hero-big:not(.hero-big--centered) .hero-big__content { @@ -4648,6 +4626,7 @@ dl, ol, ul { font-size: 1.125rem; line-height: 2.14rem; padding: .25rem 1rem; + margin-bottom: .5rem; } .hero-big:not(.hero-big--centered) .hero-big__title, diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index ab851c21db1893dbb9947dc1e77baad6559159b8..8f2862faf63077d0b3b09a08b19b22a44299dac8 100644 GIT binary patch delta 54 zcmeCU!`N|$ae@u=hd)^p?RPWP_)q*ZRXXd>hj@OQuMFJGFBpK}CWG`b7`=H7V@wVJ Df*=(P delta 54 zcmeCU!`N|$ae@uA14H&i``t`c%P0PsDxJ;X5YKP(m4Tc21p^S=WRUs{`2_hG2BSB#FvjEn0LpC;ng9R* delta 47 vcmaEGi}ArN#tA`8Rm&%aOqI@NaERx(`O3h}{DJ`pZZb%Hg3+5<7-Mn(r!Nni diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 9b591ee240e5664a803729f8c38cf64cd3017480..55a788a7b97aa8337612d5eae387fbed88ed8711 100644 GIT binary patch delta 61 zcmV-D0K)&EgaM$00g#RYd{42E|2im@9r64&Um3WWUjRiIZZb$8gVFzg|NqW%nE5%7 T%fY||5(NNRc@1x~w>xPDTB#ds delta 61 zcmV-D0K)&EgaM$00g#RYdZ)3F|2ilQj(C2XuMFJGFMuKpHyNZp!RY_L|9@vW%={e4 TxPDV;36! diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index cb9f804..877cbab 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -76,7 +76,7 @@ } .hero-big__top { - margin-bottom: .5rem; + margin-bottom: 1rem; } .hero-big__content { @@ -116,6 +116,7 @@ @include font-size(18px); line-height: 2.14rem; padding: .25rem 1rem; + margin-bottom: .5rem; } /* .hero-big__play { From 0a11dabe355a1957684f905fddc7a675990a8e94 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Tue, 14 May 2019 10:22:15 +0300 Subject: [PATCH 28/45] Margin tweak --- css/styles.css | 31 +++++++++++++++++++++++++++++-- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 6 ++++-- 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/css/styles.css b/css/styles.css index 561b0a1..375d5e7 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1477,6 +1477,28 @@ th { content: ""; } +.icon--wrench:after { + display: inline-block; + font-family: "hy-icons"; + font-style: normal; + font-weight: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + vertical-align: bottom; + content: ""; +} + +.icon--youtube:after { + display: inline-block; + font-family: "hy-icons"; + font-style: normal; + font-weight: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + vertical-align: bottom; + content: ""; +} + .icon--link-arrow-down:after { display: inline-block; font-family: "hy-icons"; @@ -4595,10 +4617,16 @@ dl, ol, ul { .hero-big:not(.hero-big--centered) .hero-big__title__container, .hero-big:not(.hero-big--centered) .hero-big__ingress__container { - margin: .5rem 0; width: 100%; } +@media (min-width: 48em) { + .hero-big:not(.hero-big--centered) .hero-big__title__container, + .hero-big:not(.hero-big--centered) .hero-big__ingress__container { + margin: .5rem; + } +} + .hero-big:not(.hero-big--centered) .hero-big__content-bottom { margin-top: .5rem; } @@ -4626,7 +4654,6 @@ dl, ol, ul { font-size: 1.125rem; line-height: 2.14rem; padding: .25rem 1rem; - margin-bottom: .5rem; } .hero-big:not(.hero-big--centered) .hero-big__title, diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 8f2862faf63077d0b3b09a08b19b22a44299dac8..96d8e015611cedbdcdc5bb180fbab79044339d35 100644 GIT binary patch delta 52 zcmeCU!`N|$ae@ugjqelf_Au4mp7>{))b|_l{5D@1xS3xt0KrWLSsoa@c@1Ms4ggS| B6B_^k delta 52 zcmeCU!`N|$ae@ughd&eT_Au4>Py91Y>d%LGew(ih+{`Z+fZ!&B^f4H{c@1Ms4gga{ B6gL0> diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index fe5cbadc3213d109d789909428f951f4c0ffa9ce..fce2a01e4bfa17277ceae2e56ec276bd1548a44d 100644 GIT binary patch delta 46 vcmaEGi}ArN#tA`8b+;#mOq2S4Bc9*pD+4$43kD##$so%Eqc^iK#^eA1xTX&= delta 46 vcmaEGi}ArN#tA`8HU1Mrrb+$z5YKP(m4Tc21p^S=WRN}vqc^iK#^eA1wsR0L diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 55a788a7b97aa8337612d5eae387fbed88ed8711..dc2962897762f014fb0438d00f74a218c32d28e0 100644 GIT binary patch delta 61 zcmV-D0K)&EgaM$00g#RYe%rB-|2io71@ZhgUm3WWUjRiIZZgR7!07+K|9@vW%={e4 TxPDrEwjF delta 61 zcmV-D0K)&EgaM$00g#RYd{42E|2im@9r64&Um3WWUjRiIZZb$8gVFzg|NqW%nE5%7 T%fY||5(NNRc@1x~w>xPDTB#ds diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 877cbab..e22f803 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -89,8 +89,11 @@ .hero-big__title__container, .hero-big__ingress__container { - margin: .5rem 0; width: 100%; + + @include breakpoint($small) { + margin: .5rem; + } } .hero-big__content-bottom { @@ -116,7 +119,6 @@ @include font-size(18px); line-height: 2.14rem; padding: .25rem 1rem; - margin-bottom: .5rem; } /* .hero-big__play { From 27ef2f18ec26c7875dae3368911c8c7ad56c63d1 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Tue, 14 May 2019 10:48:20 +0300 Subject: [PATCH 29/45] Tweak ze margins --- css/styles.css | 21 ++------------------- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 13 +++---------- 5 files changed, 5 insertions(+), 29 deletions(-) diff --git a/css/styles.css b/css/styles.css index 375d5e7..68d6299 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4599,7 +4599,7 @@ dl, ol, ul { } .hero-big:not(.hero-big--centered) .hero-big__top { - margin-bottom: 1rem; + margin-bottom: .5rem; } .hero-big:not(.hero-big--centered) .hero-big__content { @@ -4617,20 +4617,10 @@ dl, ol, ul { .hero-big:not(.hero-big--centered) .hero-big__title__container, .hero-big:not(.hero-big--centered) .hero-big__ingress__container { + margin-bottom: 1rem; width: 100%; } -@media (min-width: 48em) { - .hero-big:not(.hero-big--centered) .hero-big__title__container, - .hero-big:not(.hero-big--centered) .hero-big__ingress__container { - margin: .5rem; - } -} - -.hero-big:not(.hero-big--centered) .hero-big__content-bottom { - margin-top: .5rem; -} - .hero-big:not(.hero-big--centered) .hero-big__title { font-size: 2.625rem; padding: 0 1rem; @@ -4664,13 +4654,6 @@ dl, ol, ul { display: inline; } -@media (min-width: 48em) { - .hero-big:not(.hero-big--centered) .hero-big__title, - .hero-big:not(.hero-big--centered) .hero-big__ingress { - margin-bottom: 1rem; - } -} - .hero-big__video__controls { bottom: 0; position: absolute; diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 96d8e015611cedbdcdc5bb180fbab79044339d35..c5f14d6f059ec6339820c84bdd7b6c1420b38710 100644 GIT binary patch delta 52 zcmeCU!`N|$ae@s~%>9XWdziW{))b|_l{5D@1xS3xt0KrWLSsoa@c@1Ms4ggS| B6B_^k diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index fce2a01e4bfa17277ceae2e56ec276bd1548a44d..2a77a89f6074387171a542b16802e1d2e20bb6db 100644 GIT binary patch delta 46 ucmaEGi}ArN#tA`8-I5bSrb*q8iRZWZ%D~P1f&mC_GAL`q=*=vQF*yK`zYa10 delta 46 vcmaEGi}ArN#tA`8b+;#mOq2S4Bc9*pD+4$43kD##$so%Eqc^iK#^eA1xTX&= diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index dc2962897762f014fb0438d00f74a218c32d28e0..1e2ee6a062c190cf2557f2fdf0261d1426689b04 100644 GIT binary patch delta 68 zcmV-K0K5O7gaM$00g#6YG5`PoHWl5A8L^Q6Iw*FPcz&C&4BX5wfFcYx8I-kQ^#9-g azq1@>eh%bvFff5c0U<{Vm;kf4J81^D3meS< delta 68 zcmV-K0K5O7gaM$00g#6YGXMYpHWl4|+p&=UIw<)C@%%Pl8Mv8W07V#XGRX44=>Na} ae`h(&{2a*TU|<4?0su3K3*xi4J81?6@E+g* diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index e22f803..eeba005 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -76,7 +76,7 @@ } .hero-big__top { - margin-bottom: 1rem; + margin-bottom: .5rem; } .hero-big__content { @@ -89,15 +89,8 @@ .hero-big__title__container, .hero-big__ingress__container { + margin-bottom: 1rem; width: 100%; - - @include breakpoint($small) { - margin: .5rem; - } - } - - .hero-big__content-bottom { - margin-top: .5rem; } .hero-big__title { @@ -134,7 +127,7 @@ display: inline; @include breakpoint($small) { - margin-bottom: 1rem; + //margin-bottom: .5rem; } } } From 5cb44b30d6e3137eaaa6b79821e823e0ed82bd61 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Tue, 14 May 2019 10:52:41 +0300 Subject: [PATCH 30/45] Uncomment --- css/styles.css | 7 +++++++ fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 2 +- 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/css/styles.css b/css/styles.css index 68d6299..349cefa 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4654,6 +4654,13 @@ dl, ol, ul { display: inline; } +@media (min-width: 48em) { + .hero-big:not(.hero-big--centered) .hero-big__title, + .hero-big:not(.hero-big--centered) .hero-big__ingress { + margin-bottom: 0; + } +} + .hero-big__video__controls { bottom: 0; position: absolute; diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index c5f14d6f059ec6339820c84bdd7b6c1420b38710..d4b558521334766a7c478442beacb9bafc1e6525 100644 GIT binary patch delta 52 zcmeCU!`N|$ae@ugirW+I_AvE)p7>{))a@1V{5D@1xS3xt0KrWL6$u!9XWdziWwW_}Lj SaxgG~L;)%x3%s+oJ8A}C;2Pfm delta 60 zcmV-C0K@;FgaM$00g#RYiy5(y|2ijjm3V%euMFJGFMuKpHyM<*Vf6ps|G%>wW_}Lj SaxgG~L;)d33z)OEJ8A|!NE&hg diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index eeba005..e66b109 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -127,7 +127,7 @@ display: inline; @include breakpoint($small) { - //margin-bottom: .5rem; + margin-bottom: 0; } } } From 0ee5e280de0fa03ab936d388c1269d4c5ade4c62 Mon Sep 17 00:00:00 2001 From: Jukka Purma Date: Tue, 14 May 2019 15:48:00 +0300 Subject: [PATCH 31/45] Fix footer title style --- templates/15_2_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/15_2_footer.html b/templates/15_2_footer.html index ea1e3bf..8ba6b7c 100644 --- a/templates/15_2_footer.html +++ b/templates/15_2_footer.html @@ -6,7 +6,7 @@
-

Hel­sin­gin yli­opis­to

+
Hel­sin­gin yli­opis­to

PL 3 (Fabianinkatu 33)
00014 Helsingin yliopisto

Puhelinvaihde: 02941 911

From 2425831db34dc1f183f834c964d48ba7d590cd3d Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Wed, 15 May 2019 09:43:15 +0300 Subject: [PATCH 32/45] Adjust font-size of hero title --- css/styles.css | 15 ++------------- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 6 ++++-- 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/css/styles.css b/css/styles.css index 349cefa..93b9a23 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1488,17 +1488,6 @@ th { content: ""; } -.icon--youtube:after { - display: inline-block; - font-family: "hy-icons"; - font-style: normal; - font-weight: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - vertical-align: bottom; - content: ""; -} - .icon--link-arrow-down:after { display: inline-block; font-family: "hy-icons"; @@ -4630,13 +4619,13 @@ dl, ol, ul { @media (min-width: 48em) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 3.4375rem; + font-size: 3.125rem; } } @media (min-width: 62.5em) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 4.375rem; + font-size: 3.75rem; } } diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index d4b558521334766a7c478442beacb9bafc1e6525..78b862733b661a894ce93b693a0f4cc8359262fe 100644 GIT binary patch delta 55 zcmeCU!`N|$ae@tV!L`(h_PdxL@b^#rGgUhET0uO&%~u9)<`)b=aFa1L4MuNX!x)nT E0C4^kKL7v# delta 55 zcmeCU!`N|$ae@u=irZNe?RPQX?fE?M&s6EG+biPvZN4&aGrwQ}f}0E~5-@u68pfC$ E0GVABfdBvi diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index f0b80e9fa949fe6ee81b7a8a85f2b75913640726..17cdd2814468b4664beab6be322c1fca83abae8e 100644 GIT binary patch delta 48 wcmaEGi}ArN#tDJU5BU2hhD?=Cy;cyxPD@kbra delta 69 zcmV-L0J{I6gaM$00g#6YG5`PoHWl5B^RbZrIw?%%f_Q$LuMFJGFMuKpHyKnUVD$gr b|G%>wW_}LjaxgG~L;)%x3%mfcw>xPD@thon diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index e66b109..3522896 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -100,11 +100,13 @@ line-height: normal; @include breakpoint($small) { - @include font-size(55px); + @include font-size(50px); } @include breakpoint($medium) { - @include font-size(70px); + @include font-size(60px); + // Test out scaling font-size based on widths. + //font-size: calc( 16px + (44 - 16) * (100vw - 400px) / (1000 - 400)); } } From 2c9850642e62e2511abc35cefd51abdb13c876ba Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Wed, 15 May 2019 09:54:00 +0300 Subject: [PATCH 33/45] Compiled fonts back --- css/styles.css | 11 +++++++++++ fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes 4 files changed, 11 insertions(+) diff --git a/css/styles.css b/css/styles.css index 93b9a23..b50b85c 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1488,6 +1488,17 @@ th { content: ""; } +.icon--youtube:after { + display: inline-block; + font-family: "hy-icons"; + font-style: normal; + font-weight: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + vertical-align: bottom; + content: ""; +} + .icon--link-arrow-down:after { display: inline-block; font-family: "hy-icons"; diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 78b862733b661a894ce93b693a0f4cc8359262fe..635a1110ac478659fd77f5013a1cb1d7d218dafd 100644 GIT binary patch delta 52 zcmeCU!`N|$ae@ugiSrZf_Am)Op7>{))cF(f{5D@1xS3xt0KrYhbO9K>c@1Ms4gfgr B66F8@ delta 52 zcmeCU!`N|$ae@s~!L^BYdzkq9C;pixb*&(t-{va=H}eYyAh^kxng*jcuVIYI0RS8# B5|jV{ diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index 17cdd2814468b4664beab6be322c1fca83abae8e..892936c319583c03f0b3c79309205b9ba52c39af 100644 GIT binary patch delta 46 vcmaEGi}ArN#tA`8LXRhgOp`i)BA(yoD+4$43kD##$(Swxqc^iK#^eA1sx}WZ delta 46 ucmaEGi}ArN#tA`8{QVO{rb%5Zi08NY%D~P1f&mC_GNz`%=*=vQF*yL63=cB^ diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 92f832865245002dc7e3a79987211efc95bec78d..07b15753640fea2e5d1eca1dc9f88f008d1a3d10 100644 GIT binary patch delta 61 zcmV-D0K)&EgaM$00g#RY663Lu|2in|6XN-8zA|t#zW|Cb++<7_fYJYd|NqW%nE5%7 T%fY||5(NNbwGBeEw>xPDowOZ9 delta 61 zcmV-D0K)&EgaM$00g#RY509~s|2imt7V-QxUm3WWUjRiIZZf8(!RY_L|9@vW%={e4 TxPDUO5|! From 1e7e56f4f3fe12c430abd7d5628402930d0400b1 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Thu, 16 May 2019 11:43:05 +0300 Subject: [PATCH 34/45] Trying out fluid type mixin for fontsize to begin with --- css/styles.css | 25 +++++++++---------------- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 12 +----------- sass/mixins/_typography.scss | 31 +++++++++++++++++++++++++++++++ 6 files changed, 41 insertions(+), 27 deletions(-) diff --git a/css/styles.css b/css/styles.css index b50b85c..4655ee1 100644 --- a/css/styles.css +++ b/css/styles.css @@ -464,6 +464,10 @@ th { /** * Mixin for subtitle thin */ +/** + * Mixin for fluid type. + * Example usage: @include fluid-type(font-size, 320px, 1600px, 32px, 80px); + */ /* section: 2 title: Icons @@ -1488,17 +1492,6 @@ th { content: ""; } -.icon--youtube:after { - display: inline-block; - font-family: "hy-icons"; - font-style: normal; - font-weight: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - vertical-align: bottom; - content: ""; -} - .icon--link-arrow-down:after { display: inline-block; font-family: "hy-icons"; @@ -4622,21 +4615,21 @@ dl, ol, ul { } .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 2.625rem; + font-size: 42px; padding: 0 1rem; max-width: 100%; line-height: normal; } -@media (min-width: 48em) { +@media (min-width: 360px) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 3.125rem; + font-size: calc(42px + 26 * (100vw - 360px) / 1240); } } -@media (min-width: 62.5em) { +@media (min-width: 1600px) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 3.75rem; + font-size: 68px; } } diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 635a1110ac478659fd77f5013a1cb1d7d218dafd..bd031a3f2e74dc0a29f691e2c3b7d1cc1ea8fca1 100644 GIT binary patch delta 55 zcmeCU!`N|$ae@u=7KMa~_PdxLy~>^VXR369!j^b`o39Mq%r6*#;3m_ht1x==8pfC$ E0DH0(#sB~S delta 55 zcmeCU!`N|$ae@u=iSwxw?RPOh5PCfE&s6Eu^C#l@ZN4&aGrwQ}f}4!#0x){>8pfC$ E0FM+DkN^Mx diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index 892936c319583c03f0b3c79309205b9ba52c39af..b9ce335b96a545e1ad4512e2bae591b61c90e0fb 100644 GIT binary patch delta 48 xcmaEGi}ArN#tDJUk6z_Y44EpOps*#L-{va=H}eYyAh^kN=_-ug%)%Ix0|4|15_SLp delta 48 xcmaEGi}ArN#tDJU4}>0144EpOdj3Q_zs*+$Zsr#ZKyZ^WT>wUJW?_uU0RZGQ5O@Fp diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 07b15753640fea2e5d1eca1dc9f88f008d1a3d10..f9acd2a5ba9586840b8edd5bb3e7e4a5bd353bb7 100644 GIT binary patch delta 63 zcmV-F0KosCgaM$00g#OY;_7X&kp4O;IFFimew(ih+{`b4A`CZ~E?tGu|9}7g&T^Rf VIgrc2zyuNn0C@}!+_SekX$IW^9w`6- delta 63 zcmV-F0KosCgaM$00g#OY;1c7pkp4O; Date: Thu, 16 May 2019 12:03:10 +0300 Subject: [PATCH 35/45] adjusted mobile title fontsize --- css/styles.css | 4 ++-- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/css/styles.css b/css/styles.css index 4655ee1..5da5de7 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4615,7 +4615,7 @@ dl, ol, ul { } .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: 42px; + font-size: 32px; padding: 0 1rem; max-width: 100%; line-height: normal; @@ -4623,7 +4623,7 @@ dl, ol, ul { @media (min-width: 360px) { .hero-big:not(.hero-big--centered) .hero-big__title { - font-size: calc(42px + 26 * (100vw - 360px) / 1240); + font-size: calc(32px + 36 * (100vw - 360px) / 1240); } } diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index bd031a3f2e74dc0a29f691e2c3b7d1cc1ea8fca1..22b9fcc619f83b0b6ed4dfab82fdf9fd656a441a 100644 GIT binary patch delta 52 zcmeCU!`N|$ae@ug65fe+dze0do%m;(6z`IFew(ih+{`Z+fZ!(6^_ehw^BTsO8~`rS B6aWAK delta 52 zcmeCU!`N|$ae@ug7KMp+dzfD3PW&@XN?}Vpzs*+$Zsr#ZKyZ`k(p4C}c@1Ms4ge^j B6e9ot diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index b9ce335b96a545e1ad4512e2bae591b61c90e0fb..e69dc7e7769b1024c7bb5458dbb4475aebe228da 100644 GIT binary patch delta 46 vcmaEGi}ArN#tA`8pTABFnI^@%B%a^qD+4$43kD##$#i`tjNZ(`7?T44#rY95 delta 46 vcmaEGi}ArN#tA`8uW~1bOp{XB63=h*m4Tc21p^S=WV&<}MsH?ejL882x%&|` diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index f9acd2a5ba9586840b8edd5bb3e7e4a5bd353bb7..480bab56897369869c8667dc6c12b1496dda379f 100644 GIT binary patch delta 61 zcmV-D0K)&EgaM$00g#RY^YyWi|2insoOphluMFJGFMuKpH<_-_gwg+h|NqW%nE5%7 T%fY||5(NNhKn_c@w>xPD+bJGu delta 61 zcmV-D0K)&EgaM$00g#RY>TR)*|2im-ns|PjuMFJGFMuKpH<>P7h0*_i|NqW%nE5%7 T%fY||5(NNx3=Z70w>xPDn0Xx! diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 95dbcf7..0a873b1 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -94,7 +94,7 @@ } .hero-big__title { - @include fluid-type(font-size, 360px, 1600px, 42px, 68px); + @include fluid-type(font-size, 360px, 1600px, 32px, 68px); padding: 0 1rem; max-width: 100%; line-height: normal; From 6a39a79385ed4097496b6e822caf0c3cf3a500fa Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 17 May 2019 12:05:13 +0300 Subject: [PATCH 36/45] Fix opacity on hero --- css/styles.css | 12 ++++++++++++ fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 1 + 5 files changed, 13 insertions(+) diff --git a/css/styles.css b/css/styles.css index 5da5de7..51c2dfd 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1492,6 +1492,17 @@ th { content: ""; } +.icon--youtube:after { + display: inline-block; + font-family: "hy-icons"; + font-style: normal; + font-weight: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + vertical-align: bottom; + content: ""; +} + .icon--link-arrow-down:after { display: inline-block; font-family: "hy-icons"; @@ -4588,6 +4599,7 @@ dl, ol, ul { .hero-big:not(.hero-big--centered):after { background: linear-gradient(rgba(34, 34, 34, 0.9), rgba(34, 34, 34, 0)); + opacity: unset; margin-bottom: 40px; } diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 22b9fcc619f83b0b6ed4dfab82fdf9fd656a441a..2ebbbc6bdd5b3dd8893170dc8fe21d7fa244e891 100644 GIT binary patch delta 55 zcmeCU!`N|$ae@tV$I+;X_Pdy$&S0MSXR376(T;e2o39Mq%r6*#;3kXa0vNq{4P#6W E0B} Date: Fri, 17 May 2019 16:18:53 +0300 Subject: [PATCH 37/45] Test out hero text overlay wizardry --- css/styles.css | 108 ++++++++++++++++++++++++--------- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 78 +++++++++++++++++++----- templates/16_1_2-hero-big.html | 10 +++ 6 files changed, 153 insertions(+), 43 deletions(-) diff --git a/css/styles.css b/css/styles.css index 51c2dfd..8b5fa62 100644 --- a/css/styles.css +++ b/css/styles.css @@ -3210,7 +3210,7 @@ img { title: Headings template: 3_1_headings */ -h1, h2, h3, h4, legend, .logo-block__content .logo-block__sitename, h5, h6 { +h1, h2, .hero-big__title__container .hero-big__overlay, h3, h4, legend, .logo-block__content .logo-block__sitename, h5, h6 { font-family: 'Open Sans', Helvetica, Arial, sans-serif; color: #222; letter-spacing: -0.05em; @@ -3220,12 +3220,12 @@ h1, h2, h3, h4, legend, .logo-block__content .logo-block__sitename, h5, h6 { word-wrap: break-word; } -h1 a, h2 a, h3 a, h4 a, legend a, .logo-block__content .logo-block__sitename a, h5 a, h6 a { +h1 a, h2 a, .hero-big__title__container .hero-big__overlay a, h3 a, h4 a, legend a, .logo-block__content .logo-block__sitename a, h5 a, h6 a { color: inherit; text-decoration: none; } -h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, legend a:hover, .logo-block__content .logo-block__sitename a:hover, h5 a:hover, h6 a:hover { +h1 a:hover, h2 a:hover, .hero-big__title__container .hero-big__overlay a:hover, h3 a:hover, h4 a:hover, legend a:hover, .logo-block__content .logo-block__sitename a:hover, h5 a:hover, h6 a:hover { color: inherit; cursor: pointer; } @@ -3243,13 +3243,13 @@ h1 { } } -h2 { +h2, .hero-big__title__container .hero-big__overlay { font-size: 2.5rem; text-transform: uppercase; } @media (max-width: 48em) { - h2 { + h2, .hero-big__title__container .hero-big__overlay { font-size: 2.28571rem; } } @@ -4597,6 +4597,12 @@ dl, ol, ul { } */ } +@media (min-width: 48em) { + .hero-big:not(.hero-big--centered) { + min-height: 400px; + } +} + .hero-big:not(.hero-big--centered):after { background: linear-gradient(rgba(34, 34, 34, 0.9), rgba(34, 34, 34, 0)); opacity: unset; @@ -4620,48 +4626,68 @@ dl, ol, ul { flex-wrap: wrap; } -.hero-big:not(.hero-big--centered) .hero-big__title__container, +.hero-big:not(.hero-big--centered) .hero-big__title__container { + position: relative; + margin-bottom: 2rem; + width: 100%; +} + .hero-big:not(.hero-big--centered) .hero-big__ingress__container { + position: relative; margin-bottom: 1rem; width: 100%; } -.hero-big:not(.hero-big--centered) .hero-big__title { +@media (min-width: 48em) { + .hero-big:not(.hero-big--centered) .hero-big__ingress__container { + margin-bottom: 0; + } +} + +.hero-big:not(.hero-big--centered) .hero-big__title, .hero-big:not(.hero-big--centered) .hero-big__title__container .hero-big__overlay, .hero-big__title__container .hero-big:not(.hero-big--centered) .hero-big__overlay { font-size: 32px; - padding: 0 1rem; + -webkit-box-decoration-break: clone; + box-decoration-break: clone; + display: inline; + line-height: 1; max-width: 100%; - line-height: normal; + margin-bottom: 1rem; + padding: 0 1rem; + position: relative; + z-index: 1; } @media (min-width: 360px) { - .hero-big:not(.hero-big--centered) .hero-big__title { + .hero-big:not(.hero-big--centered) .hero-big__title, .hero-big:not(.hero-big--centered) .hero-big__title__container .hero-big__overlay, .hero-big__title__container .hero-big:not(.hero-big--centered) .hero-big__overlay { font-size: calc(32px + 36 * (100vw - 360px) / 1240); } } @media (min-width: 1600px) { - .hero-big:not(.hero-big--centered) .hero-big__title { + .hero-big:not(.hero-big--centered) .hero-big__title, .hero-big:not(.hero-big--centered) .hero-big__title__container .hero-big__overlay, .hero-big__title__container .hero-big:not(.hero-big--centered) .hero-big__overlay { font-size: 68px; } } -.hero-big:not(.hero-big--centered) .hero-big__ingress { - font-size: 1.125rem; - line-height: 2.14rem; - padding: .25rem 1rem; +@media (min-width: 48em) { + .hero-big:not(.hero-big--centered) .hero-big__title, .hero-big:not(.hero-big--centered) .hero-big__title__container .hero-big__overlay, .hero-big__title__container .hero-big:not(.hero-big--centered) .hero-big__overlay { + margin-bottom: 0; + } } -.hero-big:not(.hero-big--centered) .hero-big__title, -.hero-big:not(.hero-big--centered) .hero-big__ingress { - background-color: rgba(34, 34, 34, 0.7); +.hero-big:not(.hero-big--centered) .hero-big__ingress, .hero-big:not(.hero-big--centered) .hero-big__ingress__container .hero-big__overlay, .hero-big__ingress__container .hero-big:not(.hero-big--centered) .hero-big__overlay { + font-size: 1.125rem; -webkit-box-decoration-break: clone; box-decoration-break: clone; display: inline; + line-height: 2.1rem; + padding: .25rem 1rem; + position: relative; + z-index: 1; } @media (min-width: 48em) { - .hero-big:not(.hero-big--centered) .hero-big__title, - .hero-big:not(.hero-big--centered) .hero-big__ingress { + .hero-big:not(.hero-big--centered) .hero-big__ingress, .hero-big:not(.hero-big--centered) .hero-big__ingress__container .hero-big__overlay, .hero-big__ingress__container .hero-big:not(.hero-big--centered) .hero-big__overlay { margin-bottom: 0; } } @@ -4710,7 +4736,7 @@ dl, ol, ul { max-width: 50em; } -.hero-big__title { +.hero-big__title, .hero-big__title__container .hero-big__overlay { font-size: 2.625rem; color: #FFF; font-weight: 700; @@ -4720,13 +4746,13 @@ dl, ol, ul { } @media (min-width: 48em) { - .hero-big__title { + .hero-big__title, .hero-big__title__container .hero-big__overlay { font-size: 5rem; margin-bottom: 30px; } } -.hero-big__ingress { +.hero-big__ingress, .hero-big__ingress__container .hero-big__overlay { font-size: 1.125rem; font-weight: 600; font-style: normal; @@ -4735,7 +4761,7 @@ dl, ol, ul { } @media (min-width: 48em) { - .hero-big__ingress { + .hero-big__ingress, .hero-big__ingress__container .hero-big__overlay { margin-bottom: 30px; } } @@ -4857,14 +4883,14 @@ dl, ol, ul { } } -.hero-big--centered .hero-big__title { +.hero-big--centered .hero-big__title, .hero-big--centered .hero-big__title__container .hero-big__overlay, .hero-big__title__container .hero-big--centered .hero-big__overlay { font-size: 2.25rem; margin: 0; padding: 0; } @media (min-width: 48em) { - .hero-big--centered .hero-big__title { + .hero-big--centered .hero-big__title, .hero-big--centered .hero-big__title__container .hero-big__overlay, .hero-big__title__container .hero-big--centered .hero-big__overlay { font-size: 4.375rem; } } @@ -5039,6 +5065,28 @@ dl, ol, ul { } } +/* +* Hero-big overlay wizardry. +*/ +.hero-big__overlay--container { + left: 0; + opacity: 0.7; + position: absolute; + top: 0; +} + +.hero-big__title__container .hero-big__overlay { + background: #222; + color: transparent !important; + line-height: 1; +} + +.hero-big__ingress__container .hero-big__overlay { + background: #222; + color: transparent !important; + line-height: 1; +} + /* section: 19.1 title: Highlight @@ -8145,9 +8193,11 @@ input[type="text"].search-form-large__input { position: absolute; } -.textarea h1, .textarea h2, .textarea h3, .textarea h4, .textarea legend, .textarea .logo-block__content .logo-block__sitename, .logo-block__content .textarea .logo-block__sitename, .textarea h5, .textarea h6, +.textarea h1, .textarea h2, .textarea .hero-big__title__container .hero-big__overlay, .hero-big__title__container .textarea .hero-big__overlay, .textarea h3, .textarea h4, .textarea legend, .textarea .logo-block__content .logo-block__sitename, .logo-block__content .textarea .logo-block__sitename, .textarea h5, .textarea h6, .textarea-ingress h1, .textarea-ingress h2, +.textarea-ingress .hero-big__title__container .hero-big__overlay, +.hero-big__title__container .textarea-ingress .hero-big__overlay, .textarea-ingress h3, .textarea-ingress h4, .textarea-ingress legend, @@ -8158,9 +8208,11 @@ input[type="text"].search-form-large__input { margin-top: 32px; } -.textarea h1:first-child, .textarea h2:first-child, .textarea h3:first-child, .textarea h4:first-child, .textarea legend:first-child, .textarea .logo-block__content .logo-block__sitename:first-child, .logo-block__content .textarea .logo-block__sitename:first-child, .textarea h5:first-child, .textarea h6:first-child, +.textarea h1:first-child, .textarea h2:first-child, .textarea .hero-big__title__container .hero-big__overlay:first-child, .hero-big__title__container .textarea .hero-big__overlay:first-child, .textarea h3:first-child, .textarea h4:first-child, .textarea legend:first-child, .textarea .logo-block__content .logo-block__sitename:first-child, .logo-block__content .textarea .logo-block__sitename:first-child, .textarea h5:first-child, .textarea h6:first-child, .textarea-ingress h1:first-child, .textarea-ingress h2:first-child, +.textarea-ingress .hero-big__title__container .hero-big__overlay:first-child, +.hero-big__title__container .textarea-ingress .hero-big__overlay:first-child, .textarea-ingress h3:first-child, .textarea-ingress h4:first-child, .textarea-ingress legend:first-child, diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 2ebbbc6bdd5b3dd8893170dc8fe21d7fa244e891..0c3676ade375181c2036a3ef6a37c7c4cd169d92 100644 GIT binary patch delta 55 zcmeCU!`N|$ae@u=gX@tK?RPOhks1jZN4&aGrwQ}f}1R Ole yksi* parhaista +
+
+ Ole yksi* parhaista +
+
* Kuulumme maailman tutkimusyliopistojen parhaan 1% joukkoon
+
+
+ * Kuulumme maailman tutkimusyliopistojen parhaan 1% joukkoon +
+
From 36b17b46f59996ebdb2763729f09fd03a9dec4b2 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 17 May 2019 16:29:37 +0300 Subject: [PATCH 38/45] Margin adjustment --- css/styles.css | 6 ------ fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 4 ---- 5 files changed, 10 deletions(-) diff --git a/css/styles.css b/css/styles.css index 8b5fa62..e296468 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4638,12 +4638,6 @@ dl, ol, ul { width: 100%; } -@media (min-width: 48em) { - .hero-big:not(.hero-big--centered) .hero-big__ingress__container { - margin-bottom: 0; - } -} - .hero-big:not(.hero-big--centered) .hero-big__title, .hero-big:not(.hero-big--centered) .hero-big__title__container .hero-big__overlay, .hero-big__title__container .hero-big:not(.hero-big--centered) .hero-big__overlay { font-size: 32px; -webkit-box-decoration-break: clone; diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 0c3676ade375181c2036a3ef6a37c7c4cd169d92..6e21409ca31a04886cb1c6ed904916c3b526524d 100644 GIT binary patch delta 52 zcmeCU!`N|$ae@ughqDvy_Am*bpZI5*)Y%X5{5D@1xS3xt0KrX`^fnm1c@1Ms4ggA- B6c7La delta 52 zcmeCU!`N|$ae@uggXxPDp(h=t delta 61 zcmV-D0K)&EgaM$00g#RY4%e}e|2ioDE8_WWzA|t#zW|Cb++<1Rg3xPDv}+xt diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index cf0109b..e91255f 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -102,10 +102,6 @@ position: relative; margin-bottom: 1rem; width: 100%; - - @include breakpoint($small) { - margin-bottom: 0; - } } .hero-big__title { From 48aa21f52a437e0510de010916c1feb2595a03b9 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 17 May 2019 16:48:00 +0300 Subject: [PATCH 39/45] Extend h1 instead of h2 and hacky fix on drupal side then --- css/styles.css | 24 ++++++++++++------------ fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/css/styles.css b/css/styles.css index e296468..4138ccb 100644 --- a/css/styles.css +++ b/css/styles.css @@ -128,7 +128,7 @@ dfn { * Address variable `h1` font-size and margin within `section` and `article` * contexts in Firefox 4+, Safari, and Chrome. */ -h1 { +h1, .hero-big__title__container .hero-big__overlay { font-size: 2em; margin: 0.67em 0; } @@ -3210,7 +3210,7 @@ img { title: Headings template: 3_1_headings */ -h1, h2, .hero-big__title__container .hero-big__overlay, h3, h4, legend, .logo-block__content .logo-block__sitename, h5, h6 { +h1, .hero-big__title__container .hero-big__overlay, h2, h3, h4, legend, .logo-block__content .logo-block__sitename, h5, h6 { font-family: 'Open Sans', Helvetica, Arial, sans-serif; color: #222; letter-spacing: -0.05em; @@ -3220,17 +3220,17 @@ h1, h2, .hero-big__title__container .hero-big__overlay, h3, h4, legend, .logo-bl word-wrap: break-word; } -h1 a, h2 a, .hero-big__title__container .hero-big__overlay a, h3 a, h4 a, legend a, .logo-block__content .logo-block__sitename a, h5 a, h6 a { +h1 a, .hero-big__title__container .hero-big__overlay a, h2 a, h3 a, h4 a, legend a, .logo-block__content .logo-block__sitename a, h5 a, h6 a { color: inherit; text-decoration: none; } -h1 a:hover, h2 a:hover, .hero-big__title__container .hero-big__overlay a:hover, h3 a:hover, h4 a:hover, legend a:hover, .logo-block__content .logo-block__sitename a:hover, h5 a:hover, h6 a:hover { +h1 a:hover, .hero-big__title__container .hero-big__overlay a:hover, h2 a:hover, h3 a:hover, h4 a:hover, legend a:hover, .logo-block__content .logo-block__sitename a:hover, h5 a:hover, h6 a:hover { color: inherit; cursor: pointer; } -h1 { +h1, .hero-big__title__container .hero-big__overlay { font-size: 3.125rem; letter-spacing: -2px; line-height: 1.15em; @@ -3238,18 +3238,18 @@ h1 { } @media (max-width: 48em) { - h1 { + h1, .hero-big__title__container .hero-big__overlay { font-size: 2.85714rem; } } -h2, .hero-big__title__container .hero-big__overlay { +h2 { font-size: 2.5rem; text-transform: uppercase; } @media (max-width: 48em) { - h2, .hero-big__title__container .hero-big__overlay { + h2 { font-size: 2.28571rem; } } @@ -8187,11 +8187,11 @@ input[type="text"].search-form-large__input { position: absolute; } -.textarea h1, .textarea h2, .textarea .hero-big__title__container .hero-big__overlay, .hero-big__title__container .textarea .hero-big__overlay, .textarea h3, .textarea h4, .textarea legend, .textarea .logo-block__content .logo-block__sitename, .logo-block__content .textarea .logo-block__sitename, .textarea h5, .textarea h6, +.textarea h1, .textarea .hero-big__title__container .hero-big__overlay, .hero-big__title__container .textarea .hero-big__overlay, .textarea h2, .textarea h3, .textarea h4, .textarea legend, .textarea .logo-block__content .logo-block__sitename, .logo-block__content .textarea .logo-block__sitename, .textarea h5, .textarea h6, .textarea-ingress h1, -.textarea-ingress h2, .textarea-ingress .hero-big__title__container .hero-big__overlay, .hero-big__title__container .textarea-ingress .hero-big__overlay, +.textarea-ingress h2, .textarea-ingress h3, .textarea-ingress h4, .textarea-ingress legend, @@ -8202,11 +8202,11 @@ input[type="text"].search-form-large__input { margin-top: 32px; } -.textarea h1:first-child, .textarea h2:first-child, .textarea .hero-big__title__container .hero-big__overlay:first-child, .hero-big__title__container .textarea .hero-big__overlay:first-child, .textarea h3:first-child, .textarea h4:first-child, .textarea legend:first-child, .textarea .logo-block__content .logo-block__sitename:first-child, .logo-block__content .textarea .logo-block__sitename:first-child, .textarea h5:first-child, .textarea h6:first-child, +.textarea h1:first-child, .textarea .hero-big__title__container .hero-big__overlay:first-child, .hero-big__title__container .textarea .hero-big__overlay:first-child, .textarea h2:first-child, .textarea h3:first-child, .textarea h4:first-child, .textarea legend:first-child, .textarea .logo-block__content .logo-block__sitename:first-child, .logo-block__content .textarea .logo-block__sitename:first-child, .textarea h5:first-child, .textarea h6:first-child, .textarea-ingress h1:first-child, -.textarea-ingress h2:first-child, .textarea-ingress .hero-big__title__container .hero-big__overlay:first-child, .hero-big__title__container .textarea-ingress .hero-big__overlay:first-child, +.textarea-ingress h2:first-child, .textarea-ingress h3:first-child, .textarea-ingress h4:first-child, .textarea-ingress legend:first-child, diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 6e21409ca31a04886cb1c6ed904916c3b526524d..b013ec83d6841f9fb390f3d3f825822e820ff0cc 100644 GIT binary patch delta 52 zcmeCU!`N|$ae@t#$Nq_Sdzhq^C;pixwcjJ2-{va=H}eYyAh^krZ2+S;uVIYI0RZ_t B5nKQO delta 52 zcmeCU!`N|$ae@ughqDvy_Am*bpZI5*)Y%X5{5D@1xS3xt0KrX`^fnm1c@1Ms4ggA- B6c7La diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index 5935f933b992c6a0d530f8f765b31d8efbbefa0b..9a8db84db334ee89c4491157a0ce0edb9fcbc414 100644 GIT binary patch delta 46 ucmaEGi}ArN#tA`8(#jJ!07+K|9@vW%={e4 TxPDRTLYr delta 61 zcmV-D0K)&EgaM$00g#RY6VI`b|2inIJL36mzA|t#zW|Cb++;~_gVFzg|NqW%nE5%7 T%fY||5(NN#!wycfw>xPDp(h=t diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index e91255f..37bc2d6 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -467,7 +467,7 @@ .hero-big__title__container { .hero-big__overlay { - @extend h2; + @extend h1; @extend .hero-big__title; background: $black; color: transparent !important; From e102efbb244def505c193df964dea0c67d6b93f3 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Mon, 20 May 2019 09:35:25 +0300 Subject: [PATCH 40/45] Lineheight tweak --- css/styles.css | 2 +- fonts/hy-icons.eot | Bin 28168 -> 28168 bytes fonts/hy-icons.ttf | Bin 28000 -> 28000 bytes fonts/hy-icons.woff | Bin 16928 -> 16928 bytes sass/components/_hero.scss | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 4138ccb..90287a3 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4674,7 +4674,7 @@ dl, ol, ul { -webkit-box-decoration-break: clone; box-decoration-break: clone; display: inline; - line-height: 2.1rem; + line-height: 2rem; padding: .25rem 1rem; position: relative; z-index: 1; diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index b013ec83d6841f9fb390f3d3f825822e820ff0cc..0680e45ed3b17b3ef128d09c61ceb9e48dd5963c 100644 GIT binary patch delta 55 zcmeCU!`N|$ae@u=i3ab9_PdzhS|v~XGgaEV;Y2*Y%~u9)<`)b=aFhMl1sJ_~4P#6W E0D*-TB>(^b delta 55 zcmeCU!`N|$ae@uA$NtEP_Pdy$Nh?qMGgUfrzeha3%~u9)<`)b=aFZq507h?K!x)nT E07_&M^#A|> diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf index 9a8db84db334ee89c4491157a0ce0edb9fcbc414..435665deaf830feab18a672b18381c3adcaa1b42 100644 GIT binary patch delta 48 xcmaEGi}ArN#tDJUZ>^FihD??AZa5LoZ}XLboB0I;5Zq+{bpb|iW?_uU0RZU$5_SLp delta 48 wcmaEGi}ArN#tDJU&!m+nhD?=?-0u<3Z}XLboB0I;5Zq+RHh|HaSr}t-0J~%lc>n+a diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 02d8ada5c9d250b3b452d878f8e3cbef5ea293de..03fe65906af07e27a887e13105844e3dcbef46ac 100644 GIT binary patch delta 64 zcmV-G0KfmBgaM$00g#OY?K)$zko`I;V$T&5;`wd9GH^4$0E#f&WdC&mM*si)|2xZJ W=I1~z2LlsG6abLR4~w(6J81^h2_0Pk delta 64 zcmV-G0KfmBgaM$00g#OY<{Kliko`I;;_&AJ@%%Pl8Mv8W07V#XvSb^;=>Na}e`h(& W{2a*TU|<4?0sv5N4D_?NJ81^%7#?T< diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 37bc2d6..463dceb 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -124,7 +124,7 @@ @include font-size(18px); box-decoration-break: clone; display: inline; - line-height: 2.1rem; + line-height: 2rem; padding: .25rem 1rem; position: relative; z-index: 1; From 916e4d8db15b8b52963f270083cfc6abaa7df513 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Mon, 27 May 2019 12:52:36 +0300 Subject: [PATCH 41/45] commit merge things --- css/styles.css | 6 +++--- fonts/hy-icons.eot | Bin 28396 -> 28396 bytes fonts/hy-icons.ttf | Bin 28228 -> 28228 bytes fonts/hy-icons.woff | Bin 17100 -> 17104 bytes .../dest/{uEA8A-pause.svg => uEA89-pause.svg} | 0 ...8B-play-arrow.svg => uEA8A-play-arrow.svg} | 0 ...89-headphones.svg => uEA8B-headphones.svg} | 0 icons/unicodes.json | 2 +- sass/icons/__icon_font.scss | 6 +++--- sass/icons/__variables.scss | 6 +++--- templates/2_1_icons.html | 3 --- 11 files changed, 10 insertions(+), 13 deletions(-) rename icons/dest/{uEA8A-pause.svg => uEA89-pause.svg} (100%) rename icons/dest/{uEA8B-play-arrow.svg => uEA8A-play-arrow.svg} (100%) rename icons/dest/{uEA89-headphones.svg => uEA8B-headphones.svg} (100%) diff --git a/css/styles.css b/css/styles.css index 6c82a78..60a5de9 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1939,7 +1939,7 @@ th { content: ""; } -.icon--headphones:after { +.icon--pause:after { display: inline-block; font-family: "hy-icons"; font-style: normal; @@ -1950,7 +1950,7 @@ th { content: ""; } -.icon--pause:after { +.icon--play-arrow:after { display: inline-block; font-family: "hy-icons"; font-style: normal; @@ -1961,7 +1961,7 @@ th { content: ""; } -.icon--play-arrow:after { +.icon--headphones:after { display: inline-block; font-family: "hy-icons"; font-style: normal; diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index 0ceb570e67ce0acff6ca09ff8bdc728453f18bdd..c4eaa278cb60bb3f282381eba79542f239722ec7 100644 GIT binary patch delta 146 zcmaEJm+{SA#tAko-7+_xOmx`6BF4bIb>bf#mgf7}CnoDK>acv+w`$eo7)BGBCpToe zDmiA4mp-H`lNn;AGL^)3Mv^z!w`n*)Z+M&Xtjxm{O3DpO;$9zyJV64K%C( delta 136 zcmX?dhw;cA#t8u|qT3kPPYlsvX%Wm3nAoDjBGCFXQ=bzA|t#zhD4@ z8*k#uVDx4d#$!xe|NntxKzQ>N<^!B8I(#~In`iLGhEMKHJu>-g%9PE%X*b#BxH3`` eQwlQj^HPgh3ld9x!RYAib-!y|W|DE2E{nVZFw`I0bklE;W-^x`Jrn^8@rFVyX_$r^T zd6O?hjs<1OUMVC5d!-}?8T7XO_V38gfkrQM-w+QaQOTqmnxn`feTeEhlc+$)sYrE& zLVvAF$CeieRZkQ#@%5=$1S{Mt_Or-6 e>;xF4o$Nj3u?4$w=FGkv^yEjQe*r(r;H3bC&5ePP0SKJVOyo(gpUl7zu|a~zJu4$MF@=G_Mgb^e48&%l+Zfkp z00n_!AwWJzT!rH=Ygk5ZNd-`>1jq-9Gcmlg`~NW~KN+O%1Oo#j69~5m<_P2_RunKW z*q#BZlLul2#-)t!@)C1XfnslfYP5iQ#XOD07Hbvc7XuBmmtbIE-ps(j`arI8(ay~r zj0#ruGIQGRZM*+Z_NV2A!>#Xb-&m-kHM8V%fk@;M{=mISLZTV-MOMc7tq9GuZ?f?h zZDRY9x-yLStKyeuz3cBeO!H*rUAb@ZJq4+Z*srVh@B6bcT`oHA`*jnUFLj4j2dZ!u zN?qdm#A5kJ%d+sZ{u}de?DN{5aHTlkFSVKVeYN<%PkZV`v#+na@h@N8=4G&=#*3}u zTWtKAPXV)yYI8hVdJ=1p`T;0^>xG$3} z{h#$-<=-o!tQ diff --git a/icons/dest/uEA8A-pause.svg b/icons/dest/uEA89-pause.svg similarity index 100% rename from icons/dest/uEA8A-pause.svg rename to icons/dest/uEA89-pause.svg diff --git a/icons/dest/uEA8B-play-arrow.svg b/icons/dest/uEA8A-play-arrow.svg similarity index 100% rename from icons/dest/uEA8B-play-arrow.svg rename to icons/dest/uEA8A-play-arrow.svg diff --git a/icons/dest/uEA89-headphones.svg b/icons/dest/uEA8B-headphones.svg similarity index 100% rename from icons/dest/uEA89-headphones.svg rename to icons/dest/uEA8B-headphones.svg diff --git a/icons/unicodes.json b/icons/unicodes.json index 95217ff..5ee6643 100644 --- a/icons/unicodes.json +++ b/icons/unicodes.json @@ -1 +1 @@ -{"add-to-todo-list.svg":"uEA01","arrow.svg":"uEA03","avatar-group.svg":"uEA04","avatar.svg":"uEA05","bachelor.svg":"uEA06","camera.svg":"uEA07","chat.svg":"uEA08","date.svg":"uEA09","discover.svg":"uEA0A","done.svg":"uEA0B","download.svg":"uEA0C","drag.svg":"uEA0D","drop-down.svg":"uEA0E","edit-event.svg":"uEA0F","edit.svg":"uEA10","events.svg":"uEA11","facebook.svg":"uEA12","favorites.svg":"uEA13","grid.svg":"uEA14","hamburger.svg":"uEA15","home.svg":"uEA16","hy-logo.svg":"uEA17","info-stroke.svg":"uEA18","info.svg":"uEA19","link-arrow-offsite.svg":"uEA1A","link-arrow.svg":"uEA1B","linkedin.svg":"uEA1C","list.svg":"uEA1D","location.svg":"uEA1E","log.svg":"uEA1F","logout.svg":"uEA20","magnify-minus.svg":"uEA21","magnify-plus.svg":"uEA22","master.svg":"uEA23","minus.svg":"uEA24","modify.svg":"uEA25","navi-triangle.svg":"uEA26","new-group.svg":"uEA27","new-person.svg":"uEA28","notification.svg":"uEA29","opinder-logo-new.svg":"uEA2A","pdf.svg":"uEA2B","people.svg":"uEA2C","person-outline.svg":"uEA2D","person.svg":"uEA2E","plus.svg":"uEA2F","profile.svg":"uEA30","question.svg":"uEA31","remove.svg":"uEA32","rotate-left.svg":"uEA33","rotate-right.svg":"uEA34","search.svg":"uEA35","time.svg":"uEA36","todo-list.svg":"uEA37","tour.svg":"uEA38","twitter.svg":"uEA39","units-and-faculties.svg":"uEA3A","video.svg":"uEA3B","warning.svg":"uEA3C","you-tube.svg":"uEA3D","id-number.svg":"uEA3E","mail.svg":"uEA3F","mobile.svg":"uEA40","opinder-logo.svg":"uEA41","permission-all.svg":"uEA42","permission-group.svg":"uEA43","permission-private.svg":"uEA44","phone.svg":"uEA45","preview.svg":"uEA46","url.svg":"uEA47","instagram.svg":"uEA48","login.svg":"uEA49","spinner.svg":"uEA4A","you-tuubi.svg":"uEA4B","bullet-list.svg":"uEA4C","contentlink.svg":"uEA4D","customlink.svg":"uEA4E","dragbutton.svg":"uEA4F","embed-new (1).svg":"uEA50","embed.svg":"uEA51","feed.svg":"uEA52","file-text.svg":"uEA53","helsinginyliopisto.svg":"uEA54","horizontal-resize.svg":"uEA55","image-gallery.svg":"uEA56","images.svg":"uEA57","leiki-list.svg":"uEA58","listoflinks.svg":"uEA59","play.svg":"uEA5A","wrench.svg":"uEA5B","youtube.svg":"uEA5D","link-arrow-down.svg":"uEA5E","link-arrow-left.svg":"uEA5F","link-arrow-up.svg":"uEA60","code-fork.svg":"uEA61","cogs.svg":"uEA62","external-link.svg":"uEA63","globe.svg":"uEA64","image.svg":"uEA65","arrow-down.svg":"uEA66","arrow-left.svg":"uEA67","arrow-right.svg":"uEA68","arrow-up.svg":"uEA69","arrow-offsite.svg":"uEA6C","caret-down.svg":"uEA6D","caret-left.svg":"uEA6E","caret-right.svg":"uEA71","caret-up.svg":"uEA70","list-as-blocks.svg":"uEA72","social-media.svg":"uEA73","dot.svg":"uEA74","google-plus.svg":"uEA75","share.svg":"uEA76","heart.svg":"uEA77","retweet.svg":"uEA78","square-checked.svg":"uEA79","square.svg":"uEA7A","eye-slash.svg":"uEA7B","full-screen.svg":"uEA7C","alert.svg":"uEA7D","archive.svg":"uEA7E","copy.svg":"uEA7F","file-chart.svg":"uEA80","item-close.svg":"uEA81","item-edit.svg":"uEA82","item-set.svg":"uEA83","item-single.svg":"uEA84","new-version.svg":"uEA85","trash.svg":"uEA86","version-history.svg":"uEA87","whatsapp.svg":"uEA88","headphones.svg":"uEA89","pause.svg":"uEA8A","play-arrow.svg":"uEA8B"} \ No newline at end of file +{"add-to-todo-list.svg":"uEA01","arrow.svg":"uEA03","avatar-group.svg":"uEA04","avatar.svg":"uEA05","bachelor.svg":"uEA06","camera.svg":"uEA07","chat.svg":"uEA08","date.svg":"uEA09","discover.svg":"uEA0A","done.svg":"uEA0B","download.svg":"uEA0C","drag.svg":"uEA0D","drop-down.svg":"uEA0E","edit-event.svg":"uEA0F","edit.svg":"uEA10","events.svg":"uEA11","facebook.svg":"uEA12","favorites.svg":"uEA13","grid.svg":"uEA14","hamburger.svg":"uEA15","home.svg":"uEA16","hy-logo.svg":"uEA17","info-stroke.svg":"uEA18","info.svg":"uEA19","link-arrow-offsite.svg":"uEA1A","link-arrow.svg":"uEA1B","linkedin.svg":"uEA1C","list.svg":"uEA1D","location.svg":"uEA1E","log.svg":"uEA1F","logout.svg":"uEA20","magnify-minus.svg":"uEA21","magnify-plus.svg":"uEA22","master.svg":"uEA23","minus.svg":"uEA24","modify.svg":"uEA25","navi-triangle.svg":"uEA26","new-group.svg":"uEA27","new-person.svg":"uEA28","notification.svg":"uEA29","opinder-logo-new.svg":"uEA2A","pdf.svg":"uEA2B","people.svg":"uEA2C","person-outline.svg":"uEA2D","person.svg":"uEA2E","plus.svg":"uEA2F","profile.svg":"uEA30","question.svg":"uEA31","remove.svg":"uEA32","rotate-left.svg":"uEA33","rotate-right.svg":"uEA34","search.svg":"uEA35","time.svg":"uEA36","todo-list.svg":"uEA37","tour.svg":"uEA38","twitter.svg":"uEA39","units-and-faculties.svg":"uEA3A","video.svg":"uEA3B","warning.svg":"uEA3C","you-tube.svg":"uEA3D","id-number.svg":"uEA3E","mail.svg":"uEA3F","mobile.svg":"uEA40","opinder-logo.svg":"uEA41","permission-all.svg":"uEA42","permission-group.svg":"uEA43","permission-private.svg":"uEA44","phone.svg":"uEA45","preview.svg":"uEA46","url.svg":"uEA47","instagram.svg":"uEA48","login.svg":"uEA49","spinner.svg":"uEA4A","you-tuubi.svg":"uEA4B","bullet-list.svg":"uEA4C","contentlink.svg":"uEA4D","customlink.svg":"uEA4E","dragbutton.svg":"uEA4F","embed-new (1).svg":"uEA50","embed.svg":"uEA51","feed.svg":"uEA52","file-text.svg":"uEA53","helsinginyliopisto.svg":"uEA54","horizontal-resize.svg":"uEA55","image-gallery.svg":"uEA56","images.svg":"uEA57","leiki-list.svg":"uEA58","listoflinks.svg":"uEA59","play.svg":"uEA5A","wrench.svg":"uEA5B","youtube.svg":"uEA5D","link-arrow-down.svg":"uEA5E","link-arrow-left.svg":"uEA5F","link-arrow-up.svg":"uEA60","code-fork.svg":"uEA61","cogs.svg":"uEA62","external-link.svg":"uEA63","globe.svg":"uEA64","image.svg":"uEA65","arrow-down.svg":"uEA66","arrow-left.svg":"uEA67","arrow-right.svg":"uEA68","arrow-up.svg":"uEA69","arrow-offsite.svg":"uEA6C","caret-down.svg":"uEA6D","caret-left.svg":"uEA6E","caret-right.svg":"uEA71","caret-up.svg":"uEA70","list-as-blocks.svg":"uEA72","social-media.svg":"uEA73","dot.svg":"uEA74","google-plus.svg":"uEA75","share.svg":"uEA76","heart.svg":"uEA77","retweet.svg":"uEA78","square-checked.svg":"uEA79","square.svg":"uEA7A","eye-slash.svg":"uEA7B","full-screen.svg":"uEA7C","alert.svg":"uEA7D","archive.svg":"uEA7E","copy.svg":"uEA7F","file-chart.svg":"uEA80","item-close.svg":"uEA81","item-edit.svg":"uEA82","item-set.svg":"uEA83","item-single.svg":"uEA84","new-version.svg":"uEA85","trash.svg":"uEA86","version-history.svg":"uEA87","whatsapp.svg":"uEA88","pause.svg":"uEA89","play-arrow.svg":"uEA8A","headphones.svg":"uEA8B"} \ No newline at end of file diff --git a/sass/icons/__icon_font.scss b/sass/icons/__icon_font.scss index 6b2d952..b34e93a 100644 --- a/sass/icons/__icon_font.scss +++ b/sass/icons/__icon_font.scss @@ -201,6 +201,6 @@ .icon--trash:after { @include icon("\EA86"); } .icon--version-history:after { @include icon("\EA87"); } .icon--whatsapp:after { @include icon("\EA88"); } -.icon--headphones:after { @include icon("\EA89"); } -.icon--pause:after { @include icon("\EA8A"); } -.icon--play-arrow:after { @include icon("\EA8B"); } +.icon--pause:after { @include icon("\EA89"); } +.icon--play-arrow:after { @include icon("\EA8A"); } +.icon--headphones:after { @include icon("\EA8B"); } diff --git a/sass/icons/__variables.scss b/sass/icons/__variables.scss index 54da475..a6b6053 100644 --- a/sass/icons/__variables.scss +++ b/sass/icons/__variables.scss @@ -255,8 +255,8 @@ $icon-version-history: "\EA87"; $icon-whatsapp: "\EA88"; -$icon-headphones: "\EA89"; +$icon-pause: "\EA89"; -$icon-pause: "\EA8A"; +$icon-play-arrow: "\EA8A"; -$icon-play-arrow: "\EA8B"; +$icon-headphones: "\EA8B"; diff --git a/templates/2_1_icons.html b/templates/2_1_icons.html index 5647fca..aafdb35 100644 --- a/templates/2_1_icons.html +++ b/templates/2_1_icons.html @@ -121,12 +121,9 @@ -<<<<<<< HEAD -======= ->>>>>>> 44235d7231a6f77895fc4f5780e86817135f265a


From 2ee16db6447845d9d815f24dc2d8635c78bc8dfc Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Mon, 27 May 2019 12:55:18 +0300 Subject: [PATCH 42/45] Font generated --- fonts/hy-icons.eot | Bin 28396 -> 28396 bytes fonts/hy-icons.ttf | Bin 28228 -> 28228 bytes fonts/hy-icons.woff | Bin 17104 -> 17104 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index c4eaa278cb60bb3f282381eba79542f239722ec7..ecbf3a4d3f2c68d6430a5f1df6531b7034c3cf20 100644 GIT binary patch delta 52 zcmaEJm+{SA#tAk|(DxOp}u7j_0@e%D~P1f&mC_3MN;==*=vQ4!Hn@{|>1D diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index d7f882cbf83e92e11e6e6b4c0e44130dc95db4aa..3b82269e7e0e6f9a7e36eb7948ff12abb09b78ca 100644 GIT binary patch delta 61 zcmV-D0K)&!g#plo0g#RY4X?3~pF1dQ;^X;kzA|t#zW|Cb+!RbHgVFzg|NqW%nE5%7 T%fY||5(NNwzYZX?S3G$Jo0%NX delta 61 zcmV-D0K)&!g#plo0g#RY3$?M3pF1cVg5&vZzA|t#zW|Cb+!Rc%gwg+h|NqW%nE5%7 T%fY||5(NNv#SR>^S3G$JjSn2E From e4e0fc76caf343c85a5e558b6cec5580accea45c Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Wed, 29 May 2019 14:05:25 +0300 Subject: [PATCH 43/45] Increased max-height and more padding to content bottom --- css/styles.css | 4 ++-- fonts/hy-icons.eot | Bin 28396 -> 28396 bytes fonts/hy-icons.ttf | Bin 28228 -> 28228 bytes fonts/hy-icons.woff | Bin 17104 -> 17104 bytes sass/components/_hero.scss | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/css/styles.css b/css/styles.css index ff6dbe8..d7558f8 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4600,7 +4600,7 @@ dl, ol, ul { display: -ms-flexbox; display: flex; height: 75vh; - max-height: 600px; + max-height: 800px; /* .hero-big__play { background-color: rgba($black, 0.61); box-decoration-break: clone; @@ -4621,7 +4621,7 @@ dl, ol, ul { } .hero-big:not(.hero-big--centered) .hero-big__top { - margin-bottom: .5rem; + padding: 1rem 1rem 2.5rem; } .hero-big:not(.hero-big--centered) .hero-big__content { diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index c677153b65fb0924e7abc169eec2df261920e8f4..ea64ec4f64c59b180a70706aa471c80774d21251 100644 GIT binary patch delta 55 zcmaEJm+{SA#tAme$Gy)^wBNd!8JXe-{va=H}eYyAh;=*{tZTNW?^*51pu{f5P$#x diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff index 1df9f06d490c1659b92bdd5669f3b21684484f67..0795760da4f085b4591b2606ccb64704039789fa 100644 GIT binary patch delta 63 zcmV-F0Kosyg#plo0g#OY1#}m&ke)j!r}O*c`E9;3a5KLEiZI+15nlzP|Ns8~o#im| Vb0C+4fe9oE0D~e9OtV)!c?P|G99sYY delta 63 zcmV-F0Kosyg#plo0g#OY02HsWke)j!*Yx7!`E9;3a5KLEiZI+1O#cR>|Ns8~o#im| Vb0C+4fe9oE0FCDl7_(PAc?Rld9v%Py diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 463dceb..632a246 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -67,7 +67,7 @@ align-items: flex-end; display: flex; height: 75vh; - max-height: 600px; + max-height: 800px; @include breakpoint($small) { min-height: 400px; @@ -81,7 +81,7 @@ } .hero-big__top { - margin-bottom: .5rem; + padding: 1rem 1rem 2.5rem; } .hero-big__content { From 02899d5e1c7015f5e1b320c7e161a79f586b0094 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Fri, 31 May 2019 12:04:58 +0300 Subject: [PATCH 44/45] Set fallback for hero overlay --- css/styles.css | 28 +++++++++++++++++++++------- fonts/hy-icons.eot | Bin 28396 -> 28396 bytes fonts/hy-icons.ttf | Bin 28228 -> 28228 bytes fonts/hy-icons.woff | Bin 17104 -> 17104 bytes sass/components/_hero.scss | 20 +++++++++++++++----- 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/css/styles.css b/css/styles.css index d7558f8..2cd71b5 100644 --- a/css/styles.css +++ b/css/styles.css @@ -4651,13 +4651,11 @@ dl, ol, ul { .hero-big:not(.hero-big--centered) .hero-big__title, .hero-big:not(.hero-big--centered) .hero-big__title__container .hero-big__overlay, .hero-big__title__container .hero-big:not(.hero-big--centered) .hero-big__overlay { font-size: 32px; - -webkit-box-decoration-break: clone; - box-decoration-break: clone; - display: inline; + display: inline-block; line-height: 1; max-width: 100%; margin-bottom: 1rem; - padding: 0 1rem; + padding: 1rem; position: relative; z-index: 1; } @@ -4674,6 +4672,15 @@ dl, ol, ul { } } +@supports ((-webkit-box-decoration-break: clone) or (box-decoration-break: clone)) { + .hero-big:not(.hero-big--centered) .hero-big__title, .hero-big:not(.hero-big--centered) .hero-big__title__container .hero-big__overlay, .hero-big__title__container .hero-big:not(.hero-big--centered) .hero-big__overlay { + -webkit-box-decoration-break: clone; + box-decoration-break: clone; + display: inline; + padding: 0 1rem; + } +} + @media (min-width: 48em) { .hero-big:not(.hero-big--centered) .hero-big__title, .hero-big:not(.hero-big--centered) .hero-big__title__container .hero-big__overlay, .hero-big__title__container .hero-big:not(.hero-big--centered) .hero-big__overlay { margin-bottom: 0; @@ -4682,15 +4689,22 @@ dl, ol, ul { .hero-big:not(.hero-big--centered) .hero-big__ingress, .hero-big:not(.hero-big--centered) .hero-big__ingress__container .hero-big__overlay, .hero-big__ingress__container .hero-big:not(.hero-big--centered) .hero-big__overlay { font-size: 1.125rem; - -webkit-box-decoration-break: clone; - box-decoration-break: clone; - display: inline; + display: inline-block; line-height: 2rem; padding: .25rem 1rem; position: relative; z-index: 1; } +@supports ((-webkit-box-decoration-break: clone) or (box-decoration-break: clone)) { + .hero-big:not(.hero-big--centered) .hero-big__ingress, .hero-big:not(.hero-big--centered) .hero-big__ingress__container .hero-big__overlay, .hero-big__ingress__container .hero-big:not(.hero-big--centered) .hero-big__overlay { + -webkit-box-decoration-break: clone; + box-decoration-break: clone; + display: inline; + padding: .25rem 1rem; + } +} + @media (min-width: 48em) { .hero-big:not(.hero-big--centered) .hero-big__ingress, .hero-big:not(.hero-big--centered) .hero-big__ingress__container .hero-big__overlay, .hero-big__ingress__container .hero-big:not(.hero-big--centered) .hero-big__overlay { margin-bottom: 0; diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index ea64ec4f64c59b180a70706aa471c80774d21251..c150bc14a976b26486bf81e253612da3dfc39518 100644 GIT binary patch delta 55 zcmaEJm+{SA#tAmeuZ<2*wBNn+a delta 55 zcmaEJm+{SA#tAme$Gy)^wBN`cb3D< V&w*SH1}2aw0H%fy%d=NJc?P`R9fkk^ delta 63 zcmV-F0Kosyg#plo0g#OY1#}m&ke)j!r}O*c`E9;3a5KLEiZI+15nlzP|Ns8~o#im| Vb0C+4fe9oE0D~e9OtV)!c?P|G99sYY diff --git a/sass/components/_hero.scss b/sass/components/_hero.scss index 632a246..7de5a7a 100644 --- a/sass/components/_hero.scss +++ b/sass/components/_hero.scss @@ -106,15 +106,20 @@ .hero-big__title { @include fluid-type(font-size, 360px, 1600px, 32px, 68px); - box-decoration-break: clone; - display: inline; + display: inline-block; line-height: 1; max-width: 100%; margin-bottom: 1rem; - padding: 0 1rem; + padding: 1rem; position: relative; z-index: 1; + @supports (box-decoration-break: clone) { + box-decoration-break: clone; + display: inline; + padding: 0 1rem; + } + @include breakpoint($small) { margin-bottom: 0; } @@ -122,13 +127,18 @@ .hero-big__ingress { @include font-size(18px); - box-decoration-break: clone; - display: inline; + display: inline-block; line-height: 2rem; padding: .25rem 1rem; position: relative; z-index: 1; + @supports (box-decoration-break: clone) { + box-decoration-break: clone; + display: inline; + padding: .25rem 1rem; + } + @include breakpoint($small) { margin-bottom: 0; } From 52168271dbd2438857cf97c047de76dc090579f7 Mon Sep 17 00:00:00 2001 From: Tuukka Turu Date: Wed, 19 Jun 2019 15:59:13 +0300 Subject: [PATCH 45/45] Added euro icon --- css/styles.css | 11 +++++++++++ fonts/hy-icons.eot | Bin 28396 -> 28696 bytes fonts/hy-icons.ttf | Bin 28228 -> 28528 bytes fonts/hy-icons.woff | Bin 17100 -> 17276 bytes icons/dest/uEA8C-euro-currency.svg | 1 + icons/src/euro-currency.svg | 1 + icons/unicodes.json | 2 +- sass/icons/__icon_font.scss | 1 + sass/icons/__variables.scss | 2 ++ templates/2_1_icons.html | 2 ++ 10 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 icons/dest/uEA8C-euro-currency.svg create mode 100644 icons/src/euro-currency.svg diff --git a/css/styles.css b/css/styles.css index a1bd26c..df23e33 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1972,6 +1972,17 @@ th { content: ""; } +.icon--euro-currency:after { + display: inline-block; + font-family: "hy-icons"; + font-style: normal; + font-weight: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + vertical-align: bottom; + content: ""; +} + .bar, .tube { display: block; padding-bottom: 1em; diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot index d4fa93bb50319a6ed3f37ef29f7526a51826e2fe..3099cf38acc5a0f66d0258d9cd21f1e7201509db 100644 GIT binary patch delta 649 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 delta 16390 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 SZsPlW*&+Z!^zU{t=>Gth+~tJ; diff --git a/icons/dest/uEA8C-euro-currency.svg b/icons/dest/uEA8C-euro-currency.svg new file mode 100644 index 0000000..d2279f4 --- /dev/null +++ b/icons/dest/uEA8C-euro-currency.svg @@ -0,0 +1 @@ +Asset 7 \ No newline at end of file diff --git a/icons/src/euro-currency.svg b/icons/src/euro-currency.svg new file mode 100644 index 0000000..d2279f4 --- /dev/null +++ b/icons/src/euro-currency.svg @@ -0,0 +1 @@ +Asset 7 \ No newline at end of file diff --git a/icons/unicodes.json b/icons/unicodes.json index 5ee6643..26d86da 100644 --- a/icons/unicodes.json +++ b/icons/unicodes.json @@ -1 +1 @@ -{"add-to-todo-list.svg":"uEA01","arrow.svg":"uEA03","avatar-group.svg":"uEA04","avatar.svg":"uEA05","bachelor.svg":"uEA06","camera.svg":"uEA07","chat.svg":"uEA08","date.svg":"uEA09","discover.svg":"uEA0A","done.svg":"uEA0B","download.svg":"uEA0C","drag.svg":"uEA0D","drop-down.svg":"uEA0E","edit-event.svg":"uEA0F","edit.svg":"uEA10","events.svg":"uEA11","facebook.svg":"uEA12","favorites.svg":"uEA13","grid.svg":"uEA14","hamburger.svg":"uEA15","home.svg":"uEA16","hy-logo.svg":"uEA17","info-stroke.svg":"uEA18","info.svg":"uEA19","link-arrow-offsite.svg":"uEA1A","link-arrow.svg":"uEA1B","linkedin.svg":"uEA1C","list.svg":"uEA1D","location.svg":"uEA1E","log.svg":"uEA1F","logout.svg":"uEA20","magnify-minus.svg":"uEA21","magnify-plus.svg":"uEA22","master.svg":"uEA23","minus.svg":"uEA24","modify.svg":"uEA25","navi-triangle.svg":"uEA26","new-group.svg":"uEA27","new-person.svg":"uEA28","notification.svg":"uEA29","opinder-logo-new.svg":"uEA2A","pdf.svg":"uEA2B","people.svg":"uEA2C","person-outline.svg":"uEA2D","person.svg":"uEA2E","plus.svg":"uEA2F","profile.svg":"uEA30","question.svg":"uEA31","remove.svg":"uEA32","rotate-left.svg":"uEA33","rotate-right.svg":"uEA34","search.svg":"uEA35","time.svg":"uEA36","todo-list.svg":"uEA37","tour.svg":"uEA38","twitter.svg":"uEA39","units-and-faculties.svg":"uEA3A","video.svg":"uEA3B","warning.svg":"uEA3C","you-tube.svg":"uEA3D","id-number.svg":"uEA3E","mail.svg":"uEA3F","mobile.svg":"uEA40","opinder-logo.svg":"uEA41","permission-all.svg":"uEA42","permission-group.svg":"uEA43","permission-private.svg":"uEA44","phone.svg":"uEA45","preview.svg":"uEA46","url.svg":"uEA47","instagram.svg":"uEA48","login.svg":"uEA49","spinner.svg":"uEA4A","you-tuubi.svg":"uEA4B","bullet-list.svg":"uEA4C","contentlink.svg":"uEA4D","customlink.svg":"uEA4E","dragbutton.svg":"uEA4F","embed-new (1).svg":"uEA50","embed.svg":"uEA51","feed.svg":"uEA52","file-text.svg":"uEA53","helsinginyliopisto.svg":"uEA54","horizontal-resize.svg":"uEA55","image-gallery.svg":"uEA56","images.svg":"uEA57","leiki-list.svg":"uEA58","listoflinks.svg":"uEA59","play.svg":"uEA5A","wrench.svg":"uEA5B","youtube.svg":"uEA5D","link-arrow-down.svg":"uEA5E","link-arrow-left.svg":"uEA5F","link-arrow-up.svg":"uEA60","code-fork.svg":"uEA61","cogs.svg":"uEA62","external-link.svg":"uEA63","globe.svg":"uEA64","image.svg":"uEA65","arrow-down.svg":"uEA66","arrow-left.svg":"uEA67","arrow-right.svg":"uEA68","arrow-up.svg":"uEA69","arrow-offsite.svg":"uEA6C","caret-down.svg":"uEA6D","caret-left.svg":"uEA6E","caret-right.svg":"uEA71","caret-up.svg":"uEA70","list-as-blocks.svg":"uEA72","social-media.svg":"uEA73","dot.svg":"uEA74","google-plus.svg":"uEA75","share.svg":"uEA76","heart.svg":"uEA77","retweet.svg":"uEA78","square-checked.svg":"uEA79","square.svg":"uEA7A","eye-slash.svg":"uEA7B","full-screen.svg":"uEA7C","alert.svg":"uEA7D","archive.svg":"uEA7E","copy.svg":"uEA7F","file-chart.svg":"uEA80","item-close.svg":"uEA81","item-edit.svg":"uEA82","item-set.svg":"uEA83","item-single.svg":"uEA84","new-version.svg":"uEA85","trash.svg":"uEA86","version-history.svg":"uEA87","whatsapp.svg":"uEA88","pause.svg":"uEA89","play-arrow.svg":"uEA8A","headphones.svg":"uEA8B"} \ No newline at end of file +{"add-to-todo-list.svg":"uEA01","arrow.svg":"uEA03","avatar-group.svg":"uEA04","avatar.svg":"uEA05","bachelor.svg":"uEA06","camera.svg":"uEA07","chat.svg":"uEA08","date.svg":"uEA09","discover.svg":"uEA0A","done.svg":"uEA0B","download.svg":"uEA0C","drag.svg":"uEA0D","drop-down.svg":"uEA0E","edit-event.svg":"uEA0F","edit.svg":"uEA10","events.svg":"uEA11","facebook.svg":"uEA12","favorites.svg":"uEA13","grid.svg":"uEA14","hamburger.svg":"uEA15","home.svg":"uEA16","hy-logo.svg":"uEA17","info-stroke.svg":"uEA18","info.svg":"uEA19","link-arrow-offsite.svg":"uEA1A","link-arrow.svg":"uEA1B","linkedin.svg":"uEA1C","list.svg":"uEA1D","location.svg":"uEA1E","log.svg":"uEA1F","logout.svg":"uEA20","magnify-minus.svg":"uEA21","magnify-plus.svg":"uEA22","master.svg":"uEA23","minus.svg":"uEA24","modify.svg":"uEA25","navi-triangle.svg":"uEA26","new-group.svg":"uEA27","new-person.svg":"uEA28","notification.svg":"uEA29","opinder-logo-new.svg":"uEA2A","pdf.svg":"uEA2B","people.svg":"uEA2C","person-outline.svg":"uEA2D","person.svg":"uEA2E","plus.svg":"uEA2F","profile.svg":"uEA30","question.svg":"uEA31","remove.svg":"uEA32","rotate-left.svg":"uEA33","rotate-right.svg":"uEA34","search.svg":"uEA35","time.svg":"uEA36","todo-list.svg":"uEA37","tour.svg":"uEA38","twitter.svg":"uEA39","units-and-faculties.svg":"uEA3A","video.svg":"uEA3B","warning.svg":"uEA3C","you-tube.svg":"uEA3D","id-number.svg":"uEA3E","mail.svg":"uEA3F","mobile.svg":"uEA40","opinder-logo.svg":"uEA41","permission-all.svg":"uEA42","permission-group.svg":"uEA43","permission-private.svg":"uEA44","phone.svg":"uEA45","preview.svg":"uEA46","url.svg":"uEA47","instagram.svg":"uEA48","login.svg":"uEA49","spinner.svg":"uEA4A","you-tuubi.svg":"uEA4B","bullet-list.svg":"uEA4C","contentlink.svg":"uEA4D","customlink.svg":"uEA4E","dragbutton.svg":"uEA4F","embed-new (1).svg":"uEA50","embed.svg":"uEA51","feed.svg":"uEA52","file-text.svg":"uEA53","helsinginyliopisto.svg":"uEA54","horizontal-resize.svg":"uEA55","image-gallery.svg":"uEA56","images.svg":"uEA57","leiki-list.svg":"uEA58","listoflinks.svg":"uEA59","play.svg":"uEA5A","wrench.svg":"uEA5B","youtube.svg":"uEA5D","link-arrow-down.svg":"uEA5E","link-arrow-left.svg":"uEA5F","link-arrow-up.svg":"uEA60","code-fork.svg":"uEA61","cogs.svg":"uEA62","external-link.svg":"uEA63","globe.svg":"uEA64","image.svg":"uEA65","arrow-down.svg":"uEA66","arrow-left.svg":"uEA67","arrow-right.svg":"uEA68","arrow-up.svg":"uEA69","arrow-offsite.svg":"uEA6C","caret-down.svg":"uEA6D","caret-left.svg":"uEA6E","caret-right.svg":"uEA71","caret-up.svg":"uEA70","list-as-blocks.svg":"uEA72","social-media.svg":"uEA73","dot.svg":"uEA74","google-plus.svg":"uEA75","share.svg":"uEA76","heart.svg":"uEA77","retweet.svg":"uEA78","square-checked.svg":"uEA79","square.svg":"uEA7A","eye-slash.svg":"uEA7B","full-screen.svg":"uEA7C","alert.svg":"uEA7D","archive.svg":"uEA7E","copy.svg":"uEA7F","file-chart.svg":"uEA80","item-close.svg":"uEA81","item-edit.svg":"uEA82","item-set.svg":"uEA83","item-single.svg":"uEA84","new-version.svg":"uEA85","trash.svg":"uEA86","version-history.svg":"uEA87","whatsapp.svg":"uEA88","pause.svg":"uEA89","play-arrow.svg":"uEA8A","headphones.svg":"uEA8B","euro-currency.svg":"uEA8C"} \ No newline at end of file diff --git a/sass/icons/__icon_font.scss b/sass/icons/__icon_font.scss index b34e93a..a2713c3 100644 --- a/sass/icons/__icon_font.scss +++ b/sass/icons/__icon_font.scss @@ -204,3 +204,4 @@ .icon--pause:after { @include icon("\EA89"); } .icon--play-arrow:after { @include icon("\EA8A"); } .icon--headphones:after { @include icon("\EA8B"); } +.icon--euro-currency:after { @include icon("\EA8C"); } diff --git a/sass/icons/__variables.scss b/sass/icons/__variables.scss index a6b6053..d92ab56 100644 --- a/sass/icons/__variables.scss +++ b/sass/icons/__variables.scss @@ -260,3 +260,5 @@ $icon-pause: "\EA89"; $icon-play-arrow: "\EA8A"; $icon-headphones: "\EA8B"; + +$icon-euro-currency: "\EA8C"; diff --git a/templates/2_1_icons.html b/templates/2_1_icons.html index 7e6ec69..7ad5ece 100644 --- a/templates/2_1_icons.html +++ b/templates/2_1_icons.html @@ -122,6 +122,7 @@ +


@@ -246,6 +247,7 @@ +