Browse Source

Merge pull request #1660 from Automattic/fix/varia-issue-1597

Varia: Adds support for left, center and right aligned lists.
Michael Cain 5 years ago
parent
commit
868eed093b
4 changed files with 62 additions and 19 deletions
  1. 20 10
      varia/sass/blocks/list/_editor.scss
  2. 12 5
      varia/sass/blocks/list/_style.scss
  3. 17 4
      varia/style-editor.css
  4. 13 0
      varia/style.css

+ 20 - 10
varia/sass/blocks/list/_editor.scss

@@ -1,14 +1,24 @@
-.block-library-list {
-	ul,
-	ol {
-		margin: #{map-deep-get($config-global, "spacing", "vertical")} 0;
-		padding-left: #{2 * map-deep-get($config-global, "spacing", "horizontal")};
+ul,
+ol {
+	margin: #{map-deep-get($config-global, "spacing", "vertical")} 0;
+	padding-left: #{2 * map-deep-get($config-global, "spacing", "horizontal")};
+
+	// Utility classes
+	&.aligncenter {
+		list-style-position: inside;
+		padding: 0;
+	}
+
+	&.alignright {
+		list-style-position: inside;
+		text-align: right;
+		padding: 0;
 	}
 	}
+}
 
 
-	li {
-		> ul,
-		> ol {
-			margin: 0;
-		}
+li {
+	> ul,
+	> ol {
+		margin: 0;
 	}
 	}
 }
 }

+ 12 - 5
varia/sass/blocks/list/_style.scss

@@ -3,6 +3,18 @@ ol {
 	@include font-family( map-deep-get($config-list, "font", "family") );
 	@include font-family( map-deep-get($config-list, "font", "family") );
 	margin: 0;
 	margin: 0;
 	padding-left: #{2 * map-deep-get($config-global, "spacing", "horizontal")};
 	padding-left: #{2 * map-deep-get($config-global, "spacing", "horizontal")};
+
+	// Utility classes
+	&.aligncenter {
+		list-style-position: inside;
+		padding: 0;
+	}
+
+	&.alignright {
+		list-style-position: inside;
+		text-align: right;
+		padding: 0;
+	}
 }
 }
 
 
 ul {
 ul {
@@ -13,11 +25,6 @@ ol {
 	list-style-type: decimal;
 	list-style-type: decimal;
 }
 }
 
 
-li > ul,
-li > ol {
-
-}
-
 dt {
 dt {
 	@include font-family( map-deep-get($config-global, "font", "family", "primary") );
 	@include font-family( map-deep-get($config-global, "font", "family", "primary") );
 	font-weight: bold;
 	font-weight: bold;

+ 17 - 4
varia/style-editor.css

@@ -754,14 +754,27 @@ object {
 	margin: 0;
 	margin: 0;
 }
 }
 
 
-.block-library-list ul,
-.block-library-list ol {
+ul,
+ol {
 	margin: 32px 0;
 	margin: 32px 0;
 	padding-left: 32px;
 	padding-left: 32px;
 }
 }
 
 
-.block-library-list li > ul,
-.block-library-list li > ol {
+ul.aligncenter,
+ol.aligncenter {
+	list-style-position: inside;
+	padding: 0;
+}
+
+ul.alignright,
+ol.alignright {
+	list-style-position: inside;
+	text-align: right;
+	padding: 0;
+}
+
+li > ul,
+li > ol {
 	margin: 0;
 	margin: 0;
 }
 }
 
 

+ 13 - 0
varia/style.css

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