Mercurial Mercurial > qmsk-www / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
site layout: update style.css for use with bootstrap
authorTero Marttila <terom@paivola.fi>
Sun, 14 Sep 2014 02:28:42 +0300
changeset 204 99f9e50030ae
parent 203 8bfe3ab5e7fb
child 205 f1adf52f485a
site layout: update style.css for use with bootstrap
qmsk_www/static/style.css file | annotate | diff | comparison | revisions
qmsk_www/templates/site.html file | annotate | diff | comparison | revisions 
--- 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;
 }
 
--- 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 @@
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
 
         <!-- qmsk.www.pages -->
-        <link rel="stylesheet" href="{% static "pages/pages.css" %}">
+        <link rel="stylesheet" href="{% static "style.css" %}">
     </head>
     <body>
         {% block content %}{% endblock %}
qmsk-www