framous 0.3.6 → 0.3.7

data/CHANGELOG.mkdn

@@ -1,6 +1,12 @@
 Framous Changelog
 =================
 
+v0.3.7 [Jul 31, 2013]
+---------------------
+* manifest.rg : new typography file
+* fixe typo
+* minor changes
+
 v0.3.6 [Jul 27, 2013]
 ---------------------
 * fixe typo

data/stylesheets/framous/base/_base.scss

@@ -7,8 +7,4 @@ body {
 	position: relative;
 	width: 100%;
 	background: $background-body-color;
-}
-
-.out-container {
-	@include out-container;
 }

data/stylesheets/framous/utility/_framous-settings.scss

@@ -49,14 +49,6 @@ $text-direction:			ltr;
 $default-float:				left;
 $default-opposite:			right;
 
-@if $text-direction == ltr {
-	$default-float: left;
-	$default-opposite: right;
-} @else {
-	$default-float: right;
-	$default-opposite: left;
-}
-
 // Font Settings
 
 $font-family:				"Open Sans", sans-serif;

data/stylesheets/framous/utility/_functions.scss

@@ -1,20 +1,34 @@
 // ---------------------------------------------------------------------------
 // Functions
-// Vertical Rhythm
+// Typography Functions
 
-@function rhythm(
-	$lines : 1,
-	$font-size : 1em
-) {
-    @if $lines == auto {
-        $lines : ceil($font-size / $base-line-height);
-    }
-    @return $base-line-height / $font-size * $lines * 1em;
+// Text Direction Settings
+
+@if $text-direction == ltr {
+	$default-float: left;
+	$default-opposite: right;
+} @else {
+	$default-float: right;
+	$default-opposite: left;
 }
 
+// Return em
+
 @function px-to-em(
 	$px,
 	$base : $base-font-size
 ) {
-    @return ($px / $base) * 1em;
+	@return ($px / $base) * 1em;
+}
+
+// Calculate rhythm units
+
+@function rhythm(
+	$lines : 1,
+	$font-size : 1em
+) {
+	@if $lines == auto {
+    	$lines : ceil($font-size / $base-line-height);
+    }
+	@return $base-line-height / $font-size * $lines * 1em;
 }

data/stylesheets/framous/utility/_mixins.scss

@@ -2,11 +2,15 @@
 // Mixins
 // Vertical Rhythm
 
+// Establish Baseline
+
 @mixin establish-baseline() {
   font-size: $base-font-size;
   line-height: $base-line-height;
 }
 
+// Adjust a block to have a different font size and line height to maintain the rhythm
+
 @mixin adjust-font-size-to(
 	$font-size,
 	$lines : ceil($font-size / $base-line-height)
@@ -15,6 +19,8 @@
     line-height: rhythm($lines, $font-size);
 }
 
+// Show a background image that can be used to debug your alignments
+
 @mixin debug-vertical-alignment($background-color : white) {
 	position: relative;
 

data/templates/project/manifest.rb

@@ -2,7 +2,9 @@ description 'Framous Compass Gem'
 
 # Sass Files
 stylesheet 'screen.scss', :media => 'screen, projection'
+
 stylesheet '../../stylesheets/framous/utility/_framous-settings.scss', :to => 'utility/_settings.scss'
+stylesheet '../../stylesheets/framous/base/_typography.scss', :to => 'base/_typography.scss'
 stylesheet '../../stylesheets/framous/base/_base.scss', :to => 'layout/_base.scss'
 stylesheet 'stylesheets/layout/_header.scss', :to => 'layout/_header.scss'
 stylesheet 'stylesheets/layout/_main.scss', :to => 'layout/_main.scss'

data/templates/project/screen.scss

@@ -1,6 +1,8 @@
-//
-// Screen.scss
-//
+/* ---------------------------------------------------------------------------
+	Framous: http://getframo.us
+	@version: v0.3.7
+	@credits: (c) 2013 Framous
+*//
 
 @charset "utf-8";
 
@@ -10,9 +12,12 @@
 // Framous
 @import "framous";
 
-// Settings that can be easily overridden from this file
+// Settings
 @import "utility/settings";
 
+// Base
+@import "base/typography";
+
 // Layout
 @import "layout/base";
 @import "layout/header";

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: framous
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Alec Hance