Merge branch '4.0-dev' into 4.0_sticky-header

joomla · Jan 21, 2020 · f5c1f72 · f5c1f72
2 parents 61d2a34 + f0432e8
commit f5c1f72
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 78 deletions.
diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php
@@ -67,9 +67,6 @@
 	$hasClass .= ' has-sidebar-right';
 }
 
-// Header bottom margin
-$headerMargin = !$this->countModules('banner') ? ' mb-4' : '';
-
 // Container
 $wrapper = $this->params->get('fluidContainer') ? 'wrapper-fluid' : 'wrapper-static';
 
@@ -125,16 +122,9 @@
 			</nav>
 			<?php if ($this->countModules('banner')) : ?>
 			<div class="grid-child container-banner">
-				<jdoc:include type="modules" name="banner" style="xhtml" />
+				<jdoc:include type="modules" name="banner" style="html5" />
 			</div>
 			<?php endif; ?>
-			<div class="header-shadow"></div>
-			<div class="header-shape-bottom">
-				<canvas width="736" height="15"></canvas>
-				<svg class="" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 736 15">
-					<path d="M1040,301V285s-75,12-214,12-284-26-524,0v4Z" transform="translate(-302 -285)" fill="#fafafa"/>
-				</svg>
-			</div>
 		</header>
 	</div>
 

diff --git a/templates/cassiopeia/scss/blocks/_banner.scss b/templates/cassiopeia/scss/blocks/_banner.scss
@@ -1,10 +1,11 @@
 // Banner
 
 .container-banner {
+  color: white;
 
   img {
-    width: 100%;
-    box-shadow: 0 2px 15px rgba(0, 0, 0, .8);
+    display: block;
+    margin: auto;
   }
 
 }
diff --git a/templates/cassiopeia/scss/blocks/_css-grid.scss b/templates/cassiopeia/scss/blocks/_css-grid.scss
@@ -73,32 +73,13 @@
         ". debug debug debug debug .";
     }
 
-    .container-header {
-      margin-top: 0;
-      margin-bottom: 20px;
-
-      + div:not(.container-banner):not(.container-sidebar-left):not(.container-component) {
-        margin-top: $cassiopeia-grid-gutter;
-      }
-    }
-
     &.wrapper-fluid {
       grid-template-columns: [full-start] minmax(0, 1fr) [main-start] repeat(4, minmax(0, 25%)) [main-end] minmax(0, 1fr) [full-end];
     }
   }
 
   .container-banner {
-    z-index: 5;
-    margin: -2rem 0 0;
     padding: 0 ($cassiopeia-grid-gutter / 2);
-
-    p {
-      margin-bottom: 0;
-    }
-
-    @include media-breakpoint-up(xl) {
-      margin-top: -3rem;
-    }
   }
 }
 

diff --git a/templates/cassiopeia/scss/blocks/_header.scss b/templates/cassiopeia/scss/blocks/_header.scss
@@ -17,12 +17,7 @@
   }
 
   nav {
-    padding: 2.5rem ($cassiopeia-grid-gutter / 2) 4.5rem;
-
-    @include media-breakpoint-up(xl) {
-      padding-bottom: 5.5rem;
-    }
-
+    padding: 2.5rem ($cassiopeia-grid-gutter / 2) 2.5rem;
   }
 
   .site-description {
@@ -166,42 +161,3 @@
   }
 
 }
-
-.header-shadow {
-  display: none;
-  pointer-events: none;
-
-  .container-banner + & {
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    display: block;
-    height: 180px;
-    content: "";
-    background-image: linear-gradient(0deg, rgba(0, 0, 0, .5) 0%, transparent 100%);
-
-  }
-
-}
-
-.header-shape-bottom {
-  position: absolute;
-  right: 0;
-  bottom: -20px;
-  left: 0;
-  border-bottom: 20px solid #fafafa;
-
-  canvas {
-    display: block;
-    width: 100%;
-    visibility: hidden;
-  }
-
-  svg {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-  }
-}
diff --git a/templates/cassiopeia/scss/blocks/_layout.scss b/templates/cassiopeia/scss/blocks/_layout.scss
@@ -27,7 +27,7 @@ header {
 
 .container-banner {
   display: block;
-  margin: -15px 0 -5px;
+  margin: 0 0 2rem;
 }
 
 .container-top-a,