concisecss 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1b6ce77eeca46171d09e4044f68946c53ee2f6e
-  data.tar.gz: fe020d68e3afd45b8ab0e59c42f82d06c03fca34
+  metadata.gz: 844d9f983926cf8459ac3f66bed3abcd73493a6b
+  data.tar.gz: d37e0525ca8ce09672b127070886618a1fd05e0f
 SHA512:
-  metadata.gz: cea1e370c47ad844b411d4f292bf4bc97d29393aedcf0064f4904d7166f462143173b1bb9f9c81debf27c265cc1190329178873522508891d8f325b3e8bd7a6a
-  data.tar.gz: e413fa799bef80e415e370354a36baab35d692767f8f0aa85de83747d65667b5b0c22734e0b1e95a47d3fa0dac2a2bb558b99c8d8456b00936173aa50c2a6184
+  metadata.gz: fc1aeeae747c9d10416cc93b92be83b5ba09c2bcfc6042f0b7bd35c2f48b4699ba89e67ff51b524b3714c2af7d88907fdbef3ea5cb55d894d79815cdf5a18459
+  data.tar.gz: cf55f1616652974a8f12fb610749dca0a41ea4f0a65139c3758a5826947c365d68b6d8e1b19813cdb107c43e0f62146d0150cd291478092fa78461f7dc981eb0

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.1
+  - 2.1.2
+branches:
+  only:
+    - master

data/README.md

@@ -9,7 +9,7 @@ Concise is a lightweight, front-end framework that provides a number of great fe
 
 Add this line to your application's Gemfile:
 
-    gem 'concisecss', '~> 0.0.3'
+    gem 'concisecss', '~> 0.0.5'
 
 And then execute:
 
@@ -61,5 +61,3 @@ Concise is currently maintained under the [Semantic Versioning guidelines](http:
 ## License
 
 Code released under the [MIT license](https://github.com/ConciseCSS/concise.css/blob/master/LICENSE). Documentation released under [Creative Commons](http://creativecommons.org/licenses/by-sa/4.0/).
-
-[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/4f404142bdcae0124dadfb2427083d1f "githalytics.com")](http://githalytics.com/ConciseCSS/concise.css-gem)

data/Rakefile

@@ -2,6 +2,7 @@ require "bundler/gem_tasks"
 require File.expand_path('../lib/concisecss/concisecss_source', __FILE__)
 
 desc "Get latest files from concisecss"
+task :default => ['update-concisecss']
 task "update-concisecss" do
   files = ConcisecssSource.new
   files.fetch

data/app/assets/javascripts/concisecss.js

@@ -0,0 +1 @@
+//= require concisecss

data/app/assets/stylesheets/_defaults.scss

@@ -1,4 +1,4 @@
-// Thanks to inuitcss (https://github.com/csswizardry/inuit.css/blob/master/_defaults.scss) 
+// Thanks to inuitcss (https://github.com/csswizardry/inuit.css/blob/master/_defaults.scss)
 // for the inspiration to create a default file for variables
 
 
@@ -24,7 +24,7 @@ $base-spacing-unit: $base-line-height !default;
 $half-spacing-unit: $base-spacing-unit / 2 !default;
 $line-height-ratio: $base-line-height / $base-font-size;
 
- 
+
 
 
 //------------------------------------
@@ -103,7 +103,7 @@ $placeholder-color: #bbbbbb !default;
 
 // Colors used for our objects' borders, etc
 $object-ui-color: #ededed !default;
- 
+
 
 
 
@@ -111,7 +111,7 @@ $object-ui-color: #ededed !default;
 //  OBJECTS
 //------------------------------------
 
-// Gutter size 
+// Gutter size
 $gutters: 2% !default;
 
 
@@ -120,9 +120,9 @@ $gutters: 2% !default;
 $column-prefix: 'column-' !default;
 
 
-// Dictate how many columns you would like your 
+// Dictate how many columns you would like your
 // grid system to use. Default is 16.
-$column-number:  16 !default; 
+$column-number:  16 !default;
 
 
 // Border radius value for `.border-radius` class
@@ -138,8 +138,8 @@ $border-radius: 4px !default;
 // Set whatever components you want included
 // in your project to `true` and any components
 // you do not wish to be included to `false`
-// 
-// Thanks to inuitcss (https://github.com/csswizardry/inuit.css/blob/master/_defaults.scss) 
+//
+// Thanks to inuitcss (https://github.com/csswizardry/inuit.css/blob/master/_defaults.scss)
 // for the idea to use feature switches in a framework. It's an absolutely brilliant idea
 // that makes customization so much easier.
 
@@ -166,7 +166,7 @@ $use-grid:           true !default;
   $use-push:	       false !default;
   $use-pull:	       false !default;
 
-  
+
 // Objects
 $use-type-colors:             true !default;
 $use-bg-colors:               true !default;
@@ -184,4 +184,4 @@ $use-progress:                true !default;
 // Helpers
 $use-helper:      true !default;
 $use-conditional: true !default;
-$use-print:       true !default;
+$use-print:       true !default;

data/app/assets/stylesheets/concise.scss

@@ -8,45 +8,6 @@
  * http://opensource.org/licenses/MIT
  *
  */
-
-
-
-
-//------------------------------------
-//  CONTENTS
-//------------------------------------
-//
-// MIXINS
-// NORMALIZE
-// CLEARFIX
-// SHARED
-//
-// MAIN
-// SELECTION
-// CONTAINER
-// TYPE
-// HEADINGS
-// BLOCKQUOTES
-// LISTS
-// TABLES
-// FORMS
-// GRID
-//
-// COLORS
-// BUTTONS
-// GROUPS
-// DROPDOWNS
-// NAVIGATION
-// BREADCRUMBS
-// WELLS
-// BADGES
-// PROGRESS
-//
-// HELPER
-// CONDITIONAL
-// PRINT
-//
-//
  
  
  

data/app/assets/stylesheets/generic/_mixins.scss

@@ -1,6 +1,37 @@
+//------------------------------------
+//  FUNCTIONS
+//------------------------------------
+
+//
+// Calculates proper rem font-size given
+// a pixel amount.
+//
+@function calculate-rem($font-size) {
+  $rem-size: ($font-size / $base-font-size) * 1rem;
+  @return $rem-size;
+}
+
+
+//
+// Calculates proper line-height given a
+// font-size to maintain vertical rhythm.
+//
+@function calculate-line-height($font-size) {
+  $line-height-size: ceil($font-size / $base-line-height) * ($base-line-height / $font-size);
+  @return $line-height-size;
+}
+
+
+
+
+//------------------------------------
+//  MIXINS
+//------------------------------------
+
 //
-// Passing in a single value will create font-sizing in
-// pixels, rems as well as a proper line-height.
+// Uses `calculate-rem()` to calculate rem font-size and px
+// fallback. line-height is calculated with `calculate-line-height()`
+// but passing `false` will prevent that.
 //
 //  `@include font-size(24px);`
 //
@@ -8,14 +39,11 @@
 // Big thanks to inuitcss for inspiration behind this
 // (https://github.com/csswizardry/inuit.css/blob/master/generic/_mixins.scss)
 @mixin font-size($font-size, $line-height: true) {
-  $rem-size: ($font-size / $base-font-size) * 1rem;
-  $line-height-size: ceil($font-size / $base-line-height) * ($base-line-height / $font-size);
-  
   font-size: $font-size;
-  font-size: $rem-size;
+  font-size: calculate-rem($font-size);
 
   @if $line-height == true {
-    line-height: $line-height-size;
+    line-height: calculate-line-height($font-size);
   }
 }
 

data/concisecss.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake', '~> 0'
   spec.add_development_dependency 'rails', '~> 4.0'
-  spec. add_development_dependency 'httpclient', '~> 2.2', '~> 0'
+  spec.add_development_dependency 'httpclient', '~> 2.4', '>= 2.4.0'
 end

data/lib/concisecss/version.rb

@@ -1,3 +1,3 @@
 module Concisecss
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concisecss
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Benjamin Sigidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,20 +58,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "~>"
+        version: '2.4'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "~>"
+        version: '2.4'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
 description: Concise is built on a set of simple but important principles that aid
   in effective and manageable web design. By understanding these principles, Concise
   can be used to it's full potential and we can create a better paradigm for using
@@ -83,10 +83,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/javascripts/concisecss.js
 - app/assets/javascripts/concisecss/close.js
 - app/assets/javascripts/concisecss/dropdown.js
 - app/assets/javascripts/concisecss/naver.js