From 025edb212a02136413392b1db8032c3cec970364 Mon Sep 17 00:00:00 2001 From: Anton Akhmerov <anton.akhmerov@gmail.com> Date: Mon, 21 Sep 2015 00:43:47 +0200 Subject: [PATCH] more template fixes --- themes/kwant/assets/css/custom.css | 4 ++++ themes/kwant/assets/css/theme.css | 8 ++++---- themes/kwant/assets/css/theme.min.css | 6 +++--- themes/kwant/templates/base.tmpl | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/themes/kwant/assets/css/custom.css b/themes/kwant/assets/css/custom.css index 232423b..82bad02 100644 --- a/themes/kwant/assets/css/custom.css +++ b/themes/kwant/assets/css/custom.css @@ -22,3 +22,7 @@ .navbar-nav > li > a:hover { text-decoration:underline; } + +h1 { + text-align: center; +} diff --git a/themes/kwant/assets/css/theme.css b/themes/kwant/assets/css/theme.css index daee0db..9cf0e25 100644 --- a/themes/kwant/assets/css/theme.css +++ b/themes/kwant/assets/css/theme.css @@ -4198,12 +4198,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar { position: relative; min-height: 50px; - margin-bottom: 22px; + margin-bottom: 0; border: 1px solid transparent; } @media (min-width: 768px) { .navbar { - border-radius: 4px; + border-radius: 0; } } @media (min-width: 768px) { @@ -4481,8 +4481,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { margin-bottom: 0; - border-top-right-radius: 4px; - border-top-left-radius: 4px; + border-top-right-radius: 0; + border-top-left-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } diff --git a/themes/kwant/assets/css/theme.min.css b/themes/kwant/assets/css/theme.min.css index e38acf1..f9d3a4b 100644 --- a/themes/kwant/assets/css/theme.min.css +++ b/themes/kwant/assets/css/theme.min.css @@ -934,10 +934,10 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i .tab-content>.tab-pane{display:none} .tab-content>.active{display:block} .nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0} -.navbar{position:relative;min-height:50px;margin-bottom:22px;border:1px solid transparent} +.navbar{position:relative;min-height:50px;margin-bottom:0;border:1px solid transparent} .navbar-collapse{overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,.1);-webkit-overflow-scrolling:touch} .navbar-collapse.in{overflow-y:auto} -@media (min-width:768px){.navbar{border-radius:4px} +@media (min-width:768px){.navbar{border-radius:0} .navbar-header{float:left} .navbar-collapse{width:auto;border-top:0;box-shadow:none} .navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important} @@ -996,7 +996,7 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i @media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none} } .navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0} -.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-radius:4px 4px 0 0} +.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-radius:0} .navbar-btn{margin-top:7px;margin-bottom:7px} .navbar-btn.btn-sm{margin-top:8.5px;margin-bottom:8.5px} .navbar-btn.btn-xs,.navbar-text{margin-top:14px;margin-bottom:14px} diff --git a/themes/kwant/templates/base.tmpl b/themes/kwant/templates/base.tmpl index 988fa21..00905c5 100644 --- a/themes/kwant/templates/base.tmpl +++ b/themes/kwant/templates/base.tmpl @@ -35,7 +35,7 @@ </a> </div><!-- /.navbar-header --> <div class="collapse navbar-collapse navbar-ex1-collapse"> - <ul class="nav navbar-nav well small-well"> + <ul class="nav navbar-nav well well-sm"> {{ base.html_navigation_links() }} {{ template_hooks['menu']() }} </ul> -- GitLab