Browse Source

Merge pull request #1006 from Automattic/fix/issue-1000

Modern Business: Make sure the first block has margin-top: 0
Jeffrey Pearce 6 năm trước cách đây
mục cha
commit
0f69d4380b

+ 7 - 0
modern-business/sass/blocks/_blocks.scss

@@ -93,6 +93,13 @@
 	}
 }
 
+/*
+ * Make sure the first block has margin-top: 0
+ */
+.entry:not(.has-post-thumbnail) .entry-content > :first-child {
+	margin-top: 0;
+}
+
 /*
  * Unset nested content selector styles
  * - Prevents layout styles from cascading too deeply

+ 3 - 2
modern-business/sass/site/primary/_posts-and-pages.scss

@@ -31,12 +31,12 @@
 	}
 
 	.entry-header {
-		margin: calc(3 * #{ $size__spacing-unit}) $size__spacing-unit $size__spacing-unit;
+		margin: calc(3 * #{ $size__spacing-unit}) $size__spacing-unit $size__vertical-spacing-unit;
 		position: relative;
 		text-align: center;
 
 		@include media(tablet) {
-			margin: calc(3 * #{ $size__spacing-unit}) $size__site-margins $size__spacing-unit;
+			margin: calc(3 * #{ $size__spacing-unit}) $size__site-margins $size__vertical-spacing-unit;
 		}
 	}
 
@@ -44,6 +44,7 @@
 		font-size: $font__size-lg;
 		font-weight: 300;
 		margin: 0;
+		margin-bottom: $size__vertical-spacing-unit;
 		text-align: center;
 
 		@include media(tablet) {

+ 10 - 2
modern-business/style-rtl.css

@@ -2327,14 +2327,14 @@ body.page .main-navigation {
 }
 
 .entry .entry-header {
-  margin: calc(3 * 1rem) 1rem 1rem;
+  margin: calc(3 * 1rem) 1rem 32px;
   position: relative;
   text-align: center;
 }
 
 @media only screen and (min-width: 768px) {
   .entry .entry-header {
-    margin: calc(3 * 1rem) calc(10% + 60px) 1rem;
+    margin: calc(3 * 1rem) calc(10% + 60px) 32px;
   }
 }
 
@@ -2342,6 +2342,7 @@ body.page .main-navigation {
   font-size: 1.6875em;
   font-weight: 300;
   margin: 0;
+  margin-bottom: 32px;
   text-align: center;
 }
 
@@ -3482,6 +3483,13 @@ body.page .main-navigation {
   }
 }
 
+/*
+ * Make sure the first block has margin-top: 0
+ */
+.entry:not(.has-post-thumbnail) .entry-content > :first-child {
+  margin-top: 0;
+}
+
 /*
  * Unset nested content selector styles
  * - Prevents layout styles from cascading too deeply

+ 10 - 2
modern-business/style.css

@@ -2333,14 +2333,14 @@ body.page .main-navigation {
 }
 
 .entry .entry-header {
-  margin: calc(3 * 1rem) 1rem 1rem;
+  margin: calc(3 * 1rem) 1rem 32px;
   position: relative;
   text-align: center;
 }
 
 @media only screen and (min-width: 768px) {
   .entry .entry-header {
-    margin: calc(3 * 1rem) calc(10% + 60px) 1rem;
+    margin: calc(3 * 1rem) calc(10% + 60px) 32px;
   }
 }
 
@@ -2348,6 +2348,7 @@ body.page .main-navigation {
   font-size: 1.6875em;
   font-weight: 300;
   margin: 0;
+  margin-bottom: 32px;
   text-align: center;
 }
 
@@ -3494,6 +3495,13 @@ body.page .main-navigation {
   }
 }
 
+/*
+ * Make sure the first block has margin-top: 0
+ */
+.entry:not(.has-post-thumbnail) .entry-content > :first-child {
+  margin-top: 0;
+}
+
 /*
  * Unset nested content selector styles
  * - Prevents layout styles from cascading too deeply