# HG changeset patch # User Tero Marttila # Date 1410650922 -10800 # Node ID 99f9e50030ae453537c378dbc32a328738914001 # Parent 8bfe3ab5e7fb723d293f44423b3a19bffb823781 site layout: update style.css for use with bootstrap diff -r 8bfe3ab5e7fb -r 99f9e50030ae qmsk_www/static/style.css --- a/qmsk_www/static/style.css Sun Sep 14 02:28:21 2014 +0300 +++ b/qmsk_www/static/style.css Sun Sep 14 02:28:42 2014 +0300 @@ -11,14 +11,10 @@ */ /* - * Global styles + * General */ -body { - padding: 0px; - margin: 0px; - - background-color: #ffffff; - color: #000000; +a:hover { + color: inherit; } /* @@ -27,10 +23,12 @@ div#header { padding: 30px; + border-bottom: 1px dashed #a5a5a5; +} + +div#header h1 { font-size: 48pt; font-weight: bold; - - border-bottom: 1px dashed #a5a5a5; } div#header a:hover { @@ -38,45 +36,22 @@ } /* - * Container for layout items - */ - #container { - overflow: hidden; -} - -/* * Main navigation menu */ -#nav { - float: left; - - padding-bottom: 2000px; - margin-bottom: -2000px; - - border-right: 1px dashed #a5a5a5; +#nav { + } #nav ul { - margin: 0px; - padding: 0px; - list-style: none; - - width: 180px; - - padding-top: 25px; } #nav ul ul { - padding-top: 0px; - border-left: 15px solid #d0d0d0; + } #nav li a { - display: block; - - padding: 10px; - padding-left: 20px; + } #nav li a:hover { @@ -84,22 +59,19 @@ text-decoration: none; } -#nav li a.selected-page { - border-left: 5px solid black; - padding-left: 15px; +#nav li.page-tree-active { + background-color: #808080; } /* * Content */ div#content { - margin-left: 180px; - padding: 25px; - padding-right: 50px; } div#breadcrumb { + display: none; font-size: x-small; } @@ -107,7 +79,9 @@ * Footer */ div#footer { - padding: 10px; + margin: 40px 0px 0px 0px; + + padding: 20px 0px; border-top: 1px dashed #a5a5a5; @@ -119,7 +93,7 @@ float: left; } -div#footer-right { +.page-footer-modified { float: right; text-align: right; } @@ -149,7 +123,7 @@ font-size: large; } -div#content p { +#content p { margin-left: 0.5em; } diff -r 8bfe3ab5e7fb -r 99f9e50030ae qmsk_www/templates/site.html --- a/qmsk_www/templates/site.html Sun Sep 14 02:28:21 2014 +0300 +++ b/qmsk_www/templates/site.html Sun Sep 14 02:28:42 2014 +0300 @@ -10,7 +10,7 @@ - + {% block content %}{% endblock %}