bulk up holy grail template

bryce · bryce · commit 987cc4201575 · 2014-04-02T23:45:05.000-04:00
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/css/build/prefixed/style.css b/css/build/prefixed/style.css
@@ -576,6 +576,12 @@ i {
   .fi-settings-btn i {
     color: white; }
 
+.fi-content {
+  font-size: 18.4px;
+  font-size: 1.15rem;
+  line-height: 20.8px;
+  line-height: 1.3rem; }
+
 .fi-options {
   position: absolute;
   bottom: 1em;
diff --git a/css/build/style.css b/css/build/style.css
@@ -481,6 +481,12 @@ i {
   .fi-settings-btn i {
     color: white; }
 
+.fi-content {
+  font-size: 18.4px;
+  font-size: 1.15rem;
+  line-height: 20.8px;
+  line-height: 1.3rem; }
+
 .fi-options {
   position: absolute;
   bottom: 1em;
diff --git a/js/main.js b/js/main.js
@@ -979,23 +979,23 @@ var flexbox;
                     flexShrink: "0",
                     flexBasis: "200px",
                     height: null,
-                    lorem: 50 }), new flexbox.model.FlexItem(this, index++, {
+                    lorem: 70 }), new flexbox.model.FlexItem(this, index++, {
                     viewContent: true,
                     viewSettings: false,
                     isFlexyWidth: true,
                     flexGrow: "1",
                     flexShrink: "0",
                     flexBasis: "200px",
                     height: null,
-                    lorem: 50 }), new flexbox.model.FlexItem(this, index++, {
+                    lorem: 70 }), new flexbox.model.FlexItem(this, index++, {
                     viewContent: true,
                     viewSettings: false,
                     isFlexyWidth: true,
                     flexGrow: "1",
                     flexShrink: "0",
                     flexBasis: "200px",
                     height: null,
-                    lorem: 50 }), new flexbox.model.FlexItem(this, index++, {
+                    lorem: 70 }), new flexbox.model.FlexItem(this, index++, {
                     isFlexyWidth: true,
                     flexGrow: "1",
                     flexShrink: "0",
diff --git a/scss/modules/_flex-item.scss b/scss/modules/_flex-item.scss
@@ -34,7 +34,7 @@ $dist:.75em; $dist2:2em;
 }
 
 .fi-content {
-
+  @include font-size(1.15,1.3);
 }
 
 .fi-options {
diff --git a/ts/view/Container.ts b/ts/view/Container.ts
@@ -408,8 +408,8 @@ module flexbox {
                             flexGrow: "1",
                             flexShrink: "0",
                             flexBasis: "200px",
-                            height:  null,
-                            lorem: 50 }),
+                            height: null,
+                            lorem: 70 }),
 
                     new flexbox.model.FlexItem(this, index++,
                         { viewContent: true,
@@ -419,7 +419,7 @@ module flexbox {
                             flexShrink: "0",
                             flexBasis: "200px",
                             height:  null,
-                            lorem: 50 }),
+                            lorem: 70 }),
 
                     new flexbox.model.FlexItem(this, index++,
                         {   viewContent: true,
@@ -429,7 +429,7 @@ module flexbox {
                             flexShrink: "0",
                             flexBasis: "200px",
                             height: null,
-                            lorem: 50 }),
+                            lorem: 70 }),
 
                     new flexbox.model.FlexItem(this, index++,
                         { isFlexyWidth: true,

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ $dist:.75em; $dist2:2em;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`.fi-content {`
`37`		`-`
	`37`	`+ @include font-size(1.15,1.3);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`.fi-options {`