paint-rails 0.5.2 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef57bebc33400933ea1dffd54ecd37aec47e78f7
-  data.tar.gz: 79ac8b6858a0543e39e5b9c5c1f6f2ba4925036d
+  metadata.gz: 53138c1717e2a049119e62e5959ee65e39acfe95
+  data.tar.gz: 001c24e054b6aea4a6c92494e513b070aae258e4
 SHA512:
-  metadata.gz: 6bc823ed95c82d194dac0929541fdc49d438ee46f3c15e5c8dd4b9c2a2c43eb54ef89ac6e7dc810fdb38ec813ec1e89cea6a5fbd1065d9a64c74c5215148acfc
-  data.tar.gz: 1e063fd22bd7b315dbea9f7c897ab5dc56135368ce62aa124af5515a70b3ac8d020c8e5ee4e9c83bad4e2b3712c4d67451b54d3f3720f84c29123ce9e5d8b281
+  metadata.gz: 0eb5ae9743d392976c168d801a4ba6895327beb8c1d8022ee517cb763f0d218726a9bd1ad501c13cb3930074e35db8226d848e11911374cf11a5d85c43397120
+  data.tar.gz: 2664916950157e089dc395cfe993c86ca7d2727ce9830cdd01fcb17bb4d9a6b7a0012fe9214a622a3b2cc452d92f0d38341d5d2ac86d23a7214080d0f518e8d0

data/README.md

@@ -22,6 +22,15 @@ Or install it yourself as:
 
 TODO: Write usage instructions here
 
+### Update Paint Version
+1. Clone paint-rails
+2. git submodule init
+3. git submodule update
+4. In paint directory, checkout master branch and 'git pull' changes.
+5. Update lib/paint-rails/version.rb with updated version number.
+6. In root directory, run 'bundle exec rake paint:update'
+7. Commit changes and push, make PR.
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/paint-rails/fork )

data/lib/paint-rails/version.rb

@@ -1,5 +1,5 @@
 module Paint
   module Rails
-    VERSION = "0.5.2"
+    VERSION = "0.6.7"
   end
 end

data/vendor/assets/stylesheets/components/_button.scss

@@ -42,14 +42,26 @@ $include-html-paint-button: true !default;
 
 %button-primary {
   @include button(
-    $bg: $button-primary-background-color,
+    $bg: $white,
     $padding: $column-gutter / 2,
     $radius: $global-radius
   );
 
+  border: 1px solid $button-primary-background-color;
+  color: $button-primary-background-color;
   font-size: $small-font-size;
   font-weight: $font-weight-bold;
   text-transform: uppercase;
+
+  &:focus {
+    background-color: $white;
+    color: $button-primary-background-color;
+  }
+
+  &:hover {
+    background-color: $button-primary-background-color;
+    color: $white;
+  }
 }
 
 @include exports("paint-button") {

data/vendor/assets/stylesheets/components/_layout.scss

@@ -68,10 +68,11 @@ $include-html-paint-layout: true !default;
   #{$layout-sidebar-selector} {
     background-color: $layout-sidebar-nav-background-color;
     float: left;
+    font-family: $header-font-family;
+    font-weight: $layout-sidebar-font-weight;
     height: 100%;
     position: relative;
     width: $layout-sidebar-nav-width;
-    font-weight: $layout-sidebar-font-weight;
 
     @if $layout-sidebar-include-header {
       #{$layout-sidebar-header-selector} {
@@ -92,6 +93,7 @@ $include-html-paint-layout: true !default;
           color: $white;
           display: inline-block;
           margin: 0;
+          -webkit-font-smoothing: $body-font-smoothing;
         }
       }
     }
@@ -152,6 +154,7 @@ $include-html-paint-layout: true !default;
           padding: 0 $layout-sidebar-nav-padding;
           text-decoration: none;
           white-space: nowrap;
+          -webkit-font-smoothing: $header-font-smoothing;
 
           &, &:visited {
             color: $layout-sidebar-nav-link-text-color;

data/vendor/assets/stylesheets/components/_typography.scss

@@ -0,0 +1,23 @@
+$typography-header-tags: h1, h2, h3, h4, h5, h6, blockquote !default;
+
+$include-html-paint-typography: true !default;
+
+@mixin typography-font-smoothing($header-tags: $typography-header-tags) {
+  body {
+    -webkit-font-smoothing: $body-font-smoothing;
+  }
+
+  @for $i from 1 through length($header-tags) {
+    $tag: nth($header-tags, $i);
+
+    #{$tag} {
+      -webkit-font-smoothing: $header-font-smoothing;
+    }
+  }
+}
+
+@include exports("paint-typography") {
+  @if $include-html-paint-typography {
+    @include typography-font-smoothing;
+  }
+}

data/vendor/assets/stylesheets/globals/_settings.scss

@@ -26,25 +26,33 @@ $secondary-color: #a42524;
 
 // Fonts
 
-$body-font-family: 'Open Sans', 'Helvetica Neue', Helvetica, sans-serif;
+$body-font-family: "Helvetica Neue", Helvetica, sans-serif;
 $font-weight-normal: 300;
 $font-weight-bold: 400;
 $font-weight-extrabold: 600;
 
-$base-font-size: 14px;
+$base-font-size: 14px !default;
+$rem-base: 16px !default;
+$base-line-height: 2;
 $small-font-size: 80%;
 
+$body-font-smoothing: subpixel-antialiased;
+$header-font-smoothing: antialiased;
+
+$paragraph-font-weight: $font-weight-bold;
+
 // Headers
 
+$header-font-family: "Helvetica Neue", Helvetica, sans-serif;
 $header-font-weight: $font-weight-normal;
-$header-text-rendering: antialiased;
-
-$h1-font-size: rem-calc(37);
-$h2-font-size: rem-calc(27);
-$h3-font-size: rem-calc(23);
-$h4-font-size: rem-calc(20);
-$h5-font-size: rem-calc(18);
-$h6-font-size: 1rem;
+$header-line-height: 2;
+
+$h1-font-size: 2.25rem;
+$h2-font-size: 1.75rem;
+$h3-font-size: 1.375rem;
+$h4-font-size: 1.125rem;
+$h5-font-size: 1rem;
+$h6-font-size: 0.875rem;
 
 // Code
 

data/vendor/assets/stylesheets/paint.scss

@@ -1,5 +1,3 @@
-@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,600,300");
-
 @import "bower_components/foundation/scss/foundation/functions";
 
 @import "globals/settings";
@@ -13,7 +11,7 @@
 @import "components/button";
 @import "components/dropdown";
 @import "components/grid";
-@import "components/heading";
+@import "components/typography";
 @import "components/icon";
 @import "components/label";
 @import "components/layout";

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paint-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.7
 platform: ruby
 authors:
 - Damon Aw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -446,11 +446,11 @@ files:
 - vendor/assets/stylesheets/components/_button.scss
 - vendor/assets/stylesheets/components/_dropdown.scss
 - vendor/assets/stylesheets/components/_grid.scss
-- vendor/assets/stylesheets/components/_heading.scss
 - vendor/assets/stylesheets/components/_icon.scss
 - vendor/assets/stylesheets/components/_label.scss
 - vendor/assets/stylesheets/components/_layout.scss
 - vendor/assets/stylesheets/components/_progress-bar.scss
+- vendor/assets/stylesheets/components/_typography.scss
 - vendor/assets/stylesheets/globals/_mixins.scss
 - vendor/assets/stylesheets/globals/_settings.scss
 - vendor/assets/stylesheets/paint.scss
@@ -474,8 +474,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails Integration for Paint
 test_files: []
+has_rdoc: 

data/vendor/assets/stylesheets/components/_heading.scss

@@ -1,17 +0,0 @@
-%heading-large-uppercase {
-  font-size: $h1-font-size;
-  font-weight: $font-weight-normal;
-  text-transform: uppercase;
-}
-
-%heading-medium-uppercase {
-  font-size: $h4-font-size;
-  font-weight: $font-weight-bold;
-  text-transform: uppercase;
-}
-
-%heading-small-uppercase {
-  font-size: $h5-font-size;
-  font-weight: $font-weight-bold;
-  text-transform: uppercase;
-}