Permalink
Browse files

Change base_size from 20 to 16.

  • Loading branch information...
1 parent 996926f commit 8f883cd9eccce799a3d6117a6ffefb46f8de9863 @jeremychurch committed Jul 20, 2014
Showing with 10 additions and 10 deletions.
  1. +2 −2 haml/index.haml
  2. +2 −2 index.html
  3. +3 −3 js/script.js
  4. +1 −1 sass/_layout.sass
  5. +1 −1 script.min.js
  6. +1 −1 style.css
View
@@ -42,7 +42,7 @@
%label Base Size
%input.base_size{type: 'text', style: 'max-width:4em;'}
%span.text_muted
- px = <span class="base_em">1.5</span>em
+ px = <span class="base_em"></span>em
.cols.cols_fields
.col_two_thirds
@@ -93,7 +93,7 @@
%label Permalink
.font_small.overflow_gradient
%a.param_url
- http://type-scale.com/?size=<span class="param_size">20</span>&amp;scale=<span class="param_scale">1.414</span>&amp;text=<span class="param_text">A Visual Type Scale</span>&amp;webfont=<span class="param_font">Libre+Baskerville</span>&amp;font-family=<span class="param_css">'Libre Baskerville', serif</span>&amp;font-weight=<span class="param_weight">400</span>&amp;font-family-headers=<span class="param_font_headers"></span>&amp;font-weight-headers=<span class="param_weight_headers">inherit</span>&amp;background-color=<span class="param_background_color">white</span>&amp;font-color=<span class="param_font_color">%23333</span>
+ http://type-scale.com/?size=<span class="param_size">16</span>&amp;scale=<span class="param_scale">1.414</span>&amp;text=<span class="param_text">A Visual Type Scale</span>&amp;webfont=<span class="param_font">Libre+Baskerville</span>&amp;font-family=<span class="param_css">'Libre Baskerville', serif</span>&amp;font-weight=<span class="param_weight">400</span>&amp;font-family-headers=<span class="param_font_headers"></span>&amp;font-weight-headers=<span class="param_weight_headers">inherit</span>&amp;background-color=<span class="param_background_color">white</span>&amp;font-color=<span class="param_font_color">%23333</span>
<script type="text/javascript" src="http://cdn.adpacks.com/adpacks.js?legacyid=1291994&zoneid=1408&key=0539c68d8c24c7e870a450d4e50e9e0e&serve=C6SIVKV&placement=typescalecom&circle=design" id="_adpacks_js"></script>
View
@@ -34,7 +34,7 @@
<label>Base Size</label>
<input class='base_size' style='max-width:4em;' type='text'>
<span class='text_muted'>
- px = <span class="base_em">1.5</span>em
+ px = <span class="base_em"></span>em
</span>
</div>
<div class='cols cols_fields'>
@@ -95,7 +95,7 @@
<label>Permalink</label>
<div class='font_small overflow_gradient'>
<a class='param_url'>
- http://type-scale.com/?size=<span class="param_size">20</span>&amp;scale=<span class="param_scale">1.414</span>&amp;text=<span class="param_text">A Visual Type Scale</span>&amp;webfont=<span class="param_font">Libre+Baskerville</span>&amp;font-family=<span class="param_css">'Libre Baskerville', serif</span>&amp;font-weight=<span class="param_weight">400</span>&amp;font-family-headers=<span class="param_font_headers"></span>&amp;font-weight-headers=<span class="param_weight_headers">inherit</span>&amp;background-color=<span class="param_background_color">white</span>&amp;font-color=<span class="param_font_color">%23333</span>
+ http://type-scale.com/?size=<span class="param_size">16</span>&amp;scale=<span class="param_scale">1.414</span>&amp;text=<span class="param_text">A Visual Type Scale</span>&amp;webfont=<span class="param_font">Libre+Baskerville</span>&amp;font-family=<span class="param_css">'Libre Baskerville', serif</span>&amp;font-weight=<span class="param_weight">400</span>&amp;font-family-headers=<span class="param_font_headers"></span>&amp;font-weight-headers=<span class="param_weight_headers">inherit</span>&amp;background-color=<span class="param_background_color">white</span>&amp;font-color=<span class="param_font_color">%23333</span>
</a>
</div>
</div>
View
@@ -43,9 +43,9 @@ $(document).ready(function() {
function setBaseSize() {
if (getQueryVariable('size') === false) {
- baseSize = 1.25;
- $('.base_size').val(20);
- $('.css_font_size').text(1.25);
+ baseSize = 1;
+ $('.base_size').val(16);
+ $('.css_font_size').text(1);
}
else {
baseSize = getQueryVariable('size') / 16;
View
@@ -81,7 +81,7 @@ body
color: #fff
.article_container
- font-size: 1.25em
+ // font-size: 1.25em // Only necessary if the base_size is different from the html font-size
@include transition(font-size 0.3s ease 0.3s)
.article_content
Oops, something went wrong.

0 comments on commit 8f883cd

Please sign in to comment.