From 52f5fd0821ea597b6e17cf63d0140b8202053405 Mon Sep 17 00:00:00 2001 From: ericdfields Date: Mon, 13 Feb 2012 12:05:53 -0500 Subject: [PATCH 1/2] updated readme --- README.mdown | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.mdown b/README.mdown index 0da3960..bffa9e7 100644 --- a/README.mdown +++ b/README.mdown @@ -59,6 +59,12 @@ Zocial has a few defaults in place that you can override for your project. `$zocial-text-font` is set to "helvetica" by default, but can set to [any of the fonts](https://github.com/adamstac/zocial/blob/master/stylesheets/partials/_fonts.sass) defined. In a future release, we plan to work on adding better options for using other fonts. Please be patient. +Last but not least, import the Zocial base classes to your stylesheet: + + @import "zocial" + +In order to override any of the defaults, you must declare your overrides **before** the `@import` statement. + ### Mixins Once you have Zocial's settings in place, it's time to mixin zocial. Zocial has two mixins, one for the free set (zocial-lite) and one for the full set (zocial-full) that can [purchased here](http://zocial.smcllns.com/). From 13916e40bbf8202f071a50c300200c3f15e2727f Mon Sep 17 00:00:00 2001 From: ericdfields Date: Thu, 15 Mar 2012 10:12:54 -0400 Subject: [PATCH 2/2] yay --- lib/zocial.rb | 4 ++-- stylesheets/partials/_base.sass | 2 +- stylesheets/partials/_mixins.sass | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/zocial.rb b/lib/zocial.rb index 9fb9c8c..fa2ae00 100644 --- a/lib/zocial.rb +++ b/lib/zocial.rb @@ -3,7 +3,7 @@ module Zocial - VERSION = "0.0.3" - DATE = "2011-11-08" + VERSION = "0.0.4" + DATE = "2012-02-17" end \ No newline at end of file diff --git a/stylesheets/partials/_base.sass b/stylesheets/partials/_base.sass index effd9b5..0c2a395 100644 --- a/stylesheets/partials/_base.sass +++ b/stylesheets/partials/_base.sass @@ -27,7 +27,7 @@ // Add a class of "icon" to display as standalone icons instead &.icon - width: 1.85em + width: $zocial-font-size overflow: hidden & > span diff --git a/stylesheets/partials/_mixins.sass b/stylesheets/partials/_mixins.sass index 7af4814..8fba359 100644 --- a/stylesheets/partials/_mixins.sass +++ b/stylesheets/partials/_mixins.sass @@ -35,6 +35,7 @@ +zocial-meetup +zocial-openid +zocial-paypal + +zocial-pinboard +zocial-plancast +zocial-posterous +zocial-rss @@ -307,6 +308,12 @@ & > span:before content: "$" +=zocial-pinboard + .zocial.pinboard + background: blue + & > span:before + content: "n" + =zocial-plancast .zocial.plancast @extend .adjustment-1