Bug fixed

harrybaa · Sep 1, 2015 · 036cea2 · 036cea2
1 parent aaeda87
commit 036cea2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/wp-content/themes/PASA/header.php b/wp-content/themes/PASA/header.php
@@ -24,10 +24,9 @@
     <script src="//code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
     <link rel="stylesheet" type="text/css" href="<?php bloginfo( 'template_directory' ); ?>/css/header.css">
     <link rel="stylesheet" type="text/css" href="<?php bloginfo( 'template_directory' ); ?>/css/GalleryOverried.css">
+    <link href='https://fonts.googleapis.com/css?family=Roboto:400,400italic&subset=latin,greek' rel='stylesheet' type='text/css'>
     <link href='https://fonts.googleapis.com/css?family=Oxygen:400,700,300' rel='stylesheet' type='text/css'>
     <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300' rel='stylesheet' type='text/css'>
-    <link href='http://fonts.googleapis.com/css?family=Alegreya:400,900' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Russo+One' rel='stylesheet' type='text/css'>
     <?php wp_head(); ?>
     <link rel="stylesheet" type="text/css" href="<?php bloginfo( 'template_directory' ); ?>/overrideStyle.css">
   </head>
@@ -105,9 +104,7 @@
         $( document ).ready(function() {
             var pid = $.urlParam('page_id');
             var menu = $('.nav-menu').children();
-            console.log(menu);
             $.each(menu, function(index, value){
-              console.log($(value).data('pageid'));
               if($(value).data('pageid') == pid){
                 $(value).siblings().removeClass('active');
                 $(value).addClass('active');

diff --git a/wp-content/themes/PASA/index.php b/wp-content/themes/PASA/index.php
@@ -35,6 +35,10 @@
 		<span class='red'>A</span>lgorithm lab!
 	</p>
 
+	<div class='intro-wrapper'>
+		<h1>INTRODUCTION</h1>
+	</div>
+
 	<div class='news-wrapper'>
 		<h1>NEWS</h1>
 		<ul class='i-m-news'>

diff --git a/wp-content/themes/PASA/overrideStyle.css b/wp-content/themes/PASA/overrideStyle.css
diff --git a/wp-content/themes/PASA/overrideStyle.css.map b/wp-content/themes/PASA/overrideStyle.css.map
diff --git a/wp-content/themes/PASA/overrideStyle.scss b/wp-content/themes/PASA/overrideStyle.scss
@@ -63,7 +63,10 @@ footer{
 	background-repeat: no-repeat;
 	overflow: hidden;
 }
-.news-wrapper{
+.intro-wrapper{
+	height: 200px;
+}
+.news-wrapper, .intro-wrapper{
 	padding: 20px 30px;
 	.i-m-news{
 		list-style: disc;
@@ -104,8 +107,8 @@ footer{
 		width: 25%;
 		.r-c-wrapper{
 			min-height: 100px;
-			margin-bottom: 30px;
-			&:first-child{
+			margin-bottom: 15px;
+			&:not(:last-child){
 				border-bottom: 1px solid #aaa;
 			}
 			.r-c-headwrap{
@@ -114,10 +117,10 @@ footer{
 				line-height: 32px;
 			}
 			.r-c-list{
+				padding: 0 17px;
 				list-style: disc;
-				font-family: 'Oxygen', sans-serif;
-				font-size: 16px;
-				font-weight: 300;
+				font-family: 'Roboto', sans-serif;
+				font-size: 14px;
 				line-height: 22px;
 			}
 		}