diff --git a/mainsite/static/css/site-base.css b/mainsite/static/css/site-base.css new file mode 100644 index 0000000..d6a1804 --- /dev/null +++ b/mainsite/static/css/site-base.css @@ -0,0 +1,109 @@ +html, body, .full-height { + height: 100%; +} + +/* Move down content because we have a fixed navbar that is 125px tall */ +body { + padding-top: 125px; +} + +/* + * Global add-ons + */ + +.sub-header { + padding-bottom: 10px; +} + +/* + * Top navigation + * Hide default border to remove 1px line. + */ +.navbar-fixed-top { + border: 0; +} + +.navbar { + background-color: #eba367; +} + +.navbar-brand { + height: 125px; + padding: 20px; +} + +.navbar >li >a { + padding-top: 30px; + padding-bottom: 20px; +} + +.navbar-toggle { + padding: 10px; + margin: 25px 15px 25px 0; +} + +/* Hide for mobile, show later */ +.sidebar { + display: none; +} +@media (min-width: 768px) { + .sidebar { + position: fixed; + top: 125px; + bottom: 0; + left: 0; + z-index: 1000; + display: block; + padding: 20px; + overflow-x: hidden; + overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ + background-color: #eba367; + } +} + +/* Sidebar navigation */ +.nav-sidebar { + font-size: 1.2em; + margin-right: -20px; + margin-bottom: 20px; + margin-left: -20px; +} +.nav-sidebar > li > a { + padding-right: 20px; + padding-left: 20px; + padding-top: 10px; + padding-bottom: 10px; + color: #9c0635; +} +.nav-sidebar > .active > a, +.nav-sidebar > .active > a:hover, +.nav-sidebar > .active > a:focus { + color: #FDF6E3; + /*background-color: #AD2624; */ +} + +.nav > li > a:hover { + color: #eba367; + background-color: #AD2624; +} +/* + * Main content + */ + +.main-row { +} + +.main { + padding: 20px; + background-color: white; +} + +@media (min-width: 768px) { + .main { + padding-right: 40px; + padding-left: 40px; + } +} +.main .page-header { + margin-top: 0; +} diff --git a/mainsite/static/img/logo.png b/mainsite/static/img/logo.png new file mode 100644 index 0000000..698bb5e Binary files /dev/null and b/mainsite/static/img/logo.png differ diff --git a/mainsite/static/img/logo_orig.png b/mainsite/static/img/logo_orig.png new file mode 100644 index 0000000..5a12532 Binary files /dev/null and b/mainsite/static/img/logo_orig.png differ diff --git a/mainsite/templates/base.html b/mainsite/templates/base.html index e382f5e..3c7386f 100644 --- a/mainsite/templates/base.html +++ b/mainsite/templates/base.html @@ -6,24 +6,33 @@ Le BOcal - - + + - {% include "header.html" %} + {% include "navbar.html" %} +
+
+ {% include "sidebar.html" %} - {% block content %} - {% endblock content %} + +
+ {% block content %} + {% endblock content %} +
+
+
- + diff --git a/mainsite/templates/header.html b/mainsite/templates/header.html deleted file mode 100644 index c449192..0000000 --- a/mainsite/templates/header.html +++ /dev/null @@ -1,20 +0,0 @@ - - -
-
Brand Logo
- - -
- -
-
diff --git a/mainsite/templates/navbar.html b/mainsite/templates/navbar.html new file mode 100644 index 0000000..6f414c2 --- /dev/null +++ b/mainsite/templates/navbar.html @@ -0,0 +1,28 @@ + diff --git a/mainsite/templates/sidebar.html b/mainsite/templates/sidebar.html new file mode 100644 index 0000000..4aa0d8f --- /dev/null +++ b/mainsite/templates/sidebar.html @@ -0,0 +1,15 @@ +