]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
projects / thirdparty / foundation / foundation-sites.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d3e9293)
Renamed(and recoded) font typescale to typescale
authorharry <harmanmanchanda182@gmail.com>
Fri, 24 Feb 2017 11:00:40 +0000 (16:30 +0530)
committerharry <harmanmanchanda182@gmail.com>
Fri, 24 Feb 2017 11:00:40 +0000 (16:30 +0530)
`.font-h1` => `.h1` and so on like other frameworks!

docs/pages/prototyping.md patch | blob | blame | history
scss/prototype/_typescale.scss patch | blob | blame | history
test/visual/prototype/typescale.html [moved from test/visual/prototype/font-typescale.html with 67% similarity] patch | blob | blame | history

diff --git a/docs/pages/prototyping.md b/docs/pages/prototyping.md
index e7f2f16efae21f6ab4b3ec9f6a048763766afd90..e8dc23d0b1dc33f9ed0d771f181c4bedfb44e12e 100644 (file)
--- a/docs/pages/prototyping.md
+++ b/docs/pages/prototyping.md
@@ -197,17 +197,17 @@ You can use font styling to style your text. You can change the font styling by
 
 ---
 
-## Font Typescale
+## Typescale
 
 Adjust font-size by overriding an element’s default size.
 
 ```html_example
-<p class="font-h1">Lorem Ipsum Dolor</p>
-<p class="font-h2">Lorem Ipsum Dolor</p>
-<p class="font-h3">Lorem Ipsum Dolor</p>
-<p class="font-h4">Lorem Ipsum Dolor</p>
-<p class="font-h5">Lorem Ipsum Dolor</p>
-<p class="font-h6">Lorem Ipsum Dolor</p>
+<p class="h1">Lorem Ipsum Dolor</p>
+<p class="h2">Lorem Ipsum Dolor</p>
+<p class="h3">Lorem Ipsum Dolor</p>
+<p class="h4">Lorem Ipsum Dolor</p>
+<p class="h5">Lorem Ipsum Dolor</p>
+<p class="h6">Lorem Ipsum Dolor</p>
 ```
 
 ---
@@ -221,23 +221,23 @@ Adjust font-size by overriding an element’s default size.
 #### Unordered Lists
 
 ```html
-<ul class="no-bullets"> <!-- <li>First</li> <li>Second</li> --></ul>
-<ul class="list-disc">  <!-- <li>First</li> <li>Second</li> --></ul>
-<ul class="list-circle"><!-- <li>First</li> <li>Second</li> --></ul>
-<ul class="list-square"><!-- <li>First</li> <li>Second</li> --></ul>
+<ul class="no-bullets"></ul>
+<ul class="list-disc"></ul>
+<ul class="list-circle"></ul>
+<ul class="list-square"></ul>
 ``` 
 
 #### Ordered Lists
 
 ```html
-<ol class="no-bullets">      <!-- <li>First</li> <li>Second</li> --></ol>
-<ol class="list-decimal">    <!-- <li>First</li> <li>Second</li> --></ol>
-<ol class="list-lower-alpha"><!-- <li>First</li> <li>Second</li> --></ol>
-<ol class="list-lower-latin"><!-- <li>First</li> <li>Second</li> --></ol>
-<ol class="list-lower-roman"><!-- <li>First</li> <li>Second</li> --></ol>
-<ol class="list-upper-alpha"><!-- <li>First</li> <li>Second</li> --></ol>
-<ol class="list-upper-latin"><!-- <li>First</li> <li>Second</li> --></ol>
-<ol class="list-upper-roman"><!-- <li>First</li> <li>Second</li> --></ol>
+<ol class="no-bullets"></ol>
+<ol class="list-decimal"></ol>
+<ol class="list-lower-alpha"></ol>
+<ol class="list-lower-latin"></ol>
+<ol class="list-lower-roman"></ol>
+<ol class="list-upper-alpha"></ol>
+<ol class="list-upper-latin"></ol>
+<ol class="list-upper-roman"></ol>
 ``` 
 
 ---
diff --git a/scss/prototype/_typescale.scss b/scss/prototype/_typescale.scss
index 7b807e8d0760e838258d4b21b4c5d0ff7ab69c3c..68698d25f827ae4d8d2e0e978e6a6a0f78338265 100644 (file)
--- a/scss/prototype/_typescale.scss
+++ b/scss/prototype/_typescale.scss
@@ -11,7 +11,7 @@
     @include breakpoint($size) {
       @each $header, $header-defs in $headers {
         $font-size-temp: 1rem;
-        .font-#{$header} {
+        .#{$header} {
           @extend #{$header};
         }
       }
diff --git a/test/visual/prototype/font-typescale.html b/test/visual/prototype/typescale.html
similarity index 67%
rename from test/visual/prototype/font-typescale.html
rename to test/visual/prototype/typescale.html
index 139504d1f9e34f3d136acddef459f210a938e34b..269f871e0d4297a9e4de24ccdd67600bb02dd11c 100644 (file)
--- a/test/visual/prototype/font-typescale.html
+++ b/test/visual/prototype/typescale.html
@@ -11,12 +11,12 @@
   <body>
     <div class="row column">
       <p class="margin-top-1">&nbsp;</p>
-      <p class="font-h1">Font-H1: Lorem Ipsum Dolor</p>
-      <p class="font-h2">Font-H2: Lorem Ipsum Dolor</p>
-      <p class="font-h3">Font-H3: Lorem Ipsum Dolor</p>
-      <p class="font-h4">Font-H4: Lorem Ipsum Dolor</p>
-      <p class="font-h5">Font-H5: Lorem Ipsum Dolor</p>
-      <p class="font-h6">Font-H6: Lorem Ipsum Dolor</p>
+      <p class="h1">Lorem Ipsum Dolor</p>
+      <p class="h2">Lorem Ipsum Dolor</p>
+      <p class="h3">Lorem Ipsum Dolor</p>
+      <p class="h4">Lorem Ipsum Dolor</p>
+      <p class="h5">Lorem Ipsum Dolor</p>
+      <p class="h6">Lorem Ipsum Dolor</p>
     </div>
 
     <script src="../assets/js/vendor.js"></script>
Mirror of https://github.com/foundation/foundation-sites.git