From 18a23e4c24f662d7abcc36299dd4eac498cb0a43 Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Tue, 22 Oct 2019 01:42:55 -0600
Subject: [PATCH] Update default theme/template.

---
 themes/default/app_config.php       |   2 +-
 themes/default/css.php              |  28 +++++++++++++++++-----------
 themes/default/images/logo_najo.png | Bin 0 -> 3225 bytes
 themes/default/template.php         |   8 ++++----
 4 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100755 themes/default/images/logo_najo.png

diff --git a/themes/default/app_config.php b/themes/default/app_config.php
index 9839fff219..e3ca281429 100644
--- a/themes/default/app_config.php
+++ b/themes/default/app_config.php
@@ -1810,7 +1810,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "button_icon_download";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "fas fa-cloud-download-alt";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "fas fa-download";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 		$y++;
diff --git a/themes/default/css.php b/themes/default/css.php
index eebe6b9fa2..b58956c0de 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -714,13 +714,6 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 
 /* BREAKPOINTS ****************************************************************/
 
-	/* hide button labels on medium and smaller screens (only if icons present) */
-	@media (max-width: 991.98px) {
-		button:not(.btn-link) > span.button-label.hide-md-dn {
-			display: none;
-			}
-	}
-
 	/* screens = extra small */
 	@media (max-width: 575.98px) {
 		.hide-xs,
@@ -765,6 +758,13 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 			}
 	}
 
+	/* hide button labels on medium and smaller screens (only if icons present) */
+	@media (max-width: 991.98px) {
+		button:not(.btn-link) > span.button-label.hide-md-dn {
+			display: none;
+			}
+	}
+
 /* ICONS *********************************************************************/
 
 	span.icon_body {
@@ -1328,7 +1328,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		box-shadow: 0 0 3px 0px rgba(255,0,0,0.9);
 		}
 
-	td.playback_progress_bar_background {
+	tr.playback_progress_bar_background {
 		padding: 0;
 		border-bottom: none;
 		background-image: -ms-linear-gradient(top, rgba(0,0,0,0.15) 0%, transparent 100%);
@@ -2132,7 +2132,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		position: relative;
 		}
 
-	div.form_set > .field.nowrap {
+	div.form_set > .field.no-wrap {
 		white-space: nowrap;
 		}
 
@@ -2141,6 +2141,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 	div.action_bar {
 		position: -webkit-sticky;
 		position: sticky;
+		z-index: 5;
 		<?php
 		switch ($_SESSION['theme']['menu_style']['text']) {
 			case 'side':
@@ -2245,8 +2246,8 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 
 	.list-row > .button {
 		margin: 0;
-		padding-top: 0;
-		padding-bottom: 0;
+		padding-top: 1px;
+		padding-bottom: 1px;
 		white-space: nowrap;
 		}
 
@@ -2273,4 +2274,9 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 	.list-header > .right,
 	.list-row > .right {
 		text-align: right !important;
+		}
+
+	.list-header > .no-wrap,
+	.list-row > .no-wrap {
+		white-space: nowrap;
 		}
\ No newline at end of file
diff --git a/themes/default/images/logo_najo.png b/themes/default/images/logo_najo.png
new file mode 100755
index 0000000000000000000000000000000000000000..63982c8093e9cd27f04c02d9db56dcbd0a70beb8
GIT binary patch
literal 3225
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
LNkvXXu0mjf=&m`m

literal 0
HcmV?d00001

diff --git a/themes/default/template.php b/themes/default/template.php
index de76d2385c..1c9d596c8f 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -329,10 +329,10 @@ echo "<script language='JavaScript' type='text/javascript' src='<!--{project_pat
 			if (recording_audio.paused) {
 				recording_audio.volume = 1;
 				recording_audio.play();
-				document.getElementById('recording_button_'+recording_id).innerHTML = "<?php echo str_replace("class='list_control_icon'", "class='list_control_icon' style='opacity: 1;'", $v_link_label_pause); ?>";
+				document.getElementById('recording_button_'+recording_id).innerHTML = "<span class='<?php echo $_SESSION['theme']['button_icon_pause']['text']; ?>'></span>";
 				audio_clock = setInterval(function () { update_progress(recording_id); }, 20);
 
-				$("[id*=recording_button]").not("[id*=recording_button_"+recording_id+"]").html("<?php echo $v_link_label_play; ?>");
+				$("[id*=recording_button]").not("[id*=recording_button_"+recording_id+"]").html("<span class='<?php echo $_SESSION['theme']['button_icon_play']['text']; ?>'></span>");
 				$("[id*=recording_progress_bar]").not("[id*=recording_progress_bar_"+recording_id+"]").css('display', 'none');
 
 				$('audio').each(function(){$('#menu_side_container').width()
@@ -344,7 +344,7 @@ echo "<script language='JavaScript' type='text/javascript' src='<!--{project_pat
 			}
 			else {
 				recording_audio.pause();
-				document.getElementById('recording_button_'+recording_id).innerHTML = "<?php echo $v_link_label_play; ?>";
+				document.getElementById('recording_button_'+recording_id).innerHTML = "<span class='<?php echo $_SESSION['theme']['button_icon_play']['text']; ?>'></span>";
 				clearInterval(audio_clock);
 			}
 		}
@@ -361,7 +361,7 @@ echo "<script language='JavaScript' type='text/javascript' src='<!--{project_pat
 			if (document.getElementById('recording_progress_bar_'+recording_id)) {
 				document.getElementById('recording_progress_bar_'+recording_id).style.display='none';
 			}
-			document.getElementById('recording_button_'+recording_id).innerHTML = "<?php echo $v_link_label_play; ?>";
+			document.getElementById('recording_button_'+recording_id).innerHTML = "<span class='<?php echo $_SESSION['theme']['button_icon_play']['text']; ?>'></span>";
 			clearInterval(audio_clock);
 		}