Merge branch 'develop'

UniversityofHelsinki · Apr 6, 2017 · 018115c · 018115c
2 parents 615ccc2 + 2310ef9
commit 018115c
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 55 deletions.
diff --git a/css/styles.css b/css/styles.css
@@ -4639,11 +4639,16 @@ dl, ol, ul {
   }
 }
 
-.l-subregion-wrapper .breadcrumbs {
-  margin-bottom: 1em;
-  position: absolute;
-  top: -2em;
-  z-index: 10;
+.breadcrumbs.theme-hero .breadcrumbs__divider {
+  color: #FFF;
+}
+
+.breadcrumbs.theme-hero .breadcrumbs__item a {
+  color: #FFF;
+}
+
+.breadcrumbs.theme-hero .breadcrumbs__item a:hover {
+  color: #D2D2D2;
 }
 
 .breadcrumbs__item {
@@ -4865,7 +4870,7 @@ dl, ol, ul {
 
 .carousel-unwrapped,
 .carousel-unwrapped--horizontal {
-  background-color: #222;
+  background-color: #F8F8F8;
   height: 350px;
   overflow: hidden;
   position: relative;
@@ -5558,13 +5563,10 @@ dl, ol, ul {
 }
 
 .index-topical__title {
-  margin-bottom: 0.25em;
-}
-
-.index-topical__title > a {
   font-size: 0.9375rem;
   font-weight: 700;
   font-style: normal;
+  margin-bottom: 0.25em;
 }
 
 .index-topical__field {
@@ -6188,6 +6190,10 @@ span.links__link.theme-language {
   text-transform: none;
 }
 
+.main-menu li.is-lvl3 > a:hover, .main-menu li.is-lvl3 > a.active-trail, .main-menu li.is-lvl3 > a.active {
+  color: #005479;
+}
+
 .main-menu li.is-lvl3 > ul.menu {
   display: none !important;
 }
@@ -7625,27 +7631,25 @@ input[type="text"].search-form-large__input {
   height: auto;
   line-height: 19px;
   padding: 0.6em 1em 0.6em 1.8em;
+  transition-duration: 0.1s;
+  transition-property: background-color;
 }
 
-.box-card__link {
-  font-weight: 600;
-  font-style: normal;
-  font-size: 0.875rem;
-  transition-duration: 0.1s;
-  transition-property: color;
-  -webkit-align-self: flex-end;
-      -ms-flex-item-align: end;
-          align-self: flex-end;
-  color: #FFF !important;
-  font-weight: 400;
-  float: right;
-  height: 18px;
-  margin-top: auto;
-  padding: 0;
+.box-card__header:hover {
+  background-color: #424242;
+  color: #FFF;
 }
 
-.box-card__link:after {
-  color: #FFF !important;
+.box-card__header: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: "";
+  float: right;
 }
 
 .box-card__content {
@@ -7974,6 +7978,10 @@ input[type="text"].search-form-large__input {
   padding: 0 0.5rem;
 }
 
+.box-hero__pretitle {
+  margin-bottom: 0.4em;
+}
+
 .box-hero__title {
   font-size: 3rem;
   color: #FFF;
@@ -8878,6 +8886,7 @@ input[type="text"].search-form-large__input {
   color: #555555;
   text-transform: none;
   font-size: 1rem;
+  margin-bottom: 0.2em;
 }
 
 @media (min-width: 48em) {

diff --git a/fonts/hy-icons.eot b/fonts/hy-icons.eot
diff --git a/fonts/hy-icons.ttf b/fonts/hy-icons.ttf
diff --git a/fonts/hy-icons.woff b/fonts/hy-icons.woff
diff --git a/sass/components/_breadcrumbs.scss b/sass/components/_breadcrumbs.scss
@@ -12,11 +12,19 @@
     margin: 0;
   }
 
-  .l-subregion-wrapper & {
-    margin-bottom: 1em;
-    position: absolute;
-    top: -2em;
-    z-index: 10;
+  &.theme-hero {
+    .breadcrumbs__divider {
+      color: $white;
+    }
+    .breadcrumbs__item {
+      a {
+        color: $white;
+
+        &:hover {
+          color: $mediumsilver;
+        }
+      }
+    }
   }
 }
 

diff --git a/sass/components/_carousel.scss b/sass/components/_carousel.scss
@@ -140,7 +140,7 @@
 */
 %carousel-unwrapped,
 .carousel-unwrapped {
-  background-color: $black;
+  background-color: $lightsilver;
   height: 350px;
   overflow: hidden;
   position: relative;

diff --git a/sass/components/_index.scss b/sass/components/_index.scss
@@ -121,12 +121,9 @@
 }
 
 .index-topical__title {
+  @include font-size(15px);
+  @include font-weight-bold;
   margin-bottom: 0.25em;
-
-  > a {
-    @include font-size(15px);
-    @include font-weight-bold;
-  }
 }
 
 .index-topical__field {

diff --git a/sass/components/_main-menu.scss b/sass/components/_main-menu.scss
@@ -102,6 +102,12 @@
       color: $silver;
       padding: 5px 30px 5px 80px;
       text-transform: none;
+
+      &:hover,
+      &.active-trail,
+      &.active {
+        color: $darkblue;
+      }
     }
 
     > ul.menu {

diff --git a/sass/components/box/_box-card.scss b/sass/components/box/_box-card.scss
@@ -56,23 +56,17 @@
   height: auto;
   line-height: 19px;
   padding: 0.6em 1em 0.6em 1.8em;
-}
-
-.box-card__link {
-  @include font-weight-medium;
-  @include font-size(14px);
   transition-duration: 0.1s;
-  transition-property: color;
-  align-self: flex-end;
-  color: $white !important;
-  font-weight: 400;
-  float: right;
-  height: 18px;
-  margin-top: auto;
-  padding: 0;
+  transition-property: background-color;
+
+  &:hover {
+    background-color: $darkgray;
+    color: $white;
+  }
 
   &:after {
-    color: $white !important;
+    @include icon($icon-arrow-right);
+    float: right;
   }
 }
 

diff --git a/sass/components/box/_box-hero.scss b/sass/components/box/_box-hero.scss
@@ -100,6 +100,10 @@
   padding: 0 0.5rem;
 }
 
+.box-hero__pretitle {
+  margin-bottom: 0.4em;
+}
+
 .box-hero__title {
   @include font-size(48px);
   color: $white;

diff --git a/sass/components/box/_box-subtitle.scss b/sass/components/box/_box-subtitle.scss
@@ -17,6 +17,7 @@
 .box-subtitle__title {
   @include text-label;
   @include font-size(16px);
+  margin-bottom: 0.2em;
 }
 
 .box-subtitle__link {

diff --git a/templates/6_10_8_box-card.html b/templates/6_10_8_box-card.html
@@ -1,8 +1,7 @@
 <div class="box-card">
-  <div class="box-card__header">
-    <a href="#" class="box-card__link button--action icon--arrow-right theme-transparent"></a>
+  <a href="#" class="box-card__header">
     Matti Meikäläinen
-  </div>
+  </a>
   <div class="required-fields box-card__content">
     <div class="box-card__item">
       <div class="box-card__section">