Moved blog.css content into style.css, removed blog.css

jquery · Jan 11, 2012 · c6242e8 · c6242e8
1 parent cf9256c
commit c6242e8
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 55 deletions.
diff --git a/base/css/blog.css b/base/css/blog.css
diff --git a/base/css/style.css b/base/css/style.css
@@ -202,7 +202,20 @@
 	border: 1px solid #ccc;
 	border-bottom: none; }
 
-	.entry-meta { clear: left; }
+	.entry-meta
+{	clear: left;
+	color: #999;
+	font-size: 12px;
+	margin: 20px 0; }
+
+	.comments-link-top a
+{
+	font-size: 12px;
+	float: right; }
+
+	.post
+{
+	padding-bottom: 20px; }
 
 	/*******************************************************************************/
 	/* Syntax */
@@ -242,6 +255,7 @@
 
 	h1.title, h1.entry-title, h2.title, h2.entry-title 
 {	width: 100%;
+	font-size: 22px;
 	text-shadow: 0 1px 1px #fff;
 	margin: 0 0 20px -30px;
 	padding: 10px 30px 10px 30px;
@@ -253,6 +267,10 @@
 	background: -moz-linear-gradient(top,  #e5e5e5,  #d5d5d5);
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e5e5e5', endColorstr='#d5d5d5'); }
 
+	h1.title a, h1.entry-title a, h2.title a, h2.entry-title a
+{
+	text-decoration: none; }
+
 	/*******************************************************************************/
 	/* Buttons */
 	/*******************************************************************************/
@@ -303,7 +321,24 @@
 
 	.btn 
 {	zoom: 1; }
-
+
+	.inset-btn
+{
+	background: #999;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-shadow: inset 1px 1px 1px #666;
+	-moz-box-shadow: inset 1px 1px 1px #666;
+	box-shadow: inset 1px 1px 1px #666;
+	color: #FFF!important;
+	display: inline-block;
+	font-weight: bold;
+	text-align: center;
+	text-decoration: none;
+	text-shadow: 0 1px 0 rgba(0,0,0,0.3);
+	padding: 6px 8px; }
+
 	/*******************************************************************************/
 	/* Grid
 	/*******************************************************************************/
@@ -1486,7 +1521,16 @@
 	/*******************************************************************************/
 	/* Sidebar Right */
 	/*******************************************************************************/
-
+
+	#sidebar ul
+{
+	list-style: none; }
+
+	#sidebar li
+{
+	padding: 0;
+	margin: 0; }
+
 	#container #body.sidebar-right .inner 
 {	width: 72.25%;
 	float: left; }

diff --git a/themes/jquery/content.php b/themes/jquery/content.php
@@ -18,7 +18,7 @@
 			<?php else : ?>
 			<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
 				<span class="comments-link-top">
-					<?php comments_popup_link( '0 Comments', '1 Comment' , '% Comments', 'inset-link'); ?>
+					<?php comments_popup_link( '0 Comments', '1 Comment' , '% Comments', 'inset-btn'); ?>
 				</span>
 			</h1>
 			<?php endif; ?>

diff --git a/themes/jquery/header.php b/themes/jquery/header.php
@@ -50,7 +50,6 @@
 
 <link rel="shortcut icon" href="<?php echo get_stylesheet_directory_uri(); ?>/i/favicon.ico">
 <link rel="stylesheet" href="<?php echo content_url() ?>/base/css/style.css?v=1">
-<link rel="stylesheet" href="<?php echo content_url() ?>/base/css/blog.css?v=1">
 <link rel="stylesheet" href="<?php bloginfo( 'stylesheet_url' ); ?>">
 <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />