charcoalcore 0.0.1.7 → 0.0.1.8

data/stylesheets/charcoalcore/_core-functions.scss

@@ -485,11 +485,11 @@ $module: false !default;
     font-weight: $weight;
     font-style: $style;
 
-    src: url('#{$file-path}.eot#iefix');
-    	src: url('#{$file-path}.eot?#iefix') format('embedded-opentype'),
-           url('#{$file-path}.woff') format('woff'),
-           url('#{$file-path}.ttf') format('truetype'),
-           url('#{$file-path}.svg##{$font-family}') format('svg');
+    src: font-url('#{$file-path}.eot#iefix');
+    	src: font-url('#{$file-path}.eot?#iefix') format('embedded-opentype'),
+           font-url('#{$file-path}.woff') format('woff'),
+           font-url('#{$file-path}.ttf') format('truetype'),
+           font-url('#{$file-path}.svg##{$font-family}') format('svg');
   }
 }
 

data/templates/project/assets/styles/_project-screen.scss

@@ -2,4 +2,5 @@
 
 /**
 * @tags: put your own style here
-*/
+*/
+@include font-face(Open Sans, 'opensans-regular-webfont');

data/templates/project/assets/styles/screen.css

@@ -4,99 +4,6 @@
 * @tags: Sass/Compass mixins & Include responsive grid base on getskeleton html/css structure || 960 (http://getskeleton.com/) or 1200 (https://github.com/theresponsiveness/GetSkeleton1200) || Fluid (http://app.responsify.it/
 * @note: compass/css3 & compass/reset are includes into charcoalcore.
 */
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/1\.8\/gems\/compass-0\.12\.2\/frameworks\/compass\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\0000317}}
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font: inherit;
-  font-size: 100%;
-  vertical-align: baseline;
-}
-
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/1\.8\/gems\/compass-0\.12\.2\/frameworks\/compass\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\0000322}}
-html {
-  line-height: 1;
-}
-
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/1\.8\/gems\/compass-0\.12\.2\/frameworks\/compass\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\0000324}}
-ol, ul {
-  list-style: none;
-}
-
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/1\.8\/gems\/compass-0\.12\.2\/frameworks\/compass\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\0000326}}
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/1\.8\/gems\/compass-0\.12\.2\/frameworks\/compass\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\0000328}}
-caption, th, td {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/1\.8\/gems\/compass-0\.12\.2\/frameworks\/compass\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\0000330}}
-q, blockquote {
-  quotes: none;
-}
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/1\.8\/gems\/compass-0\.12\.2\/frameworks\/compass\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\00003103}}
-q:before, q:after, blockquote:before, blockquote:after {
-  content: "";
-  content: none;
-}
-
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/1\.8\/gems\/compass-0\.12\.2\/frameworks\/compass\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\0000332}}
-a img {
-  border: none;
-}
-
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/1\.8\/gems\/compass-0\.12\.2\/frameworks\/compass\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\00003116}}
-article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
-  display: block;
-}
-
-/**
-* @tags: responsive grid || _resonsive-grid.scss || Skeleton 960 | Skeleton 1200 | Responsify
-*/
-/*
-* Skeleton V1.1
-* Copyright 2011, Dave Gamache
-* www.getskeleton.com
-* Free to use under the MIT license.
-* http://www.opensource.org/licenses/mit-license.php
-* 8/17/2011
-*/
-/**
-* @tags: 	getskeleton variable
-* @extend: 	swap between 960 or 1200
-* @format:	$layout: 960;
-*/
-/**
-* @tags: 	fixed grid
-*/
-/*****************/
-/**
-* @tags: enable or disable responsive grid
-*/
-/*****************/
-/*****************/
-/**
-* @tags:	core mixins library
-*/
 /*****************/
 /**
 * @file _core.functions.scss
@@ -531,4 +438,12 @@ h1, h2, h3, h4, h5, h6 {
 /**
 * @tags: put your own style here
 */
+@font-face {
+  font-family: Open Sans;
+  font-weight: normal;
+  font-style: normal;
+  src: url('../fonts/opensans-regular-webfont.eot#iefix');
+  src: url('../fonts/opensans-regular-webfont.eot?#iefix') format("embedded-opentype"), url('../fonts/opensans-regular-webfont.woff') format("woff"), url('../fonts/opensans-regular-webfont.ttf') format("truetype"), url('../fonts/opensans-regular-webfont.svg#Open Sans') format("svg");
+}
+
 /*****************/

data/templates/project/assets/styles/screen.scss

@@ -10,8 +10,8 @@ $responsive: none;
 * @note: compass/css3 & compass/reset are includes into charcoalcore.
 */
 
-@import "charcoalcore";
-
+//@import "charcoalcore";
+@import "../../../../stylesheets/charcoalcore/core-functions";
 /*****************/
 
 /**

data/templates/project/config.rb

@@ -6,6 +6,7 @@ css_dir = "assets/styles"
 sass_dir = "assets/styles"
 images_dir = "assets/images"
 javascripts_dir = "assets/scripts"
+fonts_dir = "assets/fonts"
 
 # You can select your preferred output style here (can be overridden via the command line):
 #output_style = :compressed

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 1
-  - 7
-  version: 0.0.1.7
+  - 8
+  version: 0.0.1.8
 platform: ruby
 authors: 
 - Responsiveness