<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[25217] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: first pass at adding editor stylesheet.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25217">25217</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-09-02 23:02:15 +0000 (Mon, 02 Sep 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Twenty Fourteen: first pass at adding editor stylesheet. Props Frank Klein, see <a href="http://core.trac.wordpress.org/ticket/25084">#25084</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteeneditorstylecss">trunk/src/wp-content/themes/twentyfourteen/editor-style.css</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteeneditorstylecss"></a>
<div class="addfile"><h4>Added: trunk/src/wp-content/themes/twentyfourteen/editor-style.css (0 => 25217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/editor-style.css                              (rev 0)
+++ trunk/src/wp-content/themes/twentyfourteen/editor-style.css 2013-09-02 23:02:15 UTC (rev 25217)
</span><span class="lines">@@ -0,0 +1,425 @@
</span><ins>+/*
+Theme Name: Twenty Fourteen
+Description: Used to style the TinyMCE editor.
+*/
+
+
+/**
+ * Table of Contents:
+ *
+ * 1.0 - Body
+ * 2.0 - Headings
+ * 3.0 - Text Elements
+ * 4.0 - Links
+ * 5.0 - Alignment
+ * 6.0 - Tables
+ * 7.0 - Images
+ * 8.0 - RTL
+ * ----------------------------------------------------------------------------
+ */
+
+
+/**
+ * 1.0 Body
+ * ----------------------------------------------------------------------------
+ */
+
+html .mceContentBody {
+       font-size: 100%;
+       max-width: 474px;
+}
+
+body {
+       color: #2b2b2b;
+       font-family: Lato, sans-serif;
+       line-height: 1.5;
+       text-rendering: optimizeLegibility;
+       vertical-align: baseline;
+}
+
+
+/**
+ * 2.0 Headings
+ * ----------------------------------------------------------------------------
+ */
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+       clear: both;
+       font-weight: 700;
+       margin: 0 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 {
+       font-size: 22px;
+       line-height: 1.0909090909;
+}
+
+h5 {
+       font-size: 18px;
+       line-height: 1.3333333333;
+}
+
+h6 {
+       font-size: 16px;
+       line-height: 1.5;
+}
+
+hr {
+       background-color: rgba(0, 0, 0, 0.1);
+       border: 0;
+       height: 1px;
+       margin-bottom: 23px;
+}
+
+
+/**
+ * 3.0 Text Elements
+ * ----------------------------------------------------------------------------
+ */
+
+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;
+}
+
+pre {
+       background: #eee;
+       font-family: 'Courier 10 Pitch', Courier, monospace;
+       font-size: 15px;
+       line-height: 1.6;
+       margin-bottom: 24px;
+       padding: 12px;
+       overflow: auto;
+       max-width: 100%;
+}
+
+blockquote,
+q {
+       quotes: none;
+}
+
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+       content: "";
+       content: none;
+}
+
+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;
+       line-height: 1.2631578947;
+}
+
+blockquote cite,
+blockquote small {
+       color: #2b2b2b;
+       font-size: 16px;
+       font-weight: 400;
+       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 {
+       font-style: normal;
+       margin: 0 0 24px;
+}
+
+del {
+       color: #333;
+}
+
+ins {
+       background: #fff9c0;
+       border: none;
+       color: #333;
+       text-decoration: none;
+}
+
+sub,
+sup {
+       font-size: 75%;
+       line-height: 0;
+       position: relative;
+       vertical-align: baseline;
+}
+
+sup {
+       bottom: 1ex;
+}
+
+sub {
+       top: .5ex;
+}
+
+
+/**
+ * 4.0 Links
+ * ----------------------------------------------------------------------------
+ */
+
+a {
+       color: #24890d;
+       text-decoration: none;
+}
+
+a:visited {
+       color: #24890d;
+}
+
+a:focus {
+       outline: thin dotted;
+}
+
+a:active,
+a:hover {
+       color: #5ff23d;
+       outline: 0;
+}
+
+/**
+ * 5.0 Alignment
+ * ----------------------------------------------------------------------------
+ */
+
+.alignleft {
+       float: left;
+       margin-right: 24px;
+}
+
+.alignright {
+       float: right;
+       margin-left: 24px;
+}
+
+.aligncenter {
+       clear: both;
+       display: block;
+       margin: 0 auto;
+}
+
+img.alignnone {
+       margin: 5px 0;
+}
+
+
+/**
+ * 6.0 Tables
+ * ----------------------------------------------------------------------------
+ */
+
+table {
+       border: 1px solid rgba(0, 0, 0, 0.1);
+       border-collapse: collapse;
+       border-spacing: 0;
+       font-size: 14px;
+       line-height: 1.2857142857;
+       margin-bottom: 24px;
+       width: 100%;
+}
+
+caption,
+th {
+       border-right: 1px solid rgba(0, 0, 0, 0.1);
+       font-weight: 700;
+       padding: 8px;
+       text-transform: uppercase;
+}
+
+td {
+       border-top: 1px solid rgba(0, 0, 0, 0.1);
+       border-right: 1px solid rgba(0, 0, 0, 0.1);
+       padding: 8px;
+}
+
+/**
+ * 7.0 Images
+ * ----------------------------------------------------------------------------
+ */
+
+img {
+       height: auto;
+       max-width: 474px;
+       vertical-align: middle;
+}
+
+.wp-caption {
+       background: transparent;
+       border: none;
+       margin: 0 0 24px 0;
+       padding: 0;
+       text-align: left;
+}
+
+.wp-caption.alignleft {
+       margin: 7px 24px 7px 0;
+}
+
+.wp-caption.alignright {
+       margin: 7px 0 7px 24px;
+}
+
+.wp-caption.aligncenter {
+       margin: 7px 0;
+}
+
+.wp-caption-dt {
+       margin: 0;
+}
+
+.wp-caption .wp-caption-text,
+.wp-caption-dd {
+       -moz-box-sizing: border-box;
+       box-sizing: border-box;
+       font-size: 12px;
+       font-style: italic;
+       line-height: 1.6666666666;
+       margin: 4px 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;
+}
+
+.mceTemp + ul,
+.mceTemp + ol  {
+       list-style-position: inside;
+}
+
+/**
+ * 8.0 RTL
+ * ----------------------------------------------------------------------------
+ */
+
+html .mceContentBody.rtl {
+       direction: rtl;
+       unicode-bidi: embed;
+}
+
+.rtl ol,
+.rtl ul {
+       margin-left: 0;
+       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;
+}
+
+.rtl td {
+       text-align: right;
+}
</ins><span class="cx">Property changes on: trunk/src/wp-content/themes/twentyfourteen/editor-style.css
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php (25216 => 25217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-09-02 22:02:15 UTC (rev 25216)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php    2013-09-02 23:02:15 UTC (rev 25217)
</span><span class="lines">@@ -50,6 +50,11 @@
</span><span class="cx">   */
</span><span class="cx">  load_theme_textdomain( 'twentyfourteen', get_template_directory() . '/languages' );
</span><span class="cx"> 
</span><ins>+       /*
+       * This theme styles the visual editor to resemble the theme style.
+       */
+       add_editor_style( array( 'editor-style.css', twentyfourteen_font_url() ) );
+
</ins><span class="cx">   // Adds RSS feed links to <head> for posts and comments.
</span><span class="cx">  add_theme_support( 'automatic-feed-links' );
</span><span class="cx"> 
</span><span class="lines">@@ -174,17 +179,21 @@
</span><span class="cx"> add_action( 'widgets_init', 'twentyfourteen_widgets_init' );
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Register Google fonts for Twenty Fourteen.
</del><ins>+ * Register Lato Google font for Twenty Fourteen.
</ins><span class="cx">  *
</span><span class="cx">  * @return void
</span><span class="cx">  */
</span><del>-function twentyfourteen_fonts() {
-       /* translators: If there are characters in your language that are not supported
-          by Lato, translate this to 'off'. Do not translate into your own language. */
</del><ins>+function twentyfourteen_font_url() {
+       $font_url = '';
+       /*
+        * Translators: If there are characters in your language that are not supported
+        * by Lato, translate this to 'off'. Do not translate into your own language.
+        */
</ins><span class="cx">   if ( 'off' !== _x( 'on', 'Lato font: on or off', 'twentyfourteen' ) )
</span><del>-               wp_register_style( 'twentyfourteen-lato', '//fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic', array(), null );
</del><ins>+                $font_url = add_query_arg( 'family', urlencode( 'Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic' ), "//fonts.googleapis.com/css" );
+
+       return $font_url;
</ins><span class="cx"> }
</span><del>-add_action( 'init', 'twentyfourteen_fonts' );
</del><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Enqueues scripts and styles for front end.
</span><span class="lines">@@ -212,6 +221,9 @@
</span><span class="cx">          wp_enqueue_script( 'jquery-masonry' );
</span><span class="cx"> 
</span><span class="cx">  wp_enqueue_script( 'twentyfourteen-theme', get_template_directory_uri() . '/js/theme.js', array( 'jquery' ), '20130820', true );
</span><ins>+
+       // Add Lato font used in the main stylesheet.
+       wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), null );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'wp_enqueue_scripts', 'twentyfourteen_scripts' );
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>