Skip to content

Commit

Permalink
Merge branch 'incoming' into v5.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
csswizardry committed Mar 19, 2013
2 parents 0626988 + 7e5f0f6 commit 60d5c9e
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 26 deletions.
6 changes: 3 additions & 3 deletions _defaults.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ $base-font-size: 16px!default;
$base-line-height: 24px!default;

/**
* Base font-family.
* Base font-family.
*/
$base-font-family: sans-serif!default;

Expand Down Expand Up @@ -151,8 +151,8 @@ $close-quote: null;
* If you need non-English quotes, please alter the following values accordingly:
*/
@if $english-quotes != true{
$open-quote: «;
$close-quote: »;
$open-quote: \00AB;
$close-quote: \00BB;
}


Expand Down
20 changes: 10 additions & 10 deletions base/_quotes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* If English quotes are set in `_vars.scss`, define them here.
*/
@if $english-quotes == true{
$open-quote: ;
$close-quote: ;
$open-quote: \201C;
$close-quote: \201D;
}


Expand All @@ -18,23 +18,23 @@
* Inline quotes.
*/
q{
quotes:"" "" "#{$open-quote}" "#{$close-quote}";
quotes:"\2018" "\2019" "#{$open-quote}" "#{$close-quote}";

&:before{
content:"";
content:"\2018";
content:open-quote;
}
&:after{
content:"";
content:"\2019";
content:close-quote;
}

q:before{
content:"";
content:"\201C";
content:open-quote;
}
q:after{
content:"";
content:"\201D";
content:close-quote;
}
}
Expand All @@ -56,11 +56,11 @@ blockquote{
}

q:before{
content:"";
content:"\2018";
content:open-quote;
}
q:after{
content:"";
content:"\2019";
content:close-quote;
}
}
Expand Down Expand Up @@ -91,6 +91,6 @@ blockquote{
text-indent:0;

&:before{
content:"";
content:"\2014";
}
}
2 changes: 1 addition & 1 deletion generic/_helper.scss
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
*
*/
.go:after{
content:"\00A0»"!important;
content:"\00A0" "\00BB"!important;
}


Expand Down
6 changes: 3 additions & 3 deletions objects/_breadcrumb.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/
.breadcrumb > li + li:before{
content:"» ";
content:"\00BB" "\00A0";
}


Expand All @@ -33,7 +33,7 @@
*
*/
.breadcrumb--path > li + li:before{
content:"/ ";
content:"\002F" "\00A0";
}


Expand All @@ -49,7 +49,7 @@
*
*/
.breadcrumb > li + li[data-breadcrumb]:before{
content:attr(data-breadcrumb)" ";
content:attr(data-breadcrumb) "\00A0";
}


Expand Down
2 changes: 1 addition & 1 deletion objects/_nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
> li{

&:after{
content:", ";
content:"\002C" "\00A0";
}

&:last-child:after{
Expand Down
4 changes: 2 additions & 2 deletions objects/_pagination.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
margin:-$base-spacing-unit / 2;
}
.pagination__first a:before{
content:"« ";
content:"\00AB" "\00A0";
}
.pagination__last a:after{
content:" »";
content:"\00A0" "\00BB";
}

}//endif
2 changes: 1 addition & 1 deletion objects/_rules.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
position:relative;

&:after{
content:"§";
content:"\00A7";
position:absolute;
top: 0;
right: 0;
Expand Down
10 changes: 5 additions & 5 deletions objects/_sprite.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$SPRITE
\*------------------------------------*/
/**
* Giving an element a class of `.s` will throw it into ‘sprite’ mode and apply
* Giving an element a class of `.sprite` will throw it into ‘sprite’ mode and apply
* a background image e.g.:
*
<a class="sprite sprite--question-mark">More info&hellip;</a>
Expand All @@ -13,7 +13,7 @@
*
<a href=#><i class="sprite sprite--question-mark"></i> Help and FAQ</a>
*
* Giving an element a class of `.i` will throw it into ‘icon’ mode and will
* Giving an element a class of `.icon` will throw it into ‘icon’ mode and will
* not add a background, but should be used for icon fonts and is populated
* through a `data-icon` attribute and the `:after` pseudo-element, e.g.:
*
Expand Down Expand Up @@ -91,8 +91,8 @@
/**
* Icon size modifiers.
*/
.i--large { font-size:32px; }
.i--huge { font-size:64px; }
.i--natural { font-size:inherit; }
.icon--large { font-size:32px; }
.icon--huge { font-size:64px; }
.icon--natural { font-size:inherit; }

}//endif

0 comments on commit 60d5c9e

Please sign in to comment.