Fixed the feedback on issues #36, #29, #35, #32, #28

clarin-eric · Mar 26, 2021 · 7b23e14 · 7b23e14
1 parent 95f7568
commit 7b23e14
Show file tree

Hide file tree

Showing 9 changed files with 260 additions and 287 deletions.
diff --git a/assets/styles/modules/basicpage.scss b/assets/styles/modules/basicpage.scss
@@ -17,20 +17,35 @@
 
 .node {
   .field--name-body {
-    a {
+    a:not(.btn):not(.btn-default):not(.btn-link-blue-s) {
       color: $blue;
     }
   }
 }
 
 .paragraph {
   .field--name-field-body {
-    a {
+    a:not(.btn):not(.btn-default):not(.btn-link-blue-s) {
       color: $blue;
     }
   }
 }
 
+// Sidebar
+.sidebar {
+  .block {
+    display: flex;
+    flex-flow: column;
+    border: 1px solid rgba(5,45,77,.13);
+  }
+
+  nav {
+    ul.nav {
+      margin: 0;
+    }
+  }
+}
+
 // Search page
 .path-search {
   .search-form {

diff --git a/assets/styles/modules/navbar.scss b/assets/styles/modules/navbar.scss
@@ -543,6 +543,34 @@
   @media (min-width: #{$screen-lg-desktop}) {
     height: unset;
   }
+
+  .navbar-toggle {
+    display: flex;
+  }
+}
+
+.block-we-megamenu {
+  .navbar-toggle {
+    display: none;
+  }
+}
+
+.we-mega-menu-col.span12 {
+  .nav {
+    @media (max-width: #{$screen-tablet}) {
+      padding: 0;
+
+      li {
+        a {
+          line-height: 1 !important;
+        }
+      }
+
+      .we-mega-menu-li:last-child>a.we-mega-menu-li {
+        border-bottom: none !important;
+      }
+    }
+  }
 }
 
 // Private secondary menu

diff --git a/assets/styles/modules/resources.scss b/assets/styles/modules/resources.scss
@@ -295,3 +295,33 @@
     }
   }
 }
+
+body.node--type-resource {
+  border-top: none;
+
+  &:hover,
+  &:focus {
+    border-top: none;
+
+    h2.node__title {
+      text-decoration: none;
+    }
+
+    .tag {
+      text-decoration: none;
+    }
+  }
+
+  .node.node--type-resource {
+    border-top: none;
+
+    &:hover,
+    &:focus {
+      border-top: none;
+
+      .tag {
+        text-decoration: underline;
+      }
+    }
+  }
+}
diff --git a/assets/styles/utility/typography.scss b/assets/styles/utility/typography.scss
@@ -1,58 +1,8 @@
 /* TYPOGRAPHY */
 
-/* Inter font from https://github.com/rsms/inter/releases */
-
-@font-face {
-  font-family: 'Inter';
-  font-style:  normal;
-  font-weight: 400;
-  font-display: swap;
-  src: url("../fonts/inter/Inter-Regular.woff2?v=3.15") format("woff2"),
-       url("../fonts/inter/Inter-Regular.woff?v=3.15") format("woff");
-}
-@font-face {
-  font-family: 'Inter';
-  font-style:  italic;
-  font-weight: 400;
-  font-display: swap;
-  src: url("../fonts/inter/Inter-Italic.woff2?v=3.15") format("woff2"),
-       url("../fonts/inter/Inter-Italic.woff?v=3.15") format("woff");
-}
-
-@font-face {
-  font-family: 'Inter';
-  font-style:  normal;
-  font-weight: 600;
-  font-display: swap;
-  src: url("../fonts/inter/Inter-SemiBold.woff2?v=3.15") format("woff2"),
-       url("../fonts/inter/Inter-SemiBold.woff?v=3.15") format("woff");
-}
-@font-face {
-  font-family: 'Inter';
-  font-style:  italic;
-  font-weight: 600;
-  font-display: swap;
-  src: url("../fonts/inter/Inter-SemiBoldItalic.woff2?v=3.15") format("woff2"),
-       url("../fonts/inter/Inter-SemiBoldItalic.woff?v=3.15") format("woff");
-}
-
-@font-face {
-  font-family: 'Inter';
-  font-style:  normal;
-  font-weight: 700;
-  font-display: swap;
-  src: url("../fonts/inter/Inter-Bold.woff2?v=3.15") format("woff2"),
-       url("../fonts/inter/Inter-Bold.woff?v=3.15") format("woff");
-}
-@font-face {
-  font-family: 'Inter';
-  font-style:  italic;
-  font-weight: 700;
-  font-display: swap;
-  src: url("../fonts/inter/Inter-BoldItalic.woff2?v=3.15") format("woff2"),
-       url("../fonts/inter/Inter-BoldItalic.woff?v=3.15") format("woff");
-}
+/* Google Fonts */
 
+@import url("https://fonts.googleapis.com/css?family=Inter:400,400italic,600,600italic,700,700italic");
 // font families
 $font-inter: 'Inter',
 Arial,