navbar changes
This commit is contained in:
parent
6e79627331
commit
b88efdbbc7
@ -12,9 +12,9 @@
|
||||
<link rel="stylesheet" href="/css/labs.css">
|
||||
</head>
|
||||
<body>
|
||||
{{ block "navbar" . }}
|
||||
{{ block "navbar" . }}
|
||||
{{ partial "navbar" . }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-sm-3 col-md-2 collapse sidebar">
|
||||
|
@ -1,30 +1,14 @@
|
||||
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
|
||||
<div class="container-fluid">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle sidebar-toggle" data-toggle="collapse" data-target=".sidebar">
|
||||
<span class="sr-only">Toggle sidebar</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
|
||||
<button type="button" class="btn-default btn-sm navbar-toggle" data-toggle="collapse" data-target="#search">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="glyphicon glyphicon-search"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="/">
|
||||
{{ .Site.Title }}
|
||||
</a>
|
||||
</div>
|
||||
<div class="collapse navbar-collapse" id="search">
|
||||
<form class="navbar-form navbar-right" action="https://szukaj.wmi.amu.edu.pl/search/" method="GET">
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" name="q" placeholder="Search">
|
||||
<span class="input-group-btn">
|
||||
<button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
|
||||
</span>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
|
||||
<div class="container-fluid">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle sidebar-toggle" data-toggle="collapse" data-target=".sidebar">
|
||||
<span class="sr-only">Toggle sidebar</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -1,5 +1,23 @@
|
||||
{{ $currentPage := . }}
|
||||
<ul>
|
||||
<div class="sidebar-header">
|
||||
<a class="sidebar-brand" href="/">
|
||||
{{ .Site.Title }}
|
||||
</a>
|
||||
|
||||
<form class="sidebar-header sidebar-brand" action="https://szukaj.wmi.amu.edu.pl/search/" method="GET">
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" name="q" placeholder="Search">
|
||||
<span class="input-group-btn">
|
||||
<button type="submit" class="btn btn-default">
|
||||
<span class="glyphicon glyphicon-search"></span>
|
||||
</button>
|
||||
</span>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
{{ range .Site.Menus.main }}
|
||||
{{ if .HasChildren }}
|
||||
<li class="item {{ if $currentPage.IsMenuCurrent "main" . }}active{{ end }}"><a href="{{ .URL }}">{{ .Name }}</a>
|
||||
|
@ -51,13 +51,19 @@ pre {
|
||||
line-height: 1.7;
|
||||
}
|
||||
|
||||
.input-group {
|
||||
padding-right: 30px;
|
||||
padding-left: 20px;
|
||||
}
|
||||
|
||||
.navbar {
|
||||
|
||||
padding-left: 0px;
|
||||
padding-right: 20px;
|
||||
|
||||
letter-spacing: +.05rem;
|
||||
font-weight: bold;
|
||||
font-size: 1.8rem;
|
||||
background-color: #292929;
|
||||
|
||||
}
|
||||
|
||||
a:link {
|
||||
@ -89,15 +95,23 @@ a:hover {
|
||||
/*font-size: 2rem;*/
|
||||
}
|
||||
|
||||
.sidebar-header {
|
||||
color: #000;
|
||||
font-size: 3rem;
|
||||
text-align: center;
|
||||
letter-spacing: 0.3rem;
|
||||
font-weight: bold;
|
||||
padding-bottom: 10px;
|
||||
background-color: #ba3232;
|
||||
}
|
||||
|
||||
.sidebar-toggle {
|
||||
float: left;
|
||||
margin-left: 15px;
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
/*padding-top: 100px;*/
|
||||
margin-top: 5px;
|
||||
/*display: none;*/
|
||||
margin-top: -2px;
|
||||
position: fixed;
|
||||
top: 51px;
|
||||
bottom: 0;
|
||||
@ -122,10 +136,10 @@ a:hover {
|
||||
@media (min-width: 768px) {
|
||||
.sidebar {
|
||||
display: block;
|
||||
padding-top: 0px;
|
||||
}
|
||||
.navbar a {
|
||||
font-size: 2rem;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -136,6 +150,16 @@ a:hover {
|
||||
color: #ccc;
|
||||
}
|
||||
|
||||
|
||||
.sidebar-header a {
|
||||
color: #fff;
|
||||
|
||||
font-size: 3rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.sidebar ul {
|
||||
list-style-type: none;
|
||||
padding: 0;
|
||||
@ -173,7 +197,6 @@ a:hover {
|
||||
color: #fff;
|
||||
/* background-color: #ba3232;
|
||||
*/ font-weight: bold;
|
||||
|
||||
}
|
||||
|
||||
.main {
|
||||
@ -184,6 +207,9 @@ a:hover {
|
||||
padding-right: 80px;
|
||||
padding-left: 80px;
|
||||
}
|
||||
.navbar {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
.main .page-header {
|
||||
margin-top: 0;
|
||||
|
Loading…
Reference in New Issue
Block a user