Merge branch 'development'

* development: STUDIO-16: Fix hover styling. STUDIO-10: Fixed the issue that only one post is showed on the selected tags page. STUDIO-13: Small clean-up to CSS. STUDIO-13: Switch to CSS import for font, use lighter weight. STUDIO-13: Set base font to embedded 'Neuton' font. STUDIO-16: Small styling fixes to some colours. STUDIO-11: Removing the space between the excerpt and the tags on the tag pages.
fluid-project · Dec 9, 2011 · 3dd0f54 · 3dd0f54
2 parents 88213e0 + 17eac7e
commit 3dd0f54
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 14 deletions.
diff --git a/wp-content/themes/fluid-studios/archive.php b/wp-content/themes/fluid-studios/archive.php
@@ -35,7 +35,7 @@
 				<h1>Blog Archives</h1>
 
 			<?php } ?>
-			<?php query_posts($query_string . '&posts_per_page=1'); ?>
+			<?php query_posts($query_string); ?>
 				<ul class="fl-grid">
 			<?php while (have_posts()) : the_post(); ?>
 

diff --git a/wp-content/themes/fluid-studios/functions.php b/wp-content/themes/fluid-studios/functions.php
@@ -153,7 +153,7 @@ function enable_threaded_comments(){
 // build an HTML string for a tag
 	function build_link_for_tag($aTag) {
 		$tag_link = get_tag_link($aTag->term_id);
-		$html .= "<a href='{$tag_link}' title='{$aTag->name} Tag' class='{$aTag->slug}'>";
+		$html .= "<a rel='tag' href='{$tag_link}' title='{$aTag->name} Tag' class='{$aTag->slug}'>";
 		$html .= "{$aTag->name}</a>";
 		return $html;
 	}

diff --git a/wp-content/themes/fluid-studios/header.php b/wp-content/themes/fluid-studios/header.php
@@ -20,6 +20,10 @@
 
 <meta name="viewport" content="initial-scale=1.0, width=device-width" />
 
+<!--
+	<link href='http://fonts.googleapis.com/css?family=Neuton:400,300,700,400italic' rel='stylesheet' type='text/css'>
+-->
+
 <link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/framework/fss/css/fss-reset-global.css" media="all" />
 <link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/framework/fss/css/fss-layout.css" media="all" />
 <link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/framework/fss/css/fss-text.css" media="all" />

diff --git a/wp-content/themes/fluid-studios/single.php b/wp-content/themes/fluid-studios/single.php
@@ -12,7 +12,7 @@
 					<header>
 						<h1 class="entry-title"><?php the_title(); ?></h1>
 						<?php include (TEMPLATEPATH . '/inc/meta.php' ); ?>
-						<?php the_tags('', ', '); ?>
+						<span class="fs-tags"><?php the_tags('', ', '); ?></span>
 					</header>
 
 					<section class="entry-content">

diff --git a/wp-content/themes/fluid-studios/style.css b/wp-content/themes/fluid-studios/style.css
@@ -5,17 +5,27 @@ Author: The Fluid Project
 
 /* Global Fluid Studios theme specific container and body styles
 --------------------------------------------------------------------------- */
+@import url("http://fonts.googleapis.com/css?family=Neuton:400,300,700,400italic");
+
 html {
 	height: 100%;
 }
+.fluid-studios-theme {
+	color: #333333;
+}
 body {
 	line-height:1.4;
-	font-family: "Times New Roman", Times, serif;
+	font-family: "Neuton", "Times New Roman", Times, serif;
+	font-weight: 300;
 	max-width: 1280px;
 	background:#fff;
 	height: 100%;
 	position: relative;
 }
+.home.fluid-studios-theme,
+.archive.fluid-studios-theme {
+	color: #666666;
+}
 #content-container {
 	height: auto;
 	min-height: 100%;
@@ -34,11 +44,11 @@ h1,h2,h3,h4,h5,h6{
 p,ul,ol,blockquote,figure {
 	margin-bottom: 1em;
 }
-a {
+.fluid-studios-theme a {
 	text-decoration: none;
 	color: #0099CC;
 }
-a:hover {
+.fluid-studios-theme a:hover {
 	color: #CCCC00;
 }
 /* FSS Column style overrides
@@ -128,7 +138,7 @@ h1.entry-title {
 h2.entry-title {
 	font-size: 1.1em;
 }
-p.entry-meta {
+p.entry-meta, .home .entry-content p, .archive .entry-content p {
 	margin-bottom: 0;
 }
 .entry-meta {
@@ -138,9 +148,6 @@ p.entry-meta {
 .single .entry-content {
 	padding-top: 1em;
 }
-.home .entry-content p {
-	margin-bottom: 0;
-}
 blockquote{
 	border-left:5px solid #eee;
 	font-style:italic;
@@ -162,8 +169,9 @@ ol#search-results li p{
 	list-style:inside disc;
 	margin-left:0.2%;
 }
-.fs-tags, a[rel="tag"] {
-	font-style: italic;
+.fluid-studios-theme .fs-tags {
+	font-style: italic;	
+	color: #0099CC;
 }
 #search-results .entry-utility ul li{
 	font-weight:normal;
@@ -316,7 +324,6 @@ input#s{
     font-family: Arial,sans-serif;
     margin-right: 0;
 	padding: 0.3125em;  /* 5 / 16 */
-	padding-top: 0.15em;
 	padding-left: 1.5625em; /* 25 / 16 */
     position: absolute;
     right: 14em;
@@ -346,7 +353,7 @@ input#s{
 	padding: 0.3125em;  /* 5 / 16 */
 	padding-left: 1.5625em; /* 25 / 16 */
 	margin-top: 12em;
-	width: 3em;
+	width: 4em;
 	float: right;
 }
 .fs-back-link a {