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:
parent
e04e75adf3
commit
9274564162
|
@ -2,7 +2,11 @@
|
|||
|
||||
|
||||
body {
|
||||
padding: 70px 0 30px 0;
|
||||
padding: 0 0 30px;
|
||||
}
|
||||
|
||||
body.navbar-spacing {
|
||||
padding-top: 70px;
|
||||
}
|
||||
|
||||
.navbar-nav {
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
<style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style>
|
||||
<![endif]-->
|
||||
</head>
|
||||
<body role="document">
|
||||
<body role="document" class="navbar-spacing">
|
||||
<nav class="navbar navbar-default navbar-fixed-top">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
<![endif]-->
|
||||
</head>
|
||||
<body role="document">
|
||||
<nav class="navbar navbar-default navbar-fixed-top">
|
||||
<nav class="navbar navbar-default">
|
||||
<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">
|
||||
|
@ -60,9 +60,6 @@
|
|||
<li><a href="#" onclick="$('#pasteExpiration').val('{$key}');$('#pasteExpirationDisplay').text('{$value}');return false;">{$value}</a></li>{/loop}
|
||||
</ul>
|
||||
</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>
|
||||
<div id="burnafterreadingoption" class="navbar-text checkbox hidden">
|
||||
<label>
|
||||
|
@ -78,9 +75,7 @@
|
|||
{function="t('Open discussion')"}
|
||||
</label>
|
||||
</div>
|
||||
</li>{/if}
|
||||
</ul>
|
||||
</li>{if="$PASSWORD"}
|
||||
</li>{/if}{if="$PASSWORD"}
|
||||
<li>
|
||||
<div id="password" class="navbar-form hidden">
|
||||
<input type="password" id="passwordinput" placeholder="{function="t('Password (recommended)')"}" class="form-control" size="19"/>
|
||||
|
|
Loading…
Reference in New Issue