bootstrap-generators 3.3.1 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cff101b0f3c336c4dc668c9fc174938a3089771
-  data.tar.gz: 416e1baf6efa343ad79b8c18d783008d68838a4e
+  metadata.gz: f4a3d07d527b60b1c67eee3d6831460b2e5f0dbc
+  data.tar.gz: c13cd8174483cbb8e2191c50007f178f0fa42030
 SHA512:
-  metadata.gz: a417da5dc22e34a4cb0649132b1fe8089d4fa796d3cd4498dca087137b98694ddf0cf35b0f30bb0e7e2524537794f736bc01e2762f640c285413b863504f9f0d
-  data.tar.gz: 97eb67dc8e8b583224e4d98e68fda3aaba4b4139732a4a83c44bb503ac53a70eb5975af3771aad12a7d13fbac49be17e3204f2a66c02d095ae0db52a03602f3e
+  metadata.gz: fca2a0308dc86d7b0f2efa18f0a362f7e06a78e0b8f5c5a0cedbb177a5926bfdc147bbf5ae0fab55adaa89a8827b0ea3cc96cbd56a8fb9cde7e1aaa1ef0ba31d
+  data.tar.gz: d4d535413c855d5a8c5ed8acdbfc784e44b9503590eeef27b5fd399bdf47dff3e74ef768e95c953acdd6af339702a35c51f4f60bad5ebdb07ad991abe3895cd3

data/README.md

@@ -6,17 +6,17 @@ Bootstrap-generators provides [Twitter Bootstrap](http://getbootstrap.com/) gene
 
 ## Current Twitter Bootstrap version
 
-The current supported version of Twitter Bootstrap is 3.3.1.
+The current supported version of Twitter Bootstrap is 3.3.4.
 
 ## Installing Gem
 
 In your Gemfile, add this line:
 
-    gem 'bootstrap-generators', '~> 3.3.1'
+    gem 'bootstrap-generators', '~> 3.3.4'
 
 Or you can install from latest build:
 
-    gem 'bootstrap-generators', :git => 'git://github.com/decioferreira/bootstrap-generators.git'
+    gem 'bootstrap-generators', git: 'git://github.com/decioferreira/bootstrap-generators.git'
 
 Run bundle install:
 
@@ -162,6 +162,14 @@ In Rails 3.0 and above, generators don’t just look in the source root for temp
 
 Since Bootstrap Generators installs its templates under lib/templates, you can go and customize them.
 
+## Update Bootstrap Version
+
+To update the version of Bootstrap on this Gem you can run the following command:
+
+    rake bootstrap:update
+
+There might be some manual changes needed after running this command. But most of the process is automatic.
+
 ## Credits
 
 * [Twitter Bootstrap](http://getbootstrap.com)

data/Rakefile

@@ -8,13 +8,13 @@ Rake::TestTask.new do |t|
   t.verbose = false
 end
 
-task :default => :test
+task default: :test
 
 namespace :bootstrap do
   desc "Update to a new version of Twitter Bootstrap"
   task :update do
-    bootstrap_version = "3.3.1"
-    striped_bootstrap_generators_version = "3.3.1"
+    bootstrap_version = "3.3.4"
+    striped_bootstrap_generators_version = "3.3.4"
 
     twitter_latest_dist_zip_url = "https://github.com/twbs/bootstrap/archive/v#{bootstrap_version}.zip"
     twitter_sass_lastest_dist_zip_url = "https://github.com/twbs/bootstrap-sass/archive/v#{bootstrap_version}.zip"

data/lib/bootstrap-generators.rb

@@ -11,7 +11,7 @@ module Bootstrap
 
         app.config.assets.paths << ::Rails.root.join('app', 'assets', 'fonts')
 
-        app.config.assets.precompile << /\.(?:svg|eot|woff|ttf)$/
+        app.config.assets.precompile << /\.(?:svg|eot|woff|woff2|ttf)$/
       end
     end
   end

data/lib/bootstrap/generators/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Generators
-    VERSION = '3.3.1'
+    VERSION = '3.3.4'
   end
 end

data/lib/generators/bootstrap/install/install_generator.rb

@@ -8,7 +8,7 @@ module Bootstrap
 
       class_option :template_engine
       class_option :stylesheet_engine
-      class_option :skip_turbolinks, :type => :boolean, :default => false, :desc => "Skip Turbolinks on assets"
+      class_option :skip_turbolinks, type: :boolean, default: false, desc: "Skip Turbolinks on assets"
 
       def copy_lib
         directory "lib/templates/#{options[:template_engine]}"

data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less

@@ -14,7 +14,7 @@
 @gray-light:             lighten(@gray-base, 46.7%); // #777
 @gray-lighter:           lighten(@gray-base, 93.5%); // #eee
 
-@brand-primary:         darken(#428bca, 6.5%);
+@brand-primary:         darken(#428bca, 6.5%); // #337ab7
 @brand-success:         #5cb85c;
 @brand-info:            #5bc0de;
 @brand-warning:         #f0ad4e;
@@ -99,7 +99,7 @@
 @padding-xs-vertical:       1px;
 @padding-xs-horizontal:     5px;
 
-@line-height-large:         1.33;
+@line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
 @line-height-small:         1.5;
 
 @border-radius-base:        4px;
@@ -187,6 +187,7 @@
 
 // TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
 //** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
 @input-border-radius:            @border-radius-base;
 //** Large `.form-control` border radius
 @input-border-radius-large:      @border-radius-large;
@@ -206,6 +207,9 @@
 //** Small `.form-control` height
 @input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
 
+//** `.form-group` margin
+@form-group-margin-bottom:       15px;
+
 @legend-color:                   @gray-dark;
 @legend-border-color:            #e5e5e5;
 
@@ -265,7 +269,8 @@
 @zindex-popover:           1060;
 @zindex-tooltip:           1070;
 @zindex-navbar-fixed:      1030;
-@zindex-modal:             1040;
+@zindex-modal-background:  1040;
+@zindex-modal:             1050;
 
 
 //== Media queries breakpoints

data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss

@@ -1,8 +1,4 @@
-// When true, asset path helpers are used, otherwise the regular CSS `url()` is used.
-// When there no function is defined, `fn('')` is parsed as string that equals the right hand side
-// NB: in Sass 3.3 there is a native function: function-exists(twbs-font-path)
-$bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;
-
+$bootstrap-sass-asset-helper: false !default;
 //
 // Variables
 // --------------------------------------------------
@@ -19,7 +15,7 @@ $gray:                   lighten($gray-base, 33.5%) !default; // #555
 $gray-light:             lighten($gray-base, 46.7%) !default; // #777
 $gray-lighter:           lighten($gray-base, 93.5%) !default; // #eee
 
-$brand-primary:         darken(#428bca, 6.5%) !default;
+$brand-primary:         darken(#428bca, 6.5%) !default; // #337ab7
 $brand-success:         #5cb85c !default;
 $brand-info:            #5bc0de !default;
 $brand-warning:         #f0ad4e !default;
@@ -82,7 +78,8 @@ $headings-color:          inherit !default;
 
 //** Load fonts from this directory.
 
-// [converter] Asset helpers such as Sprockets and Node.js Mincer do not resolve relative paths
+// [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
+// [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
 $icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "bootstrap/") !default;
 
 //** File name for all font files.
@@ -107,7 +104,7 @@ $padding-small-horizontal:  10px !default;
 $padding-xs-vertical:       1px !default;
 $padding-xs-horizontal:     5px !default;
 
-$line-height-large:         1.33 !default;
+$line-height-large:         1.3333333 !default; // extra decimals for Win 8.1 Chrome
 $line-height-small:         1.5 !default;
 
 $border-radius-base:        4px !default;
@@ -195,6 +192,7 @@ $input-border:                   #ccc !default;
 
 // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
 //** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
 $input-border-radius:            $border-radius-base !default;
 //** Large `.form-control` border radius
 $input-border-radius-large:      $border-radius-large !default;
@@ -214,6 +212,9 @@ $input-height-large:             (ceil($font-size-large * $line-height-large) +
 //** Small `.form-control` height
 $input-height-small:             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
 
+//** `.form-group` margin
+$form-group-margin-bottom:       15px !default;
+
 $legend-color:                   $gray-dark !default;
 $legend-border-color:            #e5e5e5 !default;
 
@@ -273,7 +274,8 @@ $zindex-dropdown:          1000 !default;
 $zindex-popover:           1060 !default;
 $zindex-tooltip:           1070 !default;
 $zindex-navbar-fixed:      1030 !default;
-$zindex-modal:             1040 !default;
+$zindex-modal-background:  1040 !default;
+$zindex-modal:             1050 !default;
 
 
 //== Media queries breakpoints

data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb

@@ -1,4 +1,4 @@
-<%%= form_for(@<%= singular_table_name %>, :html => { :class => "form-horizontal", :role => "form" }) do |f| %>
+<%%= form_for(@<%= singular_table_name %>, html: { class: "form-horizontal", role: "form" }) do |f| %>
   <%% if @<%= singular_table_name %>.errors.any? %>
     <div class="alert alert-danger alert-dismissable" role="alert">
       <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
@@ -14,15 +14,15 @@
 
 <% attributes.each do |attribute| -%>
   <div class="form-group">
-    <%%= f.label :<%= attribute.name %>, :class => "col-sm-2 control-label" %>
+    <%%= f.label :<%= attribute.name %>, class: "col-sm-2 control-label" %>
     <div class="col-sm-10">
-      <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "form-control" %>
+      <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, class: "form-control" %>
     </div>
   </div>
 <% end -%>
   <div class="form-group">
     <div class="col-sm-offset-2 col-sm-10">
-      <%%= f.submit :class => "btn btn-primary" %>
+      <%%= f.submit class: "btn btn-primary" %>
     </div>
   </div>
 <%% end %>

data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml

@@ -1,9 +1,9 @@
-= form_for @<%= singular_table_name %>, :html => { :class => "form-horizontal", :role => "form" } do |f|
+= form_for @<%= singular_table_name %>, html: { class: "form-horizontal", role: "form" } do |f|
   -if @<%= singular_table_name %>.errors.any?
-    .alert.alert-danger.alert-dismissable{:role => "alert"}
-      %button.close{:type => "button", :data => {:dismiss => "alert"} }
-        span{:aria => {:hidden => "true"} } &times;
-        span.sr-only Close
+    .alert.alert-danger.alert-dismissable{role: "alert"}
+      %button.close{type: "button", data: {dismiss: "alert"} }
+        %span{aria: {hidden: "true"} } &times;
+        %span.sr-only Close
       %h4= "#{pluralize(@<%= singular_table_name %>.errors.count, "error")} prohibited this <%= singular_table_name %> from being saved:"
 
       %ul
@@ -12,10 +12,10 @@
 
 <% for attribute in attributes -%>
   .form-group
-    = f.label :<%= attribute.name %>, :class => 'col-sm-2 control-label'
+    = f.label :<%= attribute.name %>, class: 'col-sm-2 control-label'
     .col-sm-10
-      = f.<%= attribute.field_type %> :<%= attribute.name %>, :class => 'form-control'
+      = f.<%= attribute.field_type %> :<%= attribute.name %>, class: 'form-control'
 <% end -%>
   .form-group
     .col-sm-offset-2.col-sm-10
-      = f.submit :class => 'btn btn-primary'
+      = f.submit class: 'btn btn-primary'

data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.slim

@@ -1,4 +1,4 @@
-= form_for(@<%= singular_table_name %>, :html => { :class => "form-horizontal", :role => "form" }) do |f|
+= form_for(@<%= singular_table_name %>, html: { class: "form-horizontal", role: "form" }) do |f|
   - if @<%= singular_table_name %>.errors.any?
     .alert.alert-danger.alert-dismissable role="alert"
       button.close type="button" data-dismiss="alert"
@@ -12,10 +12,10 @@
           li= msg
 <%-  attributes.each do |attribute| -%>
   .form-group
-    = f.label :<%= attribute.name %>, :class => "col-sm-2 control-label"
+    = f.label :<%= attribute.name %>, class: "col-sm-2 control-label"
     .col-sm-10
-      = f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "form-control"
+      = f.<%= attribute.field_type %> :<%= attribute.name %>, class: "form-control"
 <%- end -%>
   .form-group
     .col-sm-offset-2.col-sm-10
-      = f.submit :class => "btn btn-primary"
+      = f.submit class: "btn btn-primary"

data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb

@@ -32,7 +32,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <%%= link_to "Project name", "#", :class => "navbar-brand" %>
+        <%%= link_to "Project name", "#", class: "navbar-brand" %>
       </div>
       <div id="navbar" class="collapse navbar-collapse">
         <ul class="nav navbar-nav">
@@ -45,7 +45,7 @@
   </nav>
   <div class="container">
     <%% flash.each do |name, msg| %>
-      <%%= content_tag :div, :class => "alert alert-#{ name == :error ? "danger" : "success" } alert-dismissable", :role => "alert" do %>
+      <%%= content_tag :div, class: "alert alert-#{ name == :error ? "danger" : "success" } alert-dismissable", role: "alert" do %>
         <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
         <%%= msg %>
       <%% end %>

data/lib/generators/bootstrap/install/templates/layouts/starter.html.haml

@@ -1,11 +1,11 @@
 !!!
 %html
   %head
-    %meta{:charset => "utf-8"}
-    %meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}
-    %meta{:content => "width=device-width, initial-scale=1", :name => "viewport"}
-    %meta{:content => "", :name => "description"}
-    %meta{:content => "", :name => "author"}
+    %meta{charset: "utf-8"}
+    %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
+    %meta{content: "width=device-width, initial-scale=1", name: "viewport"}
+    %meta{content: "", name: "description"}
+    %meta{content: "", name: "author"}
     %title Starter Template for Bootstrap
 
     / HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries
@@ -21,28 +21,28 @@
     <%- end -%>
     = csrf_meta_tags
   %body
-    %nav.navbar.navbar-inverse.navbar-fixed-top{:role => "navigation"}
+    %nav.navbar.navbar-inverse.navbar-fixed-top{role: "navigation"}
       .container
         .navbar-header
-          %button.navbar-toggle.collapsed{:type => "button", :data => {:toggle => "collapse", :target => "#navbar"}, :aria => {:expanded => "false", :controls => "navbar"} }
+          %button.navbar-toggle.collapsed{type: "button", data: {toggle: "collapse", target: "#navbar"}, aria: {expanded: "false", controls: "navbar"} }
             %span.sr-only Toggle navigation
             %span.icon-bar
             %span.icon-bar
             %span.icon-bar
-          = link_to "Project name", "#", :class => "navbar-brand"
+          = link_to "Project name", "#", class: "navbar-brand"
         #navbar.collapse.navbar-collapse
           %ul.nav.navbar-nav
             %li.active
-              %a{:href => "#"} Home
+              %a{href: "#"} Home
             %li
-              %a{:href => "#about"} About
+              %a{href: "#about"} About
             %li
-              %a{:href => "#contact"} Contact
+              %a{href: "#contact"} Contact
     .container
       - flash.each do |name, msg|
-        = content_tag :div, :class => "alert alert-#{name == :error ? "danger" : "success" } alert-dismissable", :role => "alert" do
-          %button.close{:type => "button", :data => {:dismiss => "alert"} }
-            span{:aria => {:hidden => "true"} } &times;
-            span.sr-only Close
+        = content_tag :div, class: "alert alert-#{name == :error ? "danger" : "success" } alert-dismissable", role: "alert" do
+          %button.close{type: "button", data: {dismiss: "alert"} }
+            %span{aria: {hidden: "true"} } &times;
+            %span.sr-only Close
           = msg
       = yield

data/lib/generators/bootstrap/install/templates/layouts/starter.html.slim

@@ -29,7 +29,7 @@ html
             span.icon-bar
             span.icon-bar
             span.icon-bar
-          = link_to "Project name", "#", :class => "navbar-brand"
+          = link_to "Project name", "#", class: "navbar-brand"
         #navbar.collapse.navbar-collapse
           ul.nav.navbar-nav
             li.active
@@ -43,7 +43,7 @@ html
                 | Contact
     .container
       - flash.each do |name, msg|
-        = content_tag :div, :class => "alert alert-#{ name == :error ? "danger" : "success" } alert-dismissable", :role => "alert" do
+        = content_tag :div, class: "alert alert-#{ name == :error ? "danger" : "success" } alert-dismissable", role: "alert" do
           button.close type="button" data-dismiss="alert"
             span aria-hidden="true"
               | ×

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/edit.html.erb

@@ -1,9 +1,9 @@
 <div class="page-header">
-  <%%= link_to <%= index_helper %>_path, :class => 'btn btn-default' do %>
+  <%%= link_to <%= index_helper %>_path, class: 'btn btn-default' do %>
     <span class="glyphicon glyphicon-list-alt"></span>
     Back
   <%% end %>
-  <%%= link_to @<%= singular_table_name %>, :class => 'btn btn-primary' do %>
+  <%%= link_to @<%= singular_table_name %>, class: 'btn btn-primary' do %>
     <span class="glyphicon glyphicon-info-sign"></span>
     Show
   <%% end %>

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/index.html.erb

@@ -1,5 +1,5 @@
 <div class="page-header">
-  <%%= link_to new_<%= singular_table_name %>_path, :class => 'btn btn-primary' do %>
+  <%%= link_to new_<%= singular_table_name %>_path, class: 'btn btn-primary' do %>
     <span class="glyphicon glyphicon-plus"></span>
     New <%= human_name %>
   <%% end %>

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/new.html.erb

@@ -1,5 +1,5 @@
 <div class="page-header">
-  <%%= link_to <%= index_helper %>_path, :class => 'btn btn-default' do %>
+  <%%= link_to <%= index_helper %>_path, class: 'btn btn-default' do %>
     <span class="glyphicon glyphicon-list-alt"></span>
     Back
   <%% end %>

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/show.html.erb

@@ -1,9 +1,9 @@
 <div class="page-header">
-  <%%= link_to <%= index_helper %>_path, :class => 'btn btn-default' do %>
+  <%%= link_to <%= index_helper %>_path, class: 'btn btn-default' do %>
     <span class="glyphicon glyphicon-list-alt"></span>
     Back
   <%% end %>
-  <%%= link_to edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), :class => 'btn btn-primary' do %>
+  <%%= link_to edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: 'btn btn-primary' do %>
     <span class="glyphicon glyphicon-pencil"></span>
     Edit
   <%% end %>

data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/edit.html.haml

@@ -1,8 +1,8 @@
 .page-header
-  = link_to <%= index_helper %>_path, :class => 'btn btn-default' do
+  = link_to <%= index_helper %>_path, class: 'btn btn-default' do
     %span.glyphicon.glyphicon-list-alt
     Back
-  = link_to @<%= singular_table_name %>, :class => 'btn btn-primary' do
+  = link_to @<%= singular_table_name %>, class: 'btn btn-primary' do
     %span.glyphicon.glyphicon-info-sign
     Show
   %h1 Editing <%= singular_table_name %>

data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/index.html.haml

@@ -1,5 +1,5 @@
 .page-header
-  = link_to new_<%= singular_table_name %>_path, :class => 'btn btn-primary' do
+  = link_to new_<%= singular_table_name %>_path, class: 'btn btn-primary' do
     %span.glyphicon.glyphicon-plus
     New <%= human_name %>
   %h1 Listing <%= plural_table_name %>
@@ -23,4 +23,4 @@
 <% end -%>
           %td= link_to 'Show', <%= singular_table_name %>
           %td= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>)
-          %td= link_to 'Destroy', <%= singular_table_name %>, :data => { confirm: 'Are you sure?' }, :method => :delete
+          %td= link_to 'Destroy', <%= singular_table_name %>, data: { confirm: 'Are you sure?' }, method: :delete

data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/new.html.haml

@@ -1,5 +1,5 @@
 .page-header
-  = link_to <%= index_helper %>_path, :class => 'btn btn-default' do
+  = link_to <%= index_helper %>_path, class: 'btn btn-default' do
     %span.glyphicon.glyphicon-list-alt
     Back
   %h1 New <%= singular_table_name %>

data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/show.html.haml

@@ -1,8 +1,8 @@
 .page-header
-  = link_to <%= index_helper %>_path, :class => 'btn btn-default' do
+  = link_to <%= index_helper %>_path, class: 'btn btn-default' do
     %span.glyphicon.glyphicon-list-alt
     Back
-  = link_to edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), :class => 'btn btn-primary' do
+  = link_to edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: 'btn btn-primary' do
     %span.glyphicon.glyphicon-pencil
     Edit
   %h1 Show <%= singular_table_name %>