From aec974a1011a0d82e940f1e17cdb9f0137998be4 Mon Sep 17 00:00:00 2001
From: Anton Akhmerov <anton.akhmerov@gmail.com>
Date: Fri, 4 Dec 2015 22:26:04 +0100
Subject: [PATCH] change navbar style (should help with #10)
---
themes/kwant/assets/css/custom.css | 47 ++++++++++++++----------------
themes/kwant/templates/base.tmpl | 34 +++++++--------------
2 files changed, 33 insertions(+), 48 deletions(-)
diff --git a/themes/kwant/assets/css/custom.css b/themes/kwant/assets/css/custom.css
index f46322f..cd8efa7 100644
--- a/themes/kwant/assets/css/custom.css
+++ b/themes/kwant/assets/css/custom.css
@@ -1,28 +1,3 @@
-.navbar-header {
- float: left;
- padding: 15px;
- text-align: center;
- width: 100%;
-}
-
-.navbar-brand {float:none;}
-
-.navbar-nav {
- margin: 0 auto;
- display: table;
- table-layout: auto;
- float: none;
-}
-.navbar-nav>li {
- display: table-cell;
- float: none;
- text-align: center;
-}
-
-.navbar-nav > li > a:hover {
- text-decoration:underline;
-}
-
h1 {
text-align: center;
}
@@ -57,3 +32,25 @@ tt, pre {
-o-hyphens: none;
hyphens: none;
}
+
+.navbar-nav>li {
+ display: table-cell;
+ text-align: center;
+}
+
+.navbar-nav > li > a:hover {
+ text-decoration:underline;
+}
+
+.navbar-brand {
+ float: none;
+}
+
+.navbar-collapse {
+ text-align:center;
+}
+
+.navbar-nav {
+ display:inline-block;
+ float:none;
+}
diff --git a/themes/kwant/templates/base.tmpl b/themes/kwant/templates/base.tmpl
index 75b51ff..396ffcb 100644
--- a/themes/kwant/templates/base.tmpl
+++ b/themes/kwant/templates/base.tmpl
@@ -12,29 +12,18 @@
<a href="#content" class="sr-only sr-only-focusable">{{ messages("Skip to main content") }}</a>
<!-- Menubar -->
+<nav class="navbar navbar-default">
+ <div class="container">
+ <a class="navbar-brand" href="{{ abs_link(_link("root", None, lang)) }}">
+ {% if logo_url %}
+ <img src="{{ logo_url }}" alt="{{ blog_title|e }}" id="logo" class="img-responsive center-block">
+ {% endif %}
+ {% if show_blog_title %}
+ <span id="blog-title">{{ blog_title|e }}</span>
+ {% endif %}
+ </a>
-<nav class="navbar navbar-default" role="navigation">
- <div class="container"><!-- This keeps the margins nice -->
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="{{ abs_link(_link("root", None, lang)) }}">
- <p>
- {% if logo_url %}
- <img src="{{ logo_url }}" alt="{{ blog_title }}" id="logo">
- {% endif %}
-
- {% if show_blog_title %}
- <span id="blog-title">{{ blog_title }}</span>
- {% endif %}
- </p>
- </a>
- </div><!-- /.navbar-header -->
- <div class="collapse navbar-collapse navbar-ex1-collapse">
+ <div class="havbar-header text-center" id="bs-navbar" aria-expanded="false">
<ul class="nav navbar-nav well well-sm">
{{ base.html_navigation_links() }}
{{ template_hooks['menu']() }}
@@ -57,7 +46,6 @@
</div><!-- /.navbar-collapse -->
</div><!-- /.container -->
</nav>
-
<!-- End of Menubar -->
<div class="container" id="content" role="main">
--
GitLab