Explorar el Código

fixing mobile navbar triggered issue and slight adjustement to bootstrap
template for using full width of browser for navbar

El RIDO hace 11 años
padre
commit
0686087cfd
Se han modificado 4 ficheros con 14 adiciones y 17 borrados
  1. 1 1
      css/bootstrap/zerobin.css
  2. 0 1
      js/zerobin.js
  3. 1 1
      tpl/bootstrap-compact.html
  4. 12 14
      tpl/bootstrap.html

+ 1 - 1
css/bootstrap/zerobin.css

@@ -10,7 +10,7 @@ body.navbar-spacing {
 }
 
 .navbar-nav {
-	margin: 0;
+	margin: 0 8px;
 }
 
 .dropdown-menu > li > label, .dropdown-menu > li > div {

+ 0 - 1
js/zerobin.js

@@ -1095,7 +1095,6 @@ $(function() {
             this.stateNewPaste();
             this.showStatus('', false);
             this.message.text('');
-            $('.navbar-toggle').click();
         },
 
         /**

+ 1 - 1
tpl/bootstrap-compact.html

@@ -38,7 +38,7 @@
 				</div>
 				<div id="navbar" class="navbar-collapse collapse">
 					<ul class="nav navbar-nav">
-						<li class="pr">
+						<li>
 							<button id="sendbutton" type="button" class="hidden btn btn-default navbar-btn">
 								<span class="glyphicon glyphicon-upload" aria-hidden="true"></span> {function="t('Send')"}
 							</button>

+ 12 - 14
tpl/bootstrap.html

@@ -26,7 +26,6 @@
 	</head>
 	<body role="document">
 		<nav class="navbar navbar-default navbar-static-top">
-			<div class="container">
 				<div class="navbar-header">
 					<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
 						<span class="sr-only">{function="t('Toggle navigation')"}</span>
@@ -38,7 +37,7 @@
 				</div>
 				<div id="navbar" class="navbar-collapse collapse">
 					<ul class="nav navbar-nav">
-						<li class="pr">
+						<li>
 							<button id="sendbutton" type="button" class="hidden btn btn-default navbar-btn">
 								<span class="glyphicon glyphicon-upload" aria-hidden="true"></span> {function="t('Send')"}
 							</button>
@@ -123,18 +122,17 @@
 {loop="LANGUAGES"}
 								<li>
 									<a href="#" class="reloadlink" onclick="document.cookie='lang={$key}';">
-										{$value[0]} ({$value[1]})
-									</a>
-								</li>{/loop}
-							</ul>
-						</li>{/if}
-						<li>
-							<button id="newbutton" type="button" class="reloadlink hidden btn btn-default navbar-btn">
-								<span class="glyphicon glyphicon-file" aria-hidden="true"></span> {function="t('New')"}
-							</button>
-						</li>
-					</ul>
-				</div>
+									{$value[0]} ({$value[1]})
+								</a>
+							</li>{/loop}
+						</ul>
+					</li>{/if}
+					<li>
+						<button id="newbutton" type="button" class="reloadlink hidden btn btn-default navbar-btn">
+							<span class="glyphicon glyphicon-file" aria-hidden="true"></span> {function="t('New')"}
+						</button>
+					</li>
+				</ul>
 			</div>
 		</nav>
 		<header class="container">{if="strlen($NOTICE)"}