chalec
/
ctrlv-privatebin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intermediate step for #28: revert bootstrap template, but ensuring that 

the navbar does not overlap by removing its float on top property.
bootstrap-compact is now the template with the floating & always visible
navbar.
This commit is contained in:
El RIDO 2015-09-18 09:31:17 +02:00
parent e04e75adf3
commit 9274564162
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/bootstrap/zerobin.css
View File

@ -2,7 +2,11 @@
body { body {
padding: 70px 0 30px 0; padding: 0 0 30px;
}
body.navbar-spacing {
padding-top: 70px;
} }
.navbar-nav { .navbar-nav {

2
tpl/bootstrap-compact.html
View File

@ -24,7 +24,7 @@
<style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style> <style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style>
<![endif]--> <![endif]-->
</head> </head>
<body role="document"> <body role="document" class="navbar-spacing">
<nav class="navbar navbar-default navbar-fixed-top"> <nav class="navbar navbar-default navbar-fixed-top">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">

9
tpl/bootstrap.html
View File

@ -25,7 +25,7 @@
<![endif]--> <![endif]-->
</head> </head>
<body role="document"> <body role="document">
<nav class="navbar navbar-default navbar-fixed-top"> <nav class="navbar navbar-default">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@ -60,9 +60,6 @@
<li><a href="#" onclick="$('#pasteExpiration').val('{$key}');$('#pasteExpirationDisplay').text('{$value}');return false;">{$value}</a></li>{/loop} <li><a href="#" onclick="$('#pasteExpiration').val('{$key}');$('#pasteExpirationDisplay').text('{$value}');return false;">{$value}</a></li>{/loop}
</ul> </ul>
</li> </li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{function="t('Options')"} <span class="caret"></span></a>
<ul class="dropdown-menu">
<li> <li>
<div id="burnafterreadingoption" class="navbar-text checkbox hidden"> <div id="burnafterreadingoption" class="navbar-text checkbox hidden">
<label> <label>
@ -78,9 +75,7 @@
{function="t('Open discussion')"} {function="t('Open discussion')"}
</label> </label>
</div> </div>
</li>{/if} </li>{/if}{if="$PASSWORD"}
</ul>
</li>{if="$PASSWORD"}
<li> <li>
<div id="password" class="navbar-form hidden"> <div id="password" class="navbar-form hidden">
<input type="password" id="passwordinput" placeholder="{function="t('Password (recommended)')"}" class="form-control" size="19"/> <input type="password" id="passwordinput" placeholder="{function="t('Password (recommended)')"}" class="form-control" size="19"/>