소스 검색

Merge pull request #1718 from Automattic/fix/1670

Varia: only inherit top/bottom margin with cover images.
Michael Cain 5 년 전
부모
커밋
69f10cc077
5개의 변경된 파일21개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 0
      varia/sass/blocks/cover/_editor.scss
  2. 2 1
      varia/sass/blocks/cover/_style.scss
  3. 2 0
      varia/style-editor.css
  4. 13 0
      varia/style-rtl.css
  5. 2 1
      varia/style.css

+ 2 - 0
varia/sass/blocks/cover/_editor.scss

@@ -4,6 +4,8 @@
 	background-color: #{map-deep-get($config-cover, "color", "background")};
 	color: #{map-deep-get($config-cover, "color", "foreground")};
 	min-height: #{map-deep-get($config-cover, "height")};
+	margin-top: inherit;
+	margin-bottom: inherit;
 
 	.wp-block-cover__inner-container,
 	.wp-block-cover-image-text,

+ 2 - 1
varia/sass/blocks/cover/_style.scss

@@ -3,7 +3,8 @@
 
 	background-color: #{map-deep-get($config-cover, "color", "background")};
 	min-height: #{map-deep-get($config-cover, "height")};
-	margin: inherit;
+	margin-top: inherit;
+	margin-bottom: inherit;
 
 	.wp-block-cover__inner-container,
 	.wp-block-cover-image-text,

+ 2 - 0
varia/style-editor.css

@@ -568,6 +568,8 @@ object {
 	background-color: black;
 	color: white;
 	min-height: 480px;
+	margin-top: inherit;
+	margin-bottom: inherit;
 	/* default & custom background-color */
 	/* Treating H2 separately to account for legacy /core styles */
 }

+ 13 - 0
varia/style-rtl.css

@@ -1952,6 +1952,19 @@ ol {
 	padding-right: 32px;
 }
 
+ul.aligncenter,
+ol.aligncenter {
+	list-style-position: inside;
+	padding: 0;
+}
+
+ul.alignright,
+ol.alignright {
+	list-style-position: inside;
+	text-align: left;
+	padding: 0;
+}
+
 ul {
 	list-style-type: disc;
 }

+ 2 - 1
varia/style.css

@@ -1541,7 +1541,8 @@ button[data-load-more-btn] {
 .wp-block-cover-image {
 	background-color: black;
 	min-height: 480px;
-	margin: inherit;
+	margin-top: inherit;
+	margin-bottom: inherit;
 	/* default & custom background-color */
 	/* Treating H2 separately to account for legacy /core styles */
 	/**