Merge branch '1.8.x'

Author: boonebgorges

.gitignore

@@ -4,5 +4,6 @@ dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.env
 
 /vendor/

Gruntfile.js

@@ -81,10 +81,6 @@
 	display: block;
 }
 
-#wpadminbar .quicklinks > ul > li > a {
-	padding: 0 8px 0 7px;
-}
-
 #wpadminbar .menupop .ab-sub-wrapper,
 #wpadminbar .shortlink-input {
 	margin: 0;
@@ -170,7 +166,6 @@
 	position: relative;
 	float: left;
 	speak: none;
-	padding: 4px 0;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 	background-image: none !important;
@@ -275,14 +270,6 @@
 	min-width: 198px;
 }
 
-#wp-admin-bar-my-account > .ab-item:before {
-	content: "\f110";
-	top: 2px;
-	float: right;
-	margin-left: 6px;
-	margin-right: 0;
-}
-
 #wp-admin-bar-my-account.with-avatar > .ab-item:before {
 	display: none;
 	content: none;
@@ -397,8 +384,7 @@
 	margin: 6px 8px 0 -2px;
 }
 
-#wpadminbar #wp-admin-bar-my-sites > .ab-item:before,
-#wpadminbar #wp-admin-bar-site-name > .ab-item:before {
+#wpadminbar #wp-admin-bar-my-sites > .ab-item:before {
 	content: '\f112';
 	top: 2px;
 }
@@ -408,12 +394,6 @@
 	top: 2px;
 }
 
-#wpadminbar #wp-admin-bar-site-name > .ab-item:before {
-	content: "\f102";
-}
-
-
-
 /**
  * Comments
  */

assets/css/admin-bar-custom.css

@@ -438,41 +438,41 @@ h4.dashboard-panel-settings-subsection-heading {
 }
 
 .cboxo-dashboard-panel-icons-radios {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
-  gap: 2rem;
-  margin-top: 1rem;
-  max-width: 600px;
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
+	gap: 2rem;
+	margin-top: 1rem;
+	max-width: 600px;
 }
 
 .form-table td fieldset label.cboxol-dashboard-panel-icon-label {
-  display: flex;
-  align-items: center;
-  gap: 0.25rem;
-  text-align: center;
-  cursor: pointer;
+	display: flex;
+	align-items: center;
+	gap: 0.25rem;
+	text-align: center;
+	cursor: pointer;
 }
 
 .cboxol-dashboard-panel-icon-label input[type="radio"] {
-  margin: 0;
+	margin: 0;
 }
 
 .cboxol-dashboard-panel-icon-preview {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 48px;
-  height: 48px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 48px;
+	height: 48px;
 }
 
 .cboxol-dashboard-panel-icon-preview svg {
-  width: 32px;
-  height: 32px;
-  fill: currentColor;
+	width: 32px;
+	height: 32px;
+	fill: currentColor;
 }
 
 .cboxol-dashboard-panel-icon-name {
-  font-size: 0.875rem;
-  color: #333;
-  text-align: left;
+	font-size: 0.875rem;
+	color: #333;
+	text-align: left;
 }

assets/css/admin.css

@@ -3,6 +3,11 @@
 	position: relative;
 }
 
+.openlab-news-panel-content ul {
+	list-style: inherit;
+	padding-left: 20px;
+}
+
 .openlab-news-panel-content .panel-header {
 	background: #63e0d2;
 	background-size: auto 160px;
@@ -63,8 +68,8 @@
 	margin-top: 4px;
 }
 
-.openlab-news-panel-content .panel-column-container a {
-	color: #000;
+.openlab-news-panel-content .panel-header-content a {
+	color: inherit;
 }
 
 .openlab-news-panel-content .panel-column-container a:hover {

assets/css/dashboard-panel.css

@@ -51,12 +51,6 @@
 				typeObject = CBOXOLAcademicTypes.typesByMemberType[ memberType ][ i ];
 				$selector  = $( '.cboxol-academic-unit-selector-for-type-' + typeObject.slug );
 				$selector.show();
-
-				if ( 'required' === typeObject.status ) {
-					$selector.find( '.academic-unit-type-required-label' ).html( CBOXOLAcademicTypes.requiredLabel );
-				} else {
-					$selector.find( '.academic-unit-type-required-label' ).html( '' );
-				}
 			}
 		}
 	}

assets/img/my-openlab-icon.png

@@ -109,20 +109,30 @@ function PostSharingChoice( { instanceId, value, label, info, ...props } ) {
 	);
 }
 
+const templateEditorPostTypes = [ 'wp_template', 'wp_template_part' ]
+
 const OpenlabPostVisibilityPlugin = () => {
-  const isSiteEditor = useSelect( ( select ) => {
-    const editSite = select( 'core/edit-site' );
-    return !!editSite;
-  }, [] );
+	const isPostEditor = useSelect( ( select ) => {
+		const editPost = select( 'core/edit-post' )
+		const editor = select( 'core/editor' )
+
+		if ( ! editPost || ! editor || ! editor.getCurrentPostType ) {
+			return false
+		}
+
+		const postType = editor.getCurrentPostType()
 
-  return !isSiteEditor && <PostSharingOptions />;
-};
+		return !! postType && ! templateEditorPostTypes.includes( postType )
+	}, [] )
+
+	return isPostEditor ? <PostSharingOptions /> : null
+}
 
 const registerPostVisibility = () => {
-  registerPlugin( 'post-sharing-options', {
-    render: OpenlabPostVisibilityPlugin,
-    icon: 'visibility',
-  } );
-};
+	registerPlugin( 'post-sharing-options', {
+		render: OpenlabPostVisibilityPlugin,
+		icon: 'visibility',
+	} )
+}
 
 wp.domReady( registerPostVisibility );