1 files changed, 81 insertions, 14 deletions

diff --git a/themes/twentyfourteen/css/editor-blocks.css b/themes/twentyfourteen/css/editor-blocks.css
index 079896cb..e611e16b 100644
--- a/themes/twentyfourteen/css/editor-blocks.css
+++ b/themes/twentyfourteen/css/editor-blocks.css
@@ -12,6 +12,7 @@ Description: Used to style blocks in the editor.
 4.0 Blocks - Formatting
 5.0 Blocks - Layout Elements
 6.0 Blocks - Widgets
+7.0 Blocks - Colors
 --------------------------------------------------------------*/
 
 /*--------------------------------------------------------------
@@ -96,11 +97,7 @@ Description: Used to style blocks in the editor.
 .block-library-list ul,
 .edit-post-visual-editor ol,
 .editor-block-list__block ol,
-.block-library-list ol {
-	margin: 0 0 1.6em 1.3333em;
-	padding: 0;
-}
-
+.block-library-list ol,
 .block-library-list .editor-rich-text__tinymce {
 	padding: 0;
 }
@@ -131,14 +128,22 @@ Description: Used to style blocks in the editor.
 	margin-bottom: 0;
 }
 
-.rtl .edit-post-visual-editor ul:not(.wp-block-gallery),
-.rtl .editor-block-list__block ul:not(.wp-block-gallery),
-.rtl .block-library-list ul,
-.rtl .edit-post-visual-editor ol,
-.rtl .editor-block-list__block ol,
-.rtl .block-library-list ol {
+.rtl .editor-styles-wrapper ul ul,
+.rtl .editor-styles-wrapper ol ol,
+.rtl .editor-styles-wrapper ul ol,
+.rtl .editor-styles-wrapper ol ul {
 	margin-left: 0;
-	margin-right: 1.3333em;
+	margin-right: 20px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce ul,
+.wp-block-freeform.block-library-rich-text__tinymce ol {
+	padding-left: 20px;
+}
+
+.rtl .wp-block-freeform.block-library-rich-text__tinymce ul,
+.rtl .wp-block-freeform.block-library-rich-text__tinymce ol {
+	padding: 0;
 }
 
 /* Code */
@@ -345,13 +350,17 @@ p.has-drop-cap:not(:focus)::first-letter {
 4.0 Blocks - Formatting
 --------------------------------------------------------------*/
 
-/* Code */
+/* Code (Added specficity required to override TinyMCE styles) */
 
-.wp-block-code {
+.editor-styles-wrapper .wp-block-code {
 	border: 0;
 	padding: 0;
 }
 
+.editor-styles-wrapper .wp-block-code code {
+	font-size: inherit;
+}
+
 /* Pullquote */
 
 .wp-block-pullquote {
@@ -382,6 +391,12 @@ p.has-drop-cap:not(:focus)::first-letter {
 	}
 }
 
+/* Verse */
+
+.editor-styles-wrapper .wp-block-verse {
+	font-family: inherit;
+}
+
 /*--------------------------------------------------------------
 5.0 Blocks - Layout Elements
 --------------------------------------------------------------*/
@@ -482,3 +497,55 @@ p.has-drop-cap:not(:focus)::first-letter {
 	margin-left: 0;
 	margin-right: 0;
 }
+
+/*--------------------------------------------------------------
+7.0 Blocks - Colors
+--------------------------------------------------------------*/
+
+:root .editor-styles-wrapper .has-green-color {
+	color: #24890d;
+}
+
+:root .editor-styles-wrapper .has-green-background-color {
+	background-color: #24890d;
+}
+
+:root .editor-styles-wrapper .has-black-color {
+	color: #000;
+}
+
+:root .editor-styles-wrapper .has-black-background-color {
+	background-color: #000;
+}
+
+:root .editor-styles-wrapper .has-dark-gray-color {
+	color: #2b2b2b;
+}
+
+:root .editor-styles-wrapper .has-dark-gray-background-color {
+	background-color: #2b2b2b;
+}
+
+:root .editor-styles-wrapper .has-medium-gray-color {
+	color: #767676;
+}
+
+:root .editor-styles-wrapper .has-medium-gray-background-color {
+	background-color: #767676;
+}
+
+:root .editor-styles-wrapper .has-light-gray-color {
+	color: #f5f5f5;
+}
+
+:root .editor-styles-wrapper .has-light-gray-background-color {
+	background-color: #f5f5f5;
+}
+
+:root .editor-styles-wrapper .has-white-color {
+	color: #fff;
+}
+
+:root .editor-styles-wrapper .has-white-background-color {
+	background-color: #fff;
+}