From f25661beda3f88a11c9eb8015af77a12d52f8830 Mon Sep 17 00:00:00 2001 From: El RIDO Date: Thu, 17 Sep 2015 21:55:28 +0200 Subject: [PATCH] Working on #28, changing template to avoid multi-line navbar: - moved "burn after reading" & "discussion" into "options" menu in "bootstrap" template - added seperate "bootstrap-compact" template that also moves the formats into the same "options" menu - fixing horizontal scroll bar glitch in mobile navbar --- css/bootstrap/zerobin.css | 23 ++++++ i18n/de.json | 3 +- i18n/fr.json | 3 +- i18n/pl.json | 3 +- tpl/bootstrap-compact.html | 163 +++++++++++++++++++++++++++++++++++++ tpl/bootstrap.html | 37 +++++---- 6 files changed, 213 insertions(+), 19 deletions(-) create mode 100644 tpl/bootstrap-compact.html diff --git a/css/bootstrap/zerobin.css b/css/bootstrap/zerobin.css index a7cd0ff..114b1ad 100644 --- a/css/bootstrap/zerobin.css +++ b/css/bootstrap/zerobin.css @@ -5,6 +5,29 @@ body { padding: 70px 0 30px 0; } +.navbar-nav { + margin: 0; +} + +.dropdown-menu > li > label, .dropdown-menu > li > div { + clear: both; + display: block; + font-weight: normal; + line-height: 1.42857; + white-space: nowrap; +} + +.dropdown-menu > li > label { + color: #333; + padding: 3px 20px 3px 40px; +} + +.dropdown-menu > li > div { + color: #777; + padding: 3px 20px; + cursor: default; +} + #deletelink { float: right; } diff --git a/i18n/de.json b/i18n/de.json index 2e18c06..66d6859 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -134,5 +134,6 @@ "Remove attachment": "Anhang entfernen", "Your browser does not support uploading encrypted files. Please use a newer browser.": "Dein Browser unterstützt das hochladen von verschlüsselten Dateien nicht. Bitte verwende einen neueren Browser.", - "Invalid attachment.": "Ungültiger Datei-Anhang." + "Invalid attachment.": "Ungültiger Datei-Anhang.", + "Options": "Optionen" } diff --git a/i18n/fr.json b/i18n/fr.json index 56cd3c6..c41f919 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -143,5 +143,6 @@ "Remove attachment": "Remove attachment", "Your browser does not support uploading encrypted files. Please use a newer browser.": "Your browser does not support uploading encrypted files. Please use a newer browser.", - "Invalid attachment.": "Invalid attachment." + "Invalid attachment.": "Invalid attachment.", + "Options": "Options" } diff --git a/i18n/pl.json b/i18n/pl.json index 1463ce0..1497e18 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -134,5 +134,6 @@ "Remove attachment": "Remove attachment", "Your browser does not support uploading encrypted files. Please use a newer browser.": "Your browser does not support uploading encrypted files. Please use a newer browser.", - "Invalid attachment.": "Invalid attachment." + "Invalid attachment.": "Invalid attachment.", + "Options": "Options" } diff --git a/tpl/bootstrap-compact.html b/tpl/bootstrap-compact.html new file mode 100644 index 0000000..e049aaa --- /dev/null +++ b/tpl/bootstrap-compact.html @@ -0,0 +1,163 @@ + + + + + + + + {function="t('ZeroBin')"} + + + {if="$SYNTAXHIGHLIGHTING"} + {if="strlen($SYNTAXHIGHLIGHTINGTHEME)"} + {/if}{/if} + + + + + + {if="$SYNTAXHIGHLIGHTING"} + {/if}{if="$MARKDOWN"} + {/if} + + + + + +
{if="strlen($NOTICE)"} + {/if} + {if="strlen($STATUS)"} + {/if} + + + + + +
+
+
+ + +

+
+
+
+ +
+ + + + diff --git a/tpl/bootstrap.html b/tpl/bootstrap.html index aba36ff..974bb4f 100644 --- a/tpl/bootstrap.html +++ b/tpl/bootstrap.html @@ -60,22 +60,27 @@
  • {$value}
    • {/loop} -
  • - -
    • {if="$DISCUSSION"} -
  • - -
    • {/if}{if="$PASSWORD"} +
  • + + +
    • {if="$PASSWORD"}