bootstrapping

dmd-web-and-mobile · Feb 21, 2016 · 855751a · 855751a
1 parent 3c6b21d
commit 855751a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/www/wp-content/themes/ation2016/functions.php b/www/wp-content/themes/ation2016/functions.php
@@ -53,6 +53,7 @@ function add_to_twig( $twig ) {
 	}
 
 	function loadScripts() {
+		wp_enqueue_style( 'bootstrap', get_template_directory_uri() . '/static/vendor/bootstrap.min.css' );
 		wp_enqueue_style( 'main', get_template_directory_uri() . '/static/styles/site.min.css' );
     wp_enqueue_script( 'main', get_template_directory_uri() . '/static/scripts/main.min.js', array('jquery'), '1.0.0', true );
   }

diff --git a/www/wp-content/themes/ation2016/src/styles/components/_header.scss b/www/wp-content/themes/ation2016/src/styles/components/_header.scss
@@ -1,4 +1,6 @@
-.header-logo {
-  max-width: 300px;
-  display: block;
+header {
+  .header-logo {
+    max-width: 300px;
+    display: block;
+  }
 }
diff --git a/www/wp-content/themes/ation2016/static/styles/site.css b/www/wp-content/themes/ation2016/static/styles/site.css
@@ -4,7 +4,7 @@ h1, h2, h3, h4, h5, h6 {
 p, li, span {
   font-family: "Times New Roman", serif; }
 
-.header-logo {
+header .header-logo {
   max-width: 300px;
   display: block; }
 

diff --git a/www/wp-content/themes/ation2016/static/styles/site.min.css b/www/wp-content/themes/ation2016/static/styles/site.min.css
diff --git a/www/wp-content/themes/ation2016/templates/base.twig b/www/wp-content/themes/ation2016/templates/base.twig
@@ -9,11 +9,13 @@
 	<body class="{{body_class}}" data-template="base.twig">
 		<header class="header" >
 			{% block header %}
-				<div class="wrapper">
-					<a href="/" rel="home" class="header-logo">
-						<img src="{{theme.path}}/static/images/logo.png" alt="ATION Digital Media" />
-					</a>
-					<nav id="nav-main" class="nav-main" role="navigation">
+				<div class="wrapper row">
+					<div class="col-xs-12 col-sm-6">
+						<a href="/" rel="home" class="header-logo">
+							<img src="{{theme.path}}/static/images/logo.png" alt="ATION Digital Media" />
+						</a>
+					</div>
+					<nav id="nav-main" class="nav-main col-xs-12 col-sm-6" role="navigation">
 						{% include "menu.twig" with {'menu': menu.get_items} %}
 					</nav><!-- #nav -->
 				</div>