DFI-8 adds white background to all pages and dotted links

gbv · Dec 11, 2023 · 5eb46ce · 5eb46ce
1 parent eb04722
commit 5eb46ce
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 58 deletions.
diff --git a/src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_footer.scss b/src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_footer.scss
@@ -15,6 +15,10 @@
   a {
     font-style: italic;
     font-weight: 700;
+    &:hover {
+      text-decoration: none;
+      color: $dfi-link-hover;
+    }
   }
   .pin {
     padding-left: 30px;

diff --git a/src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_header.scss b/src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_header.scss
@@ -9,7 +9,7 @@
 // logo and menu container
 
 html > body > header {
-  //box-shadow: 0px 4px 3px rgba(0,0,0,0.1);
+  box-shadow: 0 0 7px 5px #D3D3D3;
   position: fixed;
   top: 0;
   z-index: 4001;
@@ -21,7 +21,6 @@ html > body > header {
     display: none;
   }
   &.small-header {
-    box-shadow: 0 0 7px 5px #D3D3D3;
     .dfi-logo {
       display: none;
     }

diff --git a/src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_layout.scss b/src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_layout.scss
@@ -8,40 +8,12 @@
 
 body {
   padding-top: 11rem;
-  background-color: $dfi-secondary;
 }
 
 .cms-page {
   section {
     padding-bottom: 80px;
   }
-  #page {
-    padding-bottom: 3rem;
-    background-color: transparent;
-    .row {
-      margin-left: 0;
-      margin-right: 0;
-      margin-bottom: 30px;
-      & > div {
-        background-color: white;
-        padding-top: 40px;
-        padding-left: 25px;
-        padding-right: 25px;
-        padding-bottom: 40px;
-      }
-      .row {
-        margin-left: -15px;
-        margin-right: -15px;
-        margin-bottom: 0;
-        & > div {
-          padding-top: 0;
-          padding-left: 0;
-          padding-right: 0;
-          padding-bottom: 0;
-        }
-      }
-    }
-  }
 }
 
 // Large devices (desktops) and below: <= 1200px

diff --git a/src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_section-home.scss b/src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_section-home.scss
@@ -7,7 +7,6 @@
 // no (xl) media query necessary (desktop first)
 
 body.mir-start_page {
-  background-color: white;
   .splash {
     padding-left: 0;
     padding-right: 0;

diff --git a/src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_typo.scss b/src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_typo.scss
@@ -21,7 +21,7 @@
     h2 {
       font-size: 2em;
       margin-bottom: 80px;
-      font-family: $font-family-serif;
+      font-family: $font-family-sans-serif;
       font-weight: 700;
     }
 

diff --git a/src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_variables.scss b/src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_variables.scss
@@ -14,28 +14,34 @@
 //  project settings
 // --------------------------------------------------
 
-$dfi-white: #fff;
-$dfi-gray: #666666;
-$dfi-gray-dark: #343a40;
-$dfi-primary:#ff9d2e;
-$dfi-primary-hover: #f48f17;
-$dfi-secondary: #dce3e7;
+$dfi-white:           #fff;
+$dfi-gray:            #666666;
+$dfi-gray-dark:       #343a40;
+$dfi-primary:         #ff9d2e;
+$dfi-primary-hover:   #f48f17;
+$dfi-link-hover:      #ffa600;
+$dfi-secondary:       #dce3e7;
 $dfi-secondary-hover: #d3dbde;
-$dfi-success: #98e59d;
-$dfi-success-hover: #8cd390;
-$dfi-info: #17a2b8;
-$dfi-warning: #ffc107;
-$dfi-danger: #dc3545;
-$dfi-light: #F4F4F4;
-$dfi-dark: #002a55;
+$dfi-success:         #98e59d;
+$dfi-success-hover:   #8cd390;
+$dfi-info:            #17a2b8;
+$dfi-warning:         #ffc107;
+$dfi-danger:          #dc3545;
+$dfi-light:           #F4F4F4;
+$dfi-dark:            #002a55;
 
 // --------------------------------------------------
 //  overwrite bootstrap
 // --------------------------------------------------
 
-$primary:     $dfi-dark;
-$secondary:   $dfi-primary;
-$body-color:  $dfi-dark;
+$primary:                   $dfi-dark;
+$secondary:                 $dfi-primary;
+
+$body-color:                $dfi-dark;
+$link-color:                $dfi-dark;
+$link-hover-color:          $dfi-link-hover;
+$link-decoration:           underline dotted $dfi-dark;
+$link-hover-decoration:     underline dotted $dfi-dark;
 
 $web-font-path:             "https://webfonts.gbv.de/css2?family=Source+Sans+3&family=Source+Serif+4&display=swap";
 $font-family-sans-serif:    "Source Sans 3", "Arial", "Verdana", "Tahoma", sans-serif;
@@ -49,12 +55,9 @@ $border-radius:             0;
 $border-radius-lg:          0;
 $border-radius-sm:          0;
 
-$navbar-light-color: $dfi-dark;
-$navbar-light-hover-color: $dfi-primary;
+$navbar-light-color:        $dfi-dark;
+$navbar-light-hover-color:  $dfi-primary;
 
-$dropdown-link-color: $dfi-dark;
+$dropdown-link-color:       $dfi-dark;
 $dropdown-link-hover-color: white;
-$dropdown-link-hover-bg: $dfi-primary;
-
-$navbar-nav-link-padding-x: 0;
-$nav-link-padding-x: 0;
+$dropdown-link-hover-bg:    $dfi-primary;
diff --git a/src/main/resources/xsl/mir-flatmir-layout-utils.xsl b/src/main/resources/xsl/mir-flatmir-layout-utils.xsl
@@ -87,9 +87,6 @@
                   </xsl:call-template>
                   <xsl:apply-templates select="$loaded_navigation_xml/menu[@id='search']" />
                   <xsl:apply-templates select="$loaded_navigation_xml/menu[@id='browse']" />
-                  <xsl:call-template name="project.generate_single_menu_entry">
-                    <xsl:with-param name="menuID" select="'citation'"/>
-                  </xsl:call-template>
                   <xsl:apply-templates select="$loaded_navigation_xml/menu[@id='publish']" />
                   <xsl:call-template name="mir.basketMenu" />
                 </ul>