Commit 681af7af by Kálmán Viktor

dashboard: new navbar

- add logo instead of CIRCLE text
- make it smaller (45px)
parent 2b75c2fb
...@@ -23,6 +23,46 @@ html { ...@@ -23,6 +23,46 @@ html {
padding-right: 15px; padding-right: 15px;
} }
/* values for 45px tall navbar */
.navbar {
min-height: 45px;
}
.navbar-brand {
height: 45px;
padding: 12.5px 12.5px;
}
.navbar-toggle {
margin-top: 5.5px;
margin-bottom: 5.5px;
}
.navbar-form {
margin-top: 5.5px;
margin-bottom: 5.5px;
}
.navbar-btn {
margin-top: 5.5px;
margin-bottom: 5.5px;
}
.navbar-btn.btn-sm {
margin-top: 7.5px;
margin-bottom: 7.5px;
}
.navbar-btn.btn-xs {
margin-top: 11.5px;
margin-bottom: 11.5px;
}
.navbar-text {
margin-top: 12.5px;
margin-bottom: 12.5px;
}
/* --- */
/* Responsive: Portrait tablets and up */ /* Responsive: Portrait tablets and up */
@media screen and (min-width: 768px) { @media screen and (min-width: 768px) {
/* Let the jumbotron breathe */ /* Let the jumbotron breathe */
...@@ -33,6 +73,12 @@ html { ...@@ -33,6 +73,12 @@ html {
.body-content { .body-content {
padding: 0; padding: 0;
} }
.navbar-nav > li > a {
padding-top: 12.5px;
padding-bottom: 12.5px;
}
} }
.no-margin { .no-margin {
margin: 0!important; margin: 0!important;
...@@ -504,3 +550,7 @@ footer a, footer a:hover, footer a:visited { ...@@ -504,3 +550,7 @@ footer a, footer a:hover, footer a:visited {
#template-access-table th:last-child, #template-access-table td:last-child { #template-access-table th:last-child, #template-access-table td:last-child {
text-align: center; text-align: center;
} }
#notifications-button {
margin: 0;
}
...@@ -24,7 +24,9 @@ ...@@ -24,7 +24,9 @@
<body> <body>
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" href="{% url "dashboard.index" %}">CIRCLE</a> <a class="navbar-brand" href="{% url "dashboard.index" %}" style="padding: 10px 15px;">
<img src="{{ STATIC_URL}}dashboard/img/logo.png" style="height: 25px;"/>
</a>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment