Mercurial > kallithea
changeset 6689:b27f5a64430f
templates: use a Bootstrap container for the whole #content
We don't really use grids yet, but if we do, they require a container.
We want to use the whole width, so we use container-fluid and accept the
default margins of 15px / 20 px.
style.css modified by Mads Kiilerich.
author | domruf <dominikruf@gmail.com> |
---|---|
date | Sun, 18 Sep 2016 20:00:46 +0200 |
parents | c0e0ae9c5e64 |
children | 4c2d11e8d7cb |
files | kallithea/public/css/style.css kallithea/templates/base/base.html |
diffstat | 2 files changed, 1 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Thu Sep 22 21:05:03 2016 +0200 +++ b/kallithea/public/css/style.css Sun Sep 18 20:00:46 2016 +0200 @@ -239,14 +239,8 @@ } nav.navbar { min-height: 44px; - clear: both; - position: relative; background-color: #577632; - margin: 0; - padding: 0; - display: block; box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); - border-radius: 0px 0px 4px 4px; } .header-pos-fix, @@ -330,11 +324,6 @@ font-weight: bold; } -#content nav.navbar { - margin: 0 0 10px; - border-radius: 4px 4px 4px 4px; -} - #content nav.navbar .navbar-brand { height: inherit; line-height: inherit; @@ -377,7 +366,6 @@ } div.panel-primary { - margin: 0 0 10px; box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); border: none; } @@ -959,17 +947,10 @@ } #footer { - clear: both; - overflow: hidden; - text-align: right; - margin: 0; padding: 10px 15px; - margin: -10px 0 0; background-color: #577632; background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #577632, #577632); box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); - border-radius: 4px 4px 4px 4px; } #footer > span { @@ -986,11 +967,6 @@ padding-bottom: 8px; } -#footer.navbar .navbar-text { - margin-top: 0; - margin-bottom: 0; -} - #login .panel-body .icon-lock { font-size: 100px; color: #DDD; @@ -2211,19 +2187,6 @@ border-radius: 2px; } -nav.navbar, #content, #footer { - min-width: 978px; -} - -#content { - clear: both; - padding: 10px 10px 14px 10px; -} - -#content.hover { - padding: 55px 10px 14px 10px !important; -} - #content div.panel div.panel-heading div.search { border-left: 1px solid #576622; }
--- a/kallithea/templates/base/base.html Thu Sep 22 21:05:03 2016 +0200 +++ b/kallithea/templates/base/base.html Sun Sep 18 20:00:46 2016 +0200 @@ -2,7 +2,7 @@ <%inherit file="root.html"/> <!-- CONTENT --> -<div id="content"> +<div id="content" class="container-fluid"> ${self.flash_msg()} <div id="main"> ${next.main()}