dashboard: new navbar

- add logo instead of CIRCLE text - make it smaller (45px)

dashboard: new navbar
- add logo instead of CIRCLE text - make it smaller (45px)
681af7af · Kálmán Viktor · 2b75c2fb · 681af7af · 681af7af · 681af7af
Commit 681af7af authored May 06, 2014 by Kálmán Viktor
Hide whitespace changes
Inline Side-by-side

Showing with 53 additions and 1 deletions

circle/dashboard/static/dashboard/dashboard.css
+50 -0

circle/dashboard/static/dashboard/img/logo.png
+0 -0

circle/dashboard/templates/base.html
+3 -1

No files found.
--- a/circle/dashboard/static/dashboard/dashboard.css
+++ b/circle/dashboard/static/dashboard/dashboard.css
@@ -23,6 +23,46 @@ html {
  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 */
 @media screen and (min-width: 768px) {
  /* Let the jumbotron breathe */
@@ -33,6 +73,12 @@ html {
  .body-content {
    padding: 0;
  }
+
+  .navbar-nav > li > a {
+    padding-top: 12.5px;
+    padding-bottom: 12.5px;
+  }
+
 }
 .no-margin {
  margin: 0!important;
@@ -504,3 +550,7 @@ footer a, footer a:hover, footer a:visited {
 #template-access-table th:last-child, #template-access-table td:last-child {
  text-align: center;
 }
+
+#notifications-button {
+  margin: 0;
+}
--- a/circle/dashboard/static/dashboard/img/logo.png
+++ b/circle/dashboard/static/dashboard/img/logo.png
--- a/circle/dashboard/templates/base.html
+++ b/circle/dashboard/templates/base.html
@@ -24,7 +24,9 @@
  <body>
    <div class="navbar navbar-inverse navbar-fixed-top">
        <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">
                <span class="icon-bar"></span>
                <span class="icon-bar"></span>