From 17976dbece9f73b392e23d21c8e8285739194ef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20Mendon=C3=A7a?= <ped.gaspar@gmail.com>
Date: Sun, 3 Sep 2023 12:29:09 +0100
Subject: [PATCH 1/2] Use GP buttons (small) for action links in projects,
 glossary and translation sets

---
 assets/css/style.css           | 29 +++++-----------
 gp-templates/glossary-view.php |  4 +--
 gp-templates/project.php       | 61 ++++++++++++++++++----------------
 gp-templates/projects.php      | 47 ++++++++++++++++++++------
 gp-templates/translations.php  |  4 +--
 5 files changed, 82 insertions(+), 63 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index cb1001df6..33da653a5 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -249,7 +249,7 @@ h3 {
 
 .gp-heading {
 	display: flex;
-	align-items: baseline;
+	align-items: center;
 	gap: 0.2em;
 	margin: 0 0 1rem 0;
 }
@@ -1079,7 +1079,7 @@ span.context {
 	margin: 1rem 0;
 }
 
-a.bubble, .bubble {
+.bubble {
 	font-size: 80%;
 	color: white;
 	padding: 0.2em 0.3em 0.1em 0.2em;
@@ -1087,25 +1087,8 @@ a.bubble, .bubble {
 	text-align: center;
 }
 
-a.bubble.action.edit {
-	background-color: var( --gp-color-btn-bg );
-	color: var( --gp-color-btn-text );
-	border: 1px solid var( --gp-color-btn-border );
-	display: inline-flex;
-	border-radius: 2px;
-	box-shadow: none;
+a.button.action.edit {
 	margin: 0 0 0 0.2rem;
-	cursor: pointer;
-	outline: 0;
-	white-space: nowrap;
-	vertical-align: middle;
-}
-
-a.bubble.action.edit:hover, a.bubble.action.edit:focus {
-	background-color: var( --gp-color-btn-hover-bg );
-	color: var( --gp-color-btn-hover-text );
-	border-color: var( --gp-color-btn-hover-border );
-	box-shadow: 0 0 0 1px var( --gp-color-btn-hover-border );
 }
 
 span.inactive {
@@ -1407,6 +1390,7 @@ a.project-actions {
 	margin-left: -24em;
 }
 
+#projects dd,
 #sub-projects dd {
 	font-size: 0.75em;
 	line-height: 1.3em;
@@ -1414,18 +1398,22 @@ a.project-actions {
 	margin: 0;
 }
 
+#projects dl,
 #sub-projects dl {
 	margin-left: 0.5em;
 }
 
+#projects dt,
 #sub-projects dt {
 	margin-top: 0.5em;
 }
 
+#projects a,
 #sub-projects a {
 	font-weight: bold;
 }
 
+#projects a.action,
 #sub-projects a.action {
 	font-weight: normal;
 }
@@ -1604,6 +1592,7 @@ table.form-table td {
 }
 
 @media (max-width: 799px) {
+	#projects,
 	#sub-projects {
 		float: none;
 		width: auto;
diff --git a/gp-templates/glossary-view.php b/gp-templates/glossary-view.php
index 061c250e6..65348fd9e 100644
--- a/gp-templates/glossary-view.php
+++ b/gp-templates/glossary-view.php
@@ -37,8 +37,8 @@
 		);
 		?>
 	</h2>
-	<?php gp_link_glossary_edit( $glossary, $translation_set, _x( '(edit)', 'glossary', 'glotpress' ) ); ?>
-	<?php gp_link_glossary_delete( $glossary, $translation_set, _x( '(delete)', 'glossary', 'glotpress' ) ); ?>
+	<?php gp_link_glossary_edit( $glossary, $translation_set, null, array( 'class' => 'button is-small' ) ); ?>
+	<?php gp_link_glossary_delete( $glossary, $translation_set, null, array( 'class' => 'button is-small' ) ); ?>
 </div>
 
 <?php
diff --git a/gp-templates/project.php b/gp-templates/project.php
index c2fce22cf..495363b03 100644
--- a/gp-templates/project.php
+++ b/gp-templates/project.php
@@ -8,8 +8,8 @@
 );
 gp_breadcrumb_project( $project );
 gp_enqueue_scripts( array( 'gp-editor', 'tablesorter' ) );
-$edit_link   = gp_link_project_edit_get( $project, _x( '(edit)', 'project', 'glotpress' ) );
-$delete_link = gp_link_project_delete_get( $project, _x( '(delete)', 'project', 'glotpress' ) );
+$edit_link   = gp_link_project_edit_get( $project, null, array( 'class' => 'button is-small' ) );
+$delete_link = gp_link_project_delete_get( $project, null, array( 'class' => 'button is-small' ) );
 
 if ( ! $project->active ) {
 	add_filter(
@@ -183,34 +183,39 @@ function( $items ) {
 
 <?php if ( $sub_projects ) : ?>
 <div id="sub-projects">
-<h3><?php _e( 'Sub-projects', 'glotpress' ); ?></h3>
-<dl>
-<?php foreach ( $sub_projects as $sub_project ) : ?>
-	<dt>
-		<?php gp_link_project( $sub_project, esc_html( $sub_project->name ) ); ?>
-		<?php gp_link_project_edit( $sub_project, null, array( 'class' => 'bubble' ) ); ?>
-		<?php gp_link_project_delete( $sub_project, null, array( 'class' => 'bubble' ) ); ?>
-		<?php
-		if ( ! $sub_project->active ) {
-			echo "<span class='inactive bubble'>" . __( 'Inactive', 'glotpress' ) . '</span>';
+	<h3><?php _e( 'Sub-projects', 'glotpress' ); ?></h3>
+	<dl>
+	<?php
+		foreach ( $sub_projects as $sub_project ) {
+			$sub_project_class = $sub_project->active ? 'project-active' : 'project-inactive';
+			?>
+			<dt class="<?php echo esc_attr( $sub_project_class ); ?>">
+				<?php gp_link_project( $sub_project, esc_html( $sub_project->name ) ); ?>
+				<?php gp_link_project_edit( $sub_project, null, array( 'class' => 'button is-small' ) ); ?>
+				<?php gp_link_project_delete( $sub_project, null, array( 'class' => 'button is-small' ) ); ?>
+				<?php
+				if ( ! $sub_project->active ) {
+					echo "<span class='inactive bubble'>" . __( 'Inactive', 'glotpress' ) . '</span>';
+				}
+				?>
+			</dt>
+			<dd class="<?php echo esc_attr( $sub_project_class ); ?>">
+				<?php
+				/**
+				 * Filter a sub-project description.
+				 *
+				 * @since 1.0.0
+				 *
+				 * @param string     $description Sub-project description.
+				 * @param GP_Project $project     The sub-project.
+				 */
+				echo esc_html( gp_html_excerpt( apply_filters( 'gp_sub_project_description', $sub_project->description, $sub_project ), 111 ) );
+				?>
+			</dd>
+			<?php
 		}
 		?>
-	</dt>
-	<dd>
-		<?php
-		/**
-		 * Filter a sub-project description.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param string     $description Sub-project description.
-		 * @param GP_Project $project     The sub-project.
-		 */
-		echo esc_html( gp_html_excerpt( apply_filters( 'gp_sub_project_description', $sub_project->description, $sub_project ), 111 ) );
-		?>
-	</dd>
-<?php endforeach; ?>
-</dl>
+	</dl>
 </div>
 <?php endif; ?>
 
diff --git a/gp-templates/projects.php b/gp-templates/projects.php
index dcd8c0fe4..b8691a361 100644
--- a/gp-templates/projects.php
+++ b/gp-templates/projects.php
@@ -4,17 +4,42 @@
 gp_tmpl_header();
 ?>
 
-	<h2><?php _e( 'Projects', 'glotpress' ); ?></h2>
-
-	<ul>
-		<?php foreach ( $projects as $project ) : ?>
-			<li>
-				<?php gp_link_project( $project, esc_html( $project->name ) ); ?>
-				<?php gp_link_project_edit( $project, null, array( 'class' => 'bubble' ) ); ?>
-				<?php gp_link_project_delete( $project, null, array( 'class' => 'bubble' ) ); ?>
-			</li>
-		<?php endforeach; ?>
-	</ul>
+	<div id="projects">
+		<h2><?php _e( 'Projects', 'glotpress' ); ?></h2>
+		<dl>
+			<?php
+			foreach ( $projects as $project ) {
+				$project_class = $project->active ? 'project-active' : 'project-inactive';
+				?>
+				<dt class="<?php echo esc_attr( $project_class ); ?>">
+					<?php gp_link_project( $project, esc_html( $project->name ) ); ?>
+					<?php gp_link_project_edit( $project, null, array( 'class' => 'button is-small' ) ); ?>
+					<?php gp_link_project_delete( $project, null, array( 'class' => 'button is-small' ) ); ?>
+					<?php
+					if ( ! $project->active ) {
+						echo "<span class='inactive bubble'>" . __( 'Inactive', 'glotpress' ) . '</span>';
+					}
+					?>
+				</dt>
+				<dd class="<?php echo esc_attr( $project_class ); ?>">
+					<?php
+					/**
+					 * Filter a project description.
+					 *
+					 * @since 4.0.0
+					 *
+					 * @param string     $description Project description.
+					 * @param GP_Project $project     The project.
+					 */
+					echo esc_html( gp_html_excerpt( apply_filters( 'gp_project_description', $project->description, $project ), 111 ) );
+					?>
+				</dd>
+				<?php
+			}
+			?>
+		</dl>
+	</div>
+	<div class="clear"></div>
 
 	<p class="actionlist">
 		<?php if ( GP::$permission->current_user_can( 'admin' ) ) : ?>
diff --git a/gp-templates/translations.php b/gp-templates/translations.php
index cd8f0711e..efc0c9e0a 100644
--- a/gp-templates/translations.php
+++ b/gp-templates/translations.php
@@ -57,8 +57,8 @@
 		);
 		?>
 	</h2>
-	<?php gp_link_set_edit( $translation_set, $project, _x( '(edit)', 'translation set', 'glotpress' ) ); ?>
-	<?php gp_link_set_delete( $translation_set, $project, _x( '(delete)', 'translation set', 'glotpress' ) ); ?>
+	<?php gp_link_set_edit( $translation_set, $project, null, array( 'class' => 'button is-small' ) ); ?>
+	<?php gp_link_set_delete( $translation_set, $project, null, array( 'class' => 'button is-small' ) ); ?>
 	<div class="glossary-links">
 		<?php
 		$can_create_locale_glossary      = GP::$permission->current_user_can( 'admin' );

From 7583d1186ff01a41456a2961e1eadd41a223e81e Mon Sep 17 00:00:00 2001
From: pedro-mendonca <ped.gaspar@gmail.com>
Date: Thu, 14 Sep 2023 15:25:43 +0100
Subject: [PATCH 2/2] Consolidate all inactive bubble CSS

---
 assets/css/style.css | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index 33da653a5..deba3a774 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -237,12 +237,6 @@ h3 {
 	text-decoration: none;
 }
 
-.breadcrumb span.inactive {
-	padding: 0.2em 0.3em;
-	margin-left: .3em;
-	text-shadow: none;
-}
-
 /*
  * GP Heading
  */
@@ -1079,25 +1073,25 @@ span.context {
 	margin: 1rem 0;
 }
 
-.bubble {
-	font-size: 80%;
-	color: white;
-	padding: 0.2em 0.3em 0.1em 0.2em;
-	text-decoration: none;
-	text-align: center;
-}
-
 a.button.action.edit {
 	margin: 0 0 0 0.2rem;
 }
 
-span.inactive {
-	border: 1px solid var( --gp-color-bubble-inactive-project-text );
-	border-radius: 10px;
+span.bubble.inactive {
 	color: var( --gp-color-bubble-inactive-project-text );
-	padding: 0.2em 0.5em 0.1em 0.5em;
+	padding: 0.2em 0.5em;
+	border: 1px solid var( --gp-color-bubble-inactive-project-text );
+	border-radius: 1em;
+	text-decoration: none;
+	text-align: center;
+	text-shadow: none;
 	margin-left: 0.2rem;
 	font-weight: 500;
+	font-size: 80%;
+}
+
+.project-inactive span.bubble.inactive {
+	vertical-align: middle;
 }
 
 span.locale-entry.bubble {