Merge branch 'nycga2012' of https://github.com/OccupyWallStreet/nycga2 …

…into nycga2012
OccupyWallStreet · Mar 25, 2012 · 09363ce · 09363ce
2 parents 5606b15 + 46d8fdd
commit 09363ce
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 12 deletions.
diff --git a/wp-content/themes/nycga2012/css/nycga_core.css b/wp-content/themes/nycga2012/css/nycga_core.css
@@ -27,7 +27,8 @@ ol { list-style: decimal; }
 -----------------------------------------------------
 */
 
-a { text-decoration:underline; color:#0af; }
+a { text-decoration:none; color:#0af; }
+a:hover { text-decoration:underline; }
 a:focus { outline: 1px dotted; }
 
 h2 a,
@@ -209,7 +210,7 @@ h5 a:hover,
 #donate a.button{
 	display: block;
 	float:right;
-	width: 180px;
+	width: 210px;
 	background: #0af;
 	padding: .125em .25em;
 	font-size: 2em;
@@ -220,6 +221,10 @@ h5 a:hover,
 	border-radius: 4px;	
 }
 
+#donate a.button:hover{
+	background-color:#0090D8;
+}
+
 .nav{
 	background: #fc0;
 	margin: 0;
@@ -455,9 +460,10 @@ dl dd{
 }
 
 .my-groups-list .item-avatar{
-	display: block;
-	float: left;
-	margin-right: 1em;
+	left: 0.25em;
+    margin-right: 1em;
+    position: absolute;
+    top: 0.25em;
 }
 
 .my-groups-list .item-title a{
@@ -466,11 +472,12 @@ dl dd{
 	text-decoration: none;
 }
 
-.my-groups-list li{
-	line-height: 2.125em;
-	padding: .25em;
-	background: #ededed;
-	margin-bottom: .125em !important;
+.my-groups-list li {
+	background-color: #EDEDED;
+    border-bottom: 2px solid #FFFFFF;
+    min-height: 2em;
+    padding: 0.25em 0.25em 0.25em 3em;
+    position: relative;
 }
 
 .my-groups-list li:hover{

diff --git a/wp-content/themes/nycga2012/footer.php b/wp-content/themes/nycga2012/footer.php
@@ -6,7 +6,6 @@
 		<div id="footer" class="container_24">
 
 			<?php if ( is_active_sidebar( 'first-footer-widget-area' ) || is_active_sidebar( 'second-footer-widget-area' ) || is_active_sidebar( 'third-footer-widget-area' ) || is_active_sidebar( 'fourth-footer-widget-area' ) ) : ?>
-				<h3>
 				<div id="footer-widgets">
 					<?php get_sidebar( 'footer' ) ?>
 				</div>
@@ -17,7 +16,7 @@
 				<p><?php printf( __( 'Proudly powered by <a href="%1$s">WordPress</a> and <a href="%2$s">BuddyPress</a>.', 'buddypress' ), 'http://wordpress.org', 'http://buddypress.org' ) ?></p>
 			</div>
 
-			<?php do_action( 'bp_footer' ) ?>
+			<?php do_action( 'bp_footer', 'clear' ) ?>
 		</div><!-- #footer -->
 
 		<?php do_action( 'bp_after_footer' ) ?>

diff --git a/wp-content/themes/nycga2012/style.css b/wp-content/themes/nycga2012/style.css
@@ -165,6 +165,7 @@ Tags: buddypress, three-column, multi-site
 
 #sidebar-me{
 	/* user chip */
+	margin-bottom: 2em;
 	padding:0.5em !important;
 }
 
@@ -211,6 +212,31 @@ Tags: buddypress, three-column, multi-site
 	text-decoration: none;
 }
 
+/*
+--------------------------------------------------------------
+ Footer
+--------------------------------------------------------------
+*/
+
+#footer {}
+
+#footer .widget { margin-bottom:1em; }
+
+#footer li { margin-bottom:.5em; }
+
+#footer .widget-area {
+	display:inline;
+	float: left;
+	position: relative;
+	margin-left: 5px;
+	margin-right: 4px;
+	width:237px;
+}
+
+#footer .menu .sub-menu { margin-top:.5em; padding-left:.5em; }
+
+#site-generator { clear:both; }
+
 /*
 --------------------------------------------------------------
  Primary Navigation