From cc8c8f1f0ff53449f83ed04042f3de4a6d28789a Mon Sep 17 00:00:00 2001
From: lancewillett <lancewillett@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 2 Aug 2012 21:06:03 +0000
Subject: [PATCH] Twenty Twelve: update editor stylesheet, props obenland. See
 #21376.

git-svn-id: http://core.svn.wordpress.org/trunk@21409 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 editor-style.css | 65 ++++++++++++++++++++++++++++++++++--------------
 style.css        |  6 +++--
 2 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/editor-style.css b/editor-style.css
index ad22f93b4..8ddb1d904 100644
--- a/editor-style.css
+++ b/editor-style.css
@@ -1,6 +1,6 @@
-/*
-Theme Name: Twenty Twelve
-Description: Used to style the TinyMCE editor.
+/**
+* Theme Name: Twenty Twelve
+* Description: Used to style the TinyMCE editor.
 */
 
 html {
@@ -19,7 +19,10 @@ body {
 	vertical-align: baseline;
 }
 
-/* Headings */
+
+/* =Headings
+-------------------------------------------------------------- */
+
 h1,
 h2,
 h3,
@@ -65,13 +68,17 @@ hr {
 	margin-bottom: 1.714285714rem;
 }
 
-/* Text elements */
+
+/* =Text elements
+-------------------------------------------------------------- */
+
 p {
 	line-height: 1.714285714;
 	margin: 0 0 24px;
 	margin: 0 0 1.714285714rem;
 }
-ul, ol {
+ul,
+ol {
 	margin: 0 0 24px;
 	margin: 0 0 1.714285714rem;
 	line-height: 1.714285714;
@@ -83,7 +90,10 @@ ul {
 ol {
 	list-style: decimal outside;
 }
-ul ul, ol ol, ul ol, ol ul {
+ul ul,
+ol ol,
+ul ol,
+ol ul {
 	margin-bottom: 0;
 }
 li {
@@ -107,7 +117,9 @@ dd {
 strong {
 	font-weight: bold;
 }
-cite, em, i {
+cite,
+em,
+i {
 	font-style: italic;
 }
 cite {
@@ -136,13 +148,18 @@ pre {
 	padding: 24px;
 	padding: 1.714285714rem;
 }
-code, kbd, samp, var {
+code,
+kbd,
+samp,
+var {
 	font-family: Consolas, Monaco, Lucida Console, monospace;
 	font-size: 12px;
 	font-size: 0.857142857rem;
 	line-height: 2;
 }
-abbr, acronym, dfn {
+abbr,
+acronym,
+dfn {
 	border-bottom: 1px dotted #666;
 	cursor: help;
 }
@@ -174,7 +191,7 @@ sup {
 sub {
 	bottom: -0.25em;
 }
-input[type=text] {
+input[type="text"] {
 	border: 1px solid #ccc;
 	border-radius: 3px;
 	font-family: inherit;
@@ -193,7 +210,10 @@ textarea {
 	width: 96%;
 }
 
-/* Links */
+
+/* =Links
+-------------------------------------------------------------- */
+
 a,
 a em,
 a strong {
@@ -206,10 +226,15 @@ a:hover {
 	color: #0f3647;
 }
 
-/* Alignment */
+
+/* =Alignment
+-------------------------------------------------------------- */
+
 .alignleft {
 	display: inline;
 	float: left;
+	margin: 12px 24px 12px 0;
+	margin: 0.857142857rem 1.714285714rem 0.857142857rem 0;
 }
 .alignright {
 	display: inline;
@@ -226,7 +251,10 @@ a:hover {
 	margin-bottom: 0.857142857rem;
 }
 
-/* Tables */
+
+/* =Tables
+-------------------------------------------------------------- */
+
 table {
 	border-bottom: 1px solid #ededed;
 	border-collapse: collapse;
@@ -257,7 +285,10 @@ td {
 	text-align: left;
 }
 
-/* Images */
+
+/* =Images
+-------------------------------------------------------------- */
+
 img {
 	border: 0;
 	border-radius: 3px;
@@ -271,10 +302,6 @@ img[class*="wp-image-"] {
 	height: auto;
 	max-width: 100%;
 }
-img.alignleft {
-	margin: 12px 24px 12px 0;
-	margin: 0.857142857rem 1.714285714rem 0.857142857rem 0;
-}
 img[class*="align"],
 img[class*="wp-image-"],
 img[class*="attachment-"] {
diff --git a/style.css b/style.css
index 3bb91b42a..d42ca464e 100644
--- a/style.css
+++ b/style.css
@@ -62,10 +62,12 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
 body {
 	line-height: 1;
 }
-ol, ul {
+ol,
+ul {
 	list-style: none;
 }
-blockquote, q {
+blockquote,
+q {
 	quotes: none;
 }
 blockquote:before,