StarMirror/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2024-03-22 13:10:41 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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">

39
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,27 +60,22 @@
<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"> <li>
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{function="t('Options')"} <span class="caret"></span></a> <div id="burnafterreadingoption" class="navbar-text checkbox hidden">
<ul class="dropdown-menu"> <label>
<li> <input type="checkbox" id="burnafterreading" name="burnafterreading" {if="$BURNAFTERREADINGSELECTED"} checked="checked"{/if} />
<div id="burnafterreadingoption" class="navbar-text checkbox hidden"> {function="t('Burn after reading')"}
<label> </label>
<input type="checkbox" id="burnafterreading" name="burnafterreading" {if="$BURNAFTERREADINGSELECTED"} checked="checked"{/if} /> </div>
{function="t('Burn after reading')"} </li>{if="$DISCUSSION"}
</label> <li>
</div> <div id="opendisc" class="navbar-text checkbox hidden">
</li>{if="$DISCUSSION"} <label>
<li> <input type="checkbox" id="opendiscussion" name="opendiscussion" {if="$OPENDISCUSSION"} checked="checked"{/if} />
<div id="opendisc" class="navbar-text checkbox hidden"> {function="t('Open discussion')"}
<label> </label>
<input type="checkbox" id="opendiscussion" name="opendiscussion" {if="$OPENDISCUSSION"} checked="checked"{/if} /> </div>
{function="t('Open discussion')"} </li>{/if}{if="$PASSWORD"}
</label>
</div>
</li>{/if}
</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"/>