Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 6 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
70 wp-content/themes/nycga2012/css/nycga_core.css
@@ -284,43 +284,7 @@ h5 a:hover,
}
.gridbox p{
- padding: 2em 0 0 0;
-}
-
-/* a little emphasis */
-.gridbox p.intro{
- font-size: 1.25em;
- line-height: 1.2;
- color: #333;
-}
-
-.gridbox ul{
- margin-top: 2em;
- list-style: none;
- list-style-position: inside;
-}
-
-.gridbox ul.listing li{
- margin: 0 2em 0 1em;
- padding: 1em 0;
- border-bottom: 1px #dedede solid;
-}
-
-.gridbox table{
- margin-top: 2em;
-}
-
-.gridbox th{
- text-align: left;
- font-weight: normal;
- padding: 1em 0 .5em .4em;
- border-top: 1px #000 solid;
-}
-
-.gridbox td{
- padding: .5em;
- border: 1px #fff solid;
- background: #eee;
+ padding: 0 0 2em 0;
}
dl{
@@ -374,13 +338,13 @@ dl dd{
#tiptip_content {
/* tamerpered with from original 11px no leading specified */
- font-size: 12px;
+ font-size: 14px;
line-height: 1.5;
/* end tampering */
color: #fff;
text-shadow: 0 0 2px #000;
- padding: .5em .75em;
- border: 1px solid rgba(255,255,255,0.25);
+ padding: .75em 1em;
+
background-color: rgb(25,25,25);
background-color: rgba(25,25,25,0.92);
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(transparent), to(#000));
@@ -449,6 +413,19 @@ dl dd{
border-left-color: rgba(25,25,25,0.92);
}
+/* Webkit Hacks */
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+ #tiptip_content {
+ padding: 4px 8px 5px 8px;
+ background-color: rgba(45,45,45,0.88);
+ }
+ #tiptip_holder.tip_bottom #tiptip_arrow_inner {
+ border-bottom-color: rgba(45,45,45,0.88);
+ }
+ #tiptip_holder.tip_top #tiptip_arrow_inner {
+ border-top-color: rgba(20,20,20,0.92);
+ }
+}
/*
-----------------------------------------------------
@@ -506,16 +483,3 @@ dl dd{
.my-groups-list li:hover{
background:#222;
}
-/* Webkit Hacks */
-@media screen and (-webkit-min-device-pixel-ratio:0) {
- #tiptip_content {
- padding: 4px 8px 5px 8px;
- background-color: rgba(45,45,45,0.88);
- }
- #tiptip_holder.tip_bottom #tiptip_arrow_inner {
- border-bottom-color: rgba(45,45,45,0.88);
- }
- #tiptip_holder.tip_top #tiptip_arrow_inner {
- border-top-color: rgba(20,20,20,0.92);
- }
-}
View
21 wp-content/themes/nycga2012/groups/groups-loop.php
@@ -13,7 +13,7 @@
<?php do_action( 'bp_before_groups_loop' ); ?>
-<?php if ( bp_has_groups( bp_ajax_querystring( 'groups' ) ) ) : ?>
+<?php if ( bp_has_groups( bp_ajax_querystring( 'groups' )."&per_page=40") ) : ?>
<div id="pag-top" class="pagination">
@@ -31,25 +31,26 @@
<?php do_action( 'bp_before_directory_groups_list' ); ?>
- <ul id="groups-list" class="item-list clearFix" role="main">
+ <ul id="groups-list" class="item-list clearfix" role="main">
+
<?php while ( bp_groups() ) : bp_the_group(); ?>
- <li class="group grid_4 gridbox shadow tipTipActuator">
- <div class="padded">
+ <li class="group grid_4 clearfix gridbox shadow tipTipActuator">
+ <div class="padded clearfix">
<div class="item-avatar">
<a href="<?php bp_group_permalink(); ?>"><?php bp_group_avatar( 'type=thumb&width=42&height=42' ); ?></a>
</div>
<div class="item">
<h5 class="item-title"><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a></h5>
- <div class="item-meta"><span class="activity"><?php printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() ); ?></span></div>
<div class="item-desc tipTipContent"><?php bp_group_description_excerpt(); ?></div>
<?php do_action( 'bp_directory_groups_item' ); ?>
</div>
<div class="action">
<?php do_action( 'bp_directory_groups_actions' ); ?>
<div class="meta">
- <?php bp_group_type(); ?> / <?php bp_group_member_count(); ?>
+ <div class="small group-count"><?php bp_group_member_count(); ?></div>
+ <div class="small last-active"><?php printf( __( 'Active %s', 'buddypress' ), bp_get_group_last_active() ); ?></div>
</div>
</div>
</div>
@@ -78,4 +79,12 @@
<?php endif; ?>
+<!--
+ Move this to funtions.php
+ function bbg_print_script() { echo '<script>foo();</script>'; } add_action( 'bp_after_groups_loop', 'bbg_print_script' );
+-->
+
+<script type="text/javascript">
+nycga.ui.addToolTips('#groups-list');
+</script>
<?php do_action( 'bp_after_groups_loop' ); ?>
View
2  wp-content/themes/nycga2012/js/nycga.tipTip.js
@@ -27,7 +27,7 @@
keepAlive: false,
maxWidth: "200px",
edgeOffset: 3,
- defaultPosition: "bottom",
+ defaultPosition: "top",
tipContentSelector: ".tipTipContent",
delay: 400,
fadeIn: 200,
View
9 wp-content/themes/nycga2012/js/nycga_ui.js
@@ -16,10 +16,15 @@ if( !nycga.ui ) nycga.ui = {};
with the class 'content' then hides the method object
Requires — jquery.tipTip — code.drewwilson.com/entry/tiptip-jquery-plugin
*/
-nycga.ui.addToolTips = function( actuatorSelector, tipContentSelector ){
+nycga.ui.addToolTips = function( whereToLook, actuatorSelector, tipContentSelector ){
console.log( "nycga.ui.addToolTips", actuatorSelector, tipContentSelector );
actuatorSelector = ( actuatorSelector )? actuatorSelector : '.tipTipActuator';
- jQuery( actuatorSelector ).tipTip({ delay: 250 });
+ if( whereToLook ){
+ console.log( whereToLook, jQuery( whereToLook ), jQuery( whereToLook ).find( actuatorSelector ) );
+ jQuery( whereToLook ).find( actuatorSelector ).tipTip({ delay: 250 });
+ }else{
+ jQuery( actuatorSelector ).tipTip({ delay: 250 });
+ }
}
/* cross browser friendly css3 dropshadow */
View
3  wp-content/themes/nycga2012/js/site.js
@@ -7,9 +7,6 @@ jQuery(document).ready(function() {
// shadows.each( function( i, element ){
// nycga.ui.addDropShadow( element );
// });
-
- // show a tooltip for each element with the '.hoverMenu' class
- // code.drewwilson.com/entry/tiptip-jquery-plugin
var galleryElement = jQuery(document).find('#homapgeFeatures ul.gallery');
if( galleryElement ){
View
40 wp-content/themes/nycga2012/style.css
@@ -15,7 +15,6 @@ Tags: buddypress, three-column, multi-site
@import url('css/type.css');
@import url('css/events.css');
-
/*
--------------------------------------------------------------
Header
@@ -50,9 +49,46 @@ Tags: buddypress, three-column, multi-site
}
#groups-list .group{
- border-top: 1px #333 solid;
+ border-top: 1px #aaa solid;
+ width: 173px !important;
+ height: 12em;
+}
+
+#groups-list .group .padded{
+ height: 11em;
+ position: relative;
+}
+
+#groups-list .group .padded .action{
+ position: absolute;
+ left: .5em;
+ bottom: .5em;
+}
+
+#groups-list .group div.group-button,
+#groups-list .group .meta div{
+ border-radius: 6px;
+ padding: .25em .5em;
+ margin: 0 1em 2px 0;
}
+#groups-list .group div.group-button{
+ background: #000 !important;
+ color:#fc0;
+}
+
+#groups-list .group div.group-button a{
+ color:#fff;
+ text-decoration: none;
+}
+#groups-list .group .meta div{
+ background: #dedede;
+ padding: .125em .25em;
+ color:#222;
+ float: left;
+}
+
+
.gtags-top-cloud{
display: none;
}

No commit comments for this range

Something went wrong with that request. Please try again.