Merge pull request #383 from bigbitecreative/1.8-changes

1.8 changes
Automattic · Apr 13, 2018 · b44031b · b44031b
2 parents 6da11ad + 0a453c1
commit b44031b
Show file tree

Hide file tree

Showing 31 changed files with 666 additions and 300 deletions.
diff --git a/assets/app.css b/assets/app.css
@@ -588,25 +588,21 @@
 
 .liveblog-entry {
   position: relative;
-  padding: 1rem;
   margin-bottom: 1rem; }
 
 .liveblog-meta {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-wrap: wrap;
-      flex-wrap: wrap;
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -ms-flex-wrap: nowrap;
+      flex-wrap: nowrap;
   -webkit-box-align: start;
       -ms-flex-align: start;
           align-items: flex-start;
   text-decoration: none; }
 
-.liveblog-meta-time {
-  display: block; }
-
-.liveblog-meta-author,
-.liveblog-meta-contributors {
+.liveblog-meta-authors,
+.liveblog-meta-author {
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
@@ -777,6 +773,12 @@
 .liveblog-image-upload-btn .dashicons {
   margin-right: .35rem; }
 
+@media (max-width: 47.49em) {
+  .liveblog-image-upload-btn-text {
+    display: none; }
+  .liveblog-image-upload-btn .dashicons {
+    margin-right: 0; } }
+
 .liveblog-image-upload-btn:hover {
   background-color: #fff;
   -webkit-transition: .25s background-color ease-in-out;
@@ -831,11 +833,9 @@
   margin-bottom: .8rem;
   border: 1px solid #bbb; }
 
-.liveblog-editor-container .public-DraftEditor-content {
-  background: #fff; }
-
+.liveblog-editor-container .public-DraftEditor-content,
 .liveblog-preview {
-  background: #f7f7f7; }
+  background: #fff; }
 
 .liveblog-entry-edit .liveblog-editor-container {
   margin: .8rem 0 0;
@@ -1028,7 +1028,7 @@
 
 .liveblog-editor-tab:hover,
 .liveblog-editor-tab.is-active {
-  background: #f7f7f7; }
+  background: #fff; }
 
 .liveblog-editor-tab.is-active::after {
   content: "";
@@ -1037,6 +1037,12 @@
   left: 0;
   width: 100%;
   height: 2px;
+  background: #fff; }
+
+.liveblog-editor-tab:first-child.is-active {
+  background: #f7f7f7; }
+
+.liveblog-editor-tab:first-child.is-active::after {
   background: #f7f7f7; }
 
 .liveblog-editor-tab:not(:last-child) {
@@ -1134,7 +1140,7 @@
   border: 1px solid black; }
 
 .Select:not(:last-child) {
-  margin-bottom: .5rem; }
+  margin-bottom: 1rem; }
 
 .Select.is-focused:not(.is-open) > .Select-control {
   border-color: #bbb;
@@ -1513,3 +1519,15 @@
 .liveblog-media-current-container img {
   max-width: 100%;
   max-height: 100%; }
+
+.liveblog-html-editor-container {
+  border: 1px solid #bbb;
+  margin-bottom: 1rem; }
+
+.liveblog-html-editor {
+  padding: .5rem;
+  background: #fff; }
+
+.ace_scroll-left {
+  -webkit-box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.25) !important;
+          box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.25) !important; }
diff --git a/assets/app.js b/assets/app.js
diff --git a/assets/app.js.map b/assets/app.js.map
diff --git a/assets/theme.css b/assets/theme.css
@@ -1,8 +1,10 @@
-/**
+/* *
 * Entries
 */
 
 .liveblog-entry {
+  display: flex;
+  padding: 1rem;
   background: #f7f7f7;
   border-top: 2px solid #eee;
   border-bottom: 2px solid #eee;
@@ -12,28 +14,22 @@
   border-top: 2px solid #111;
 }
 
-.liveblog-entry-edit {
-  margin-left: 60px;
-}
-
-@media (max-width: 58.74em) {
-  .liveblog-entry-edit {
-    margin-left: 0;
-  }
+.liveblog-meta {
+  color: #666;
 }
 
-.liveblog-entry-content {
-  padding-top: 10px;
-  padding-left: 60px;
+.liveblog-entry-aside {
+  flex-basis: 70px;
+  min-width: 70px;
+  margin-right: 10px;
 }
 
-.liveblog-meta {
-  color: #666;
+.liveblog-entry-main {
+  flex-grow: 1;
 }
 
-.entry-content .liveblog-meta-time {
-  -ms-flex-preferred-size: 60px;
-  flex-basis: 60px;
+.liveblog-entry-content * {
+  word-break: break-all;
 }
 
 .entry-content .liveblog-meta-time,
@@ -54,6 +50,10 @@
   margin-bottom: 5px;
 }
 
+.liveblog-meta-authors {
+  margin-bottom: .5rem;
+}
+
 .liveblog-meta-author {
   margin-right: 8px;
 }
@@ -70,16 +70,6 @@
   height: 30px;
 }
 
-.liveblog-entry-tools {
-  margin-left: 60px;
-}
-
-@media (max-width: 58.74em) {
-  .liveblog-entry-tools {
-    margin-left: 0;
-  }
-}
-
 .liveblog-hash {
   color: #21759b;
 }

diff --git a/classes/class-wpcom-liveblog-entry-extend-feature-authors.php b/classes/class-wpcom-liveblog-entry-extend-feature-authors.php
@@ -118,7 +118,8 @@ public function filter( $entry ) {
 		// Map the authors and store them on the object
 		// for use in another function, we need
 		// them to be lowercased.
-		$this->authors = array_map( array( $this, 'map_authors' ), get_users( $args ) );
+		$authors       = apply_filters( 'liveblog_author_list', get_users( $args ), '' );
+		$this->authors = array_map( array( $this, 'map_authors' ), $authors );
 
 		// Map over every match and apply it via the
 		// preg_replace_callback method.
@@ -241,7 +242,8 @@ public function get_authors( $term ) {
 		}
 
 		// Map the authors into the expected format.
-		$users = array_map( array( $this, 'map_ajax_authors' ),  get_users( $args ) );
+		$authors = apply_filters( 'liveblog_author_list', get_users( $args ), $term );
+		$users   = array_map( array( $this, 'map_ajax_authors' ), $authors );
 
 		return $users;
 	}
@@ -257,7 +259,7 @@ public function map_ajax_authors( $author ) {
 			'id' => $author->ID,
 			'key' => strtolower($author->user_nicename),
 			'name' => $author->display_name,
-			'avatar' => get_avatar( $author->ID, 20 ),
+			'avatar' => WPCOM_Liveblog::get_avatar( $author->ID, 20 ),
 		);
 	}