Skip to content
This repository
Browse code

Merge branch 'incoming' into v5.0.1

  • Loading branch information...
commit 60d5c9e09f58e0e24258a61633128828808976cb 2 parents 0626988 + 7e5f0f6
Harry Roberts authored March 19, 2013
6  _defaults.scss
@@ -46,7 +46,7 @@ $base-font-size:    16px!default;
46 46
 $base-line-height:  24px!default;
47 47
 
48 48
 /**
49  
- * Base font-family. 
  49
+ * Base font-family.
50 50
  */
51 51
 $base-font-family:  sans-serif!default;
52 52
 
@@ -151,8 +151,8 @@ $close-quote:   null;
151 151
  * If you need non-English quotes, please alter the following values accordingly:
152 152
  */
153 153
 @if $english-quotes != true{
154  
-    $open-quote:    «;
155  
-    $close-quote:   »;
  154
+    $open-quote:    \00AB;
  155
+    $close-quote:   \00BB;
156 156
 }
157 157
 
158 158
 
20  base/_quotes.scss
@@ -5,8 +5,8 @@
5 5
  * If English quotes are set in `_vars.scss`, define them here.
6 6
  */
7 7
 @if $english-quotes == true{
8  
-    $open-quote:    “;
9  
-    $close-quote:   ”;
  8
+    $open-quote:    \201C;
  9
+    $close-quote:   \201D;
10 10
 }
11 11
 
12 12
 
@@ -18,23 +18,23 @@
18 18
  * Inline quotes.
19 19
  */
20 20
 q{
21  
-    quotes:"‘" "’" "#{$open-quote}" "#{$close-quote}";
  21
+    quotes:"\2018" "\2019" "#{$open-quote}" "#{$close-quote}";
22 22
 
23 23
     &:before{
24  
-        content:"";
  24
+        content:"\2018";
25 25
         content:open-quote;
26 26
     }
27 27
     &:after{
28  
-        content:"";
  28
+        content:"\2019";
29 29
         content:close-quote;
30 30
     }
31 31
 
32 32
     q:before{
33  
-        content:"";
  33
+        content:"\201C";
34 34
         content:open-quote;
35 35
     }
36 36
     q:after{
37  
-        content:"";
  37
+        content:"\201D";
38 38
         content:close-quote;
39 39
     }
40 40
 }
@@ -56,11 +56,11 @@ blockquote{
56 56
     }
57 57
 
58 58
     q:before{
59  
-        content:"";
  59
+        content:"\2018";
60 60
         content:open-quote;
61 61
     }
62 62
     q:after{
63  
-        content:"";
  63
+        content:"\2019";
64 64
         content:close-quote;
65 65
     }
66 66
 }
@@ -91,6 +91,6 @@ blockquote{
91 91
     text-indent:0;
92 92
 
93 93
     &:before{
94  
-        content:"";
  94
+        content:"\2014";
95 95
     }
96 96
 }
2  generic/_helper.scss
@@ -142,7 +142,7 @@
142 142
  *
143 143
  */
144 144
 .go:after{
145  
-    content:"\00A0»"!important;
  145
+    content:"\00A0" "\00BB"!important;
146 146
 }
147 147
 
148 148
 
6  objects/_breadcrumb.scss
@@ -17,7 +17,7 @@
17 17
  *
18 18
  */
19 19
 .breadcrumb > li + li:before{
20  
-    content:"» ";
  20
+    content:"\00BB" "\00A0";
21 21
 }
22 22
 
23 23
 
@@ -33,7 +33,7 @@
33 33
  *
34 34
  */
35 35
 .breadcrumb--path > li + li:before{
36  
-    content:"/ ";
  36
+    content:"\002F" "\00A0";
37 37
 }
38 38
 
39 39
 
@@ -49,7 +49,7 @@
49 49
  *
50 50
  */
51 51
 .breadcrumb > li + li[data-breadcrumb]:before{
52  
-    content:attr(data-breadcrumb)" ";
  52
+    content:attr(data-breadcrumb) "\00A0";
53 53
 }
54 54
 
55 55
 
2  objects/_nav.scss
@@ -143,7 +143,7 @@
143 143
     > li{
144 144
 
145 145
         &:after{
146  
-            content:", ";
  146
+            content:"\002C" "\00A0";
147 147
         }
148 148
 
149 149
         &:last-child:after{
4  objects/_pagination.scss
@@ -41,10 +41,10 @@
41 41
             margin:-$base-spacing-unit / 2;
42 42
         }
43 43
             .pagination__first a:before{
44  
-                content:"« ";
  44
+                content:"\00AB" "\00A0";
45 45
             }
46 46
             .pagination__last a:after{
47  
-                content:" »";
  47
+                content:"\00A0" "\00BB";
48 48
             }
49 49
 
50 50
 }//endif
2  objects/_rules.scss
@@ -42,7 +42,7 @@
42 42
     position:relative;
43 43
 
44 44
     &:after{
45  
-        content:"§";
  45
+        content:"\00A7";
46 46
         position:absolute;
47 47
         top:   0;
48 48
         right: 0;
10  objects/_sprite.scss
@@ -4,7 +4,7 @@
4 4
     $SPRITE
5 5
 \*------------------------------------*/
6 6
 /**
7  
- * Giving an element a class of `.s` will throw it into ‘sprite’ mode and apply
  7
+ * Giving an element a class of `.sprite` will throw it into ‘sprite’ mode and apply
8 8
  * a background image e.g.:
9 9
  *
10 10
    <a class="sprite  sprite--question-mark">More info&hellip;</a>
@@ -13,7 +13,7 @@
13 13
  *
14 14
    <a href=#><i class="sprite  sprite--question-mark"></i> Help and FAQ</a>
15 15
  *
16  
- * Giving an element a class of `.i` will throw it into ‘icon’ mode and will
  16
+ * Giving an element a class of `.icon` will throw it into ‘icon’ mode and will
17 17
  * not add a background, but should be used for icon fonts and is populated
18 18
  * through a `data-icon` attribute and the `:after` pseudo-element, e.g.:
19 19
  *
@@ -91,8 +91,8 @@
91 91
 /**
92 92
  * Icon size modifiers.
93 93
  */
94  
-.i--large   { font-size:32px; }
95  
-.i--huge    { font-size:64px; }
96  
-.i--natural { font-size:inherit; }
  94
+.icon--large   { font-size:32px; }
  95
+.icon--huge    { font-size:64px; }
  96
+.icon--natural { font-size:inherit; }
97 97
 
98 98
 }//endif

0 notes on commit 60d5c9e

Please sign in to comment.
Something went wrong with that request. Please try again.