diff --git a/src/wp-content/themes/twentyfourteen/css/editor-style.css b/src/wp-content/themes/twentyfourteen/css/editor-style.css index 1487656f4e..047d7264f2 100644 --- a/src/wp-content/themes/twentyfourteen/css/editor-style.css +++ b/src/wp-content/themes/twentyfourteen/css/editor-style.css @@ -32,8 +32,8 @@ html .mceContentBody { body { color: #2b2b2b; font-family: Lato, sans-serif; + font-weight: 400; line-height: 1.5; - text-rendering: optimizeLegibility; vertical-align: baseline; } @@ -51,29 +51,29 @@ h5, h6 { clear: both; font-weight: 700; - margin: 0 0 12px; + margin: 36px 0 12px; } h1 { - font-size: 33px; - line-height: 1.0909090909; -} - -h2 { - font-size: 30px; - line-height: 1.2; -} - -h3 { font-size: 26px; line-height: 1.3846153846; } -h4 { +h2 { + font-size: 24px; + line-height: 1; +} + +h3 { font-size: 22px; line-height: 1.0909090909; } +h4 { + font-size: 20px; + line-height: 1.2; +} + h5 { font-size: 18px; line-height: 1.3333333333; @@ -84,11 +84,13 @@ h6 { line-height: 1.5; } -hr { - background-color: rgba(0, 0, 0, 0.1); - border: 0; - height: 1px; - margin-bottom: 23px; +h1:first-child, +h2:first-child, +h3:first-child, +h4:first-child, +h5:first-child, +h6:first-child { + margin-top: 0; } @@ -97,63 +99,62 @@ hr { * ---------------------------------------------------------------------------- */ +address { + font-style: italic; + margin-bottom: 24px; +} + +abbr[title] { + border-bottom: 1px dotted #2b2b2b; + cursor: help; +} + +b, +strong { + font-weight: 700; +} + +cite { + border: 0; +} + +cite, +dfn, +em, +i { + font-style: italic; +} + +mark, +ins { + background: #fff9c0; + text-decoration: none; +} + p { margin: 0 0 24px; } -ol, -ul { - margin: 0 0 24px 22px; - padding-left: 0; -} - -ul { - list-style-type: disc; -} - -ol { - list-style: decimal; -} - -li > ul, -li > ol { - margin-bottom: 0; - margin-left: 20px; -} - -dl { - margin: 0 20px; -} - -dt { - font-weight: bold; -} - -dd { - margin: 0 0 24px; -} - -strong { - font-weight: bold; -} - code, kbd, tt, var, -samp { - font: 15px/1.6 Monaco, Consolas, 'Andale Mono', 'DejaVu Sans Mono', monospace; +samp, +pre { + font-family: monospace, serif; + font-size: 15px; + line-height: 1.6; } pre { - background: #eee; - font-family: 'Courier 10 Pitch', Courier, monospace; - font-size: 15px; - line-height: 1.6; + border: 1px solid rgba(0, 0, 0, 0.1); margin-bottom: 24px; max-width: 100%; overflow: auto; padding: 12px; + white-space: pre; + white-space: pre-wrap; + word-wrap: break-word; } blockquote, @@ -170,19 +171,12 @@ q:after { } blockquote { - font-style: italic; - font-weight: 300; - margin: 0 0 24px; -} - -blockquote em, blockquote i, blockquote cite { - font-style: normal; -} - -blockquote p { color: #767676; font-size: 19px; + font-style: italic; + font-weight: 300; line-height: 1.2631578947; + margin: 0 0 24px; } blockquote cite, @@ -193,57 +187,29 @@ blockquote small { line-height: 1.5; } -blockquote.pull p { - margin-bottom: 17px; -} - -blockquote.pull.alignleft, -blockquote.pull.alignright { - border-top: 1px solid rgba(0, 0, 0, 0.1); - border-bottom: 1px solid rgba(0, 0, 0, 0.1); - padding-top: 17px; - width: 50%; -} - -blockquote.pull.alignleft { - margin: 7px 24px 7px 0; -} - -blockquote.pull.alignright { - margin: 7px 0 7px 24px; -} - -blockquote blockquote { - margin-right: 0; -} - -cite { - border-bottom: 0; -} - -abbr[title] { - border-bottom: 1px dotted rgba(0, 0, 0, 0.1); -} - -address { +blockquote em, +blockquote i, +blockquote cite { font-style: normal; - margin: 0 0 24px; } -del { - color: #333; +blockquote strong, +blockquote b { + font-weight: 400; } -ins { - background: #fff9c0; - border: none; - color: #333; - text-decoration: none; +small { + font-size: smaller; } -sub, -sup { +big { + font-size: 125%; +} + +sup, +sub { font-size: 75%; + height: 0; line-height: 0; position: relative; vertical-align: baseline; @@ -257,6 +223,49 @@ sub { top: .5ex; } +dl { + margin: 0 0 24px; +} + +dt { + font-weight: bold; +} + +dd { + margin: 0 0 24px; +} + +ul, +ol { + list-style: none; + margin: 0 0 24px 20px; + padding-left: 0; +} + +ul { + list-style: disc; +} + +ol { + list-style: decimal; +} + +li > ul, +li > ol { + margin: 0 0 0 20px; +} + +del { + color: #767676; +} + +hr { + background-color: rgba(0, 0, 0, 0.1); + border: 0; + height: 1px; + margin-bottom: 23px; +} + /** * 4.0 Links @@ -278,10 +287,11 @@ a:focus { a:active, a:hover { - color: #55d737; + color: #41a62a; outline: 0; } + /** * 5.0 Alignment * ---------------------------------------------------------------------------- @@ -289,22 +299,31 @@ a:hover { .alignleft { float: left; - margin-right: 24px; + margin: 7px 24px 7px 0; } .alignright { float: right; - margin-left: 24px; + margin: 7px 0 7px 24px; } .aligncenter { clear: both; display: block; - margin: 0 auto; + margin: 7px auto; } -img.alignnone { - margin: 5px 0; +blockquote.alignleft, +blockquote.alignright { + border-top: 1px solid rgba(0, 0, 0, 0.1); + border-bottom: 1px solid rgba(0, 0, 0, 0.1); + padding-top: 17px; + width: 50%; +} + +blockquote.alignleft p, +blockquote.alignright p { + margin-bottom: 17px; } @@ -313,9 +332,10 @@ img.alignnone { * ---------------------------------------------------------------------------- */ -table { +.mceItemTable { border: 1px solid rgba(0, 0, 0, 0.1); - border-collapse: collapse; + border-width: 1px 0 0 1px; + border-collapse: separate; border-spacing: 0; font-size: 14px; line-height: 1.2857142857; @@ -323,20 +343,27 @@ table { width: 100%; } -caption, -th { - border-right: 1px solid rgba(0, 0, 0, 0.1); +.mceItemTable th, +.mceItemTable caption { + border: 1px solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 0; font-weight: 700; padding: 8px; + text-align: left; text-transform: uppercase; + vertical-align: baseline; } -td { - border-top: 1px solid rgba(0, 0, 0, 0.1); - border-right: 1px solid rgba(0, 0, 0, 0.1); +.mceItemTable td { + border: 1px solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 0; + font-family: Lato, sans-serif; + font-size: 14px; padding: 8px; + vertical-align: baseline; } + /** * 7.0 Images * ---------------------------------------------------------------------------- @@ -351,18 +378,19 @@ img { .wp-caption { background: transparent; border: none; + color: #767676; margin: 0 0 24px 0; + max-width: 474px; padding: 0; text-align: left; - max-width: 474px; } .wp-caption.alignleft { - margin: 7px 24px 7px 0; + margin: 7px 14px 7px 0; } .wp-caption.alignright { - margin: 7px 0 7px 24px; + margin: 7px 0 7px 14px; } .wp-caption.aligncenter { @@ -375,12 +403,13 @@ img { .wp-caption .wp-caption-text, .wp-caption-dd { + -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; font-size: 12px; font-style: italic; - line-height: 1.6666666666; - margin: 4px 0; + line-height: 1.5; + margin: 9px 0; padding: 0 10px 0 0; /* Avoid the caption to overflow the width of the image because wp-caption has 10px wider width */ text-align: left; } @@ -390,6 +419,7 @@ img { list-style-position: inside; } + /** * 8.0 RTL * ---------------------------------------------------------------------------- @@ -406,16 +436,6 @@ html .mceContentBody.rtl { margin-right: 24px; } -.rtl blockquote.pull.alignleft { - margin-left: 24px; - margin-right: 0; -} - -.rtl blockquote.pull.alignright { - margin-left: 0; - margin-right: 24px; -} - .rtl .wp-caption, .rtl tr th { text-align: right;