Switch to bootstrap for now

Gemfile

@@ -10,7 +10,7 @@ gem 'jquery-rails'
 gem 'jbuilder', '~> 2.0'
 gem 'sdoc', '~> 0.4.0', group: :doc
 
-gem 'materialize-sass'
+gem 'bootstrap-sass'
 gem 'slim-rails'
 gem 'simple_form'
 

Gemfile.lock

@@ -44,12 +44,18 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.3)
+    autoprefixer-rails (5.2.1)
+      execjs
+      json
     better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    bootstrap-sass (3.3.5.1)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.3.0)
     builder (3.2.2)
     byebug (6.0.2)
     coderay (1.1.0)
@@ -86,8 +92,6 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    materialize-sass (0.97.1)
-      sass (~> 3.3)
     mime-types (2.6.2)
     mini_portile (0.6.2)
     minitest (5.8.1)
@@ -189,12 +193,12 @@ PLATFORMS
 
 DEPENDENCIES
   better_errors
+  bootstrap-sass
   byebug
   coffee-rails (~> 4.1.0)
   dotenv-rails
   jbuilder (~> 2.0)
   jquery-rails
-  materialize-sass
   omniauth-reddit!
   quiet_assets
   rails (= 4.2.4)

app/assets/javascripts/application.js

@@ -12,5 +12,5 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require materialize-sprockets
+//= require bootstrap-sprockets
 //= require_tree .

app/assets/stylesheets/application.scss

@@ -13,4 +13,5 @@
  *= require_tree .
  *= require_self
  */
-@import 'materialize';
+@import "bootstrap-sprockets";
+@import "bootstrap";

app/assets/stylesheets/custom.scss

@@ -1,3 +1,7 @@
 .bottom-spacer {
   margin-bottom: 10px;
 }
+
+.control-icon {
+  padding: 0 3px 0 3px;
+}

app/helpers/application_helper.rb

@@ -1,5 +1,40 @@
 module ApplicationHelper
-  def icon(icon)
+  def nav_link_to(text, path)
-    content_tag(:i, icon.to_s, class: 'material-icons')
+    options = current_controller?(path) ? { class: 'active' } : {}
+
+    content_tag(:li, options) { link_to text, path }
+  end
+
+  def bootstrap_class_for(flash_type)
+    bootstrap_classes[flash_type] || flash_type.to_s
+  end
+
+  def glyph(icon, options = {})
+    options = options.reverse_merge(default_glyph_options)
+
+    classes = options[:color] + " " + options[:classes]
+    content_tag(:i, class: "glyphicon glyphicon-#{icon} " + classes) {}
+  end
+
+  private
+
+  def bootstrap_classes
+    {
+      'alert'   => 'alert-warning',
+      'error'   => 'alert-danger',
+      'notice'  => 'alert-info',
+      'success' => 'alert-success'
+    }
+  end
+
+  def default_glyph_options
+    {
+      :color   => '',
+      :classes => ''
+    }
+  end
+
+  def current_controller?(path)
+    path.split('/')[1] == params[:controller]
   end
 end

app/views/application/_flash_message.html.slim

@@ -0,0 +1,5 @@
+.alert.slide.up class=bootstrap_class_for(type)
+  button.close type='button' data-dismiss='alert'
+    span aria-hidden='true' ×
+    span.sr-only Close
+  = message

app/views/application/_flash_messages.html.slim

@@ -1,3 +1,4 @@
-- flash.each do |type, message|
+.row
-  javascript:
+  .col-md-12
-    Materialize.toast('#{message}', 5000)
+    - flash.each do |type, message|
+      = render 'flash_message', type: type, message: message

app/views/application/_navbar.html.slim

@@ -1,15 +1,16 @@
-nav.bottom-spacer
+.navbar.navbar-default.navbar-static-top.navbar-custom
   .container
-    .nav-wrapper
+    .navbar-header
-      a.brand-logo href="/" DBZDokkan
+      button.navbar-toggle.collapsed type='button' data-toggle='collapse' data-target='.navbar-collapse'
-      a.button-collapse href="#" data-activates="mobile"
+        span.sr-only Toggle navigation
-        i.material-icons menu
+        span.icon-bar
-      ul#mobile.side-nav
+        span.icon-bar
-        li= link_to 'Links', links_path
+        span.icon-bar
-      ul.right
+      = link_to 'DBZDokkan', root_path, class: 'navbar-brand'
+    .collapse.navbar-collapse
+      ul.nav.navbar-nav.navbar-right
+        li= nav_link_to 'Links', links_path
         - if logged_in?
-          li= link_to 'Logout', logout_path, method: :delete
+          li= link_to 'Log Out', logout_path, method: :delete
         - else
-          li= link_to 'Login', '/auth/reddit'
+          li= link_to 'Log In', '/auth/reddit'
-      ul.right.hide-on-med-and-down
-        li= link_to 'Links', links_path

app/views/layouts/application.html.slim

@@ -6,13 +6,12 @@ html
     meta name="viewport" content="width=device-width, initial-scale=1"
     title DBZDokkan
     = stylesheet_link_tag 'application', media: 'all'
-    = stylesheet_link_tag 'http://fonts.googleapis.com/icon?family=Material+Icons'
     = javascript_include_tag 'application'
     = csrf_meta_tags
 
   body
-    == render 'flash_messages', flash: flash
     == render 'navbar'
-
+    .container
+      == render 'flash_messages', flash: flash
     .container
       = yield

app/views/links/_form.html.slim

@@ -1,6 +1,6 @@
 = simple_form_for @link do |f|
-  .row
+  .form-inputs
-    .col.s12
+    = f.input :name
-        = f.input :name
+    = f.input :description
-        = f.input :description
+  .form-actions
-        = f.button :button
+    = f.button :button

app/views/links/index.html.slim

@@ -1,10 +1,11 @@
 .row
-  .col.s12.right-align
+  .col-md-12
-    = link_to 'New Link', new_link_path, class: 'btn'
+    .pull-right
+      = link_to 'New Link', new_link_path, class: 'btn btn-primary'
 
 .row
-  .col.s12
+  .col-md-12
-    table.bordered.striped.highlight.responsive-table
+    table.table.table-striped.table-hover
       thead
         tr
           th Name
@@ -16,9 +17,9 @@
             td= link.name
             td= link.description
             td
-              = link_to icon(:subject), edit_link_path(link)
+              = link_to glyph('edit', classes: 'control-icon'), edit_link_path(link)
-              = link_to icon(:delete), link_path(link), method: :delete
+              = link_to glyph('trash', classes: 'control-icon'), link_path(link), method: :delete
 
 .row
-  .col.s12
+  .col-md-12
-    = link_to 'New Link', new_link_path, class: 'btn'
+    = link_to 'New Link', new_link_path, class: 'btn btn-primary'

config/initializers/simple_form.rb

@@ -0,0 +1,166 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  # Wrappers are used by the form builder to generate a
+  # complete input. You can remove any component from the
+  # wrapper, change the order or even add your own to the
+  # stack. The options given below are used to wrap the
+  # whole input.
+  config.wrappers :default, class: :input,
+    hint_class: :field_with_hint, error_class: :field_with_errors do |b|
+    ## Extensions enabled by default
+    # Any of these extensions can be disabled for a
+    # given input by passing: `f.input EXTENSION_NAME => false`.
+    # You can make any of these extensions optional by
+    # renaming `b.use` to `b.optional`.
+
+    # Determines whether to use HTML5 (:email, :url, ...)
+    # and required attributes
+    b.use :html5
+
+    # Calculates placeholders automatically from I18n
+    # You can also pass a string as f.input placeholder: "Placeholder"
+    b.use :placeholder
+
+    ## Optional extensions
+    # They are disabled unless you pass `f.input EXTENSION_NAME => true`
+    # to the input. If so, they will retrieve the values from the model
+    # if any exists. If you want to enable any of those
+    # extensions by default, you can change `b.optional` to `b.use`.
+
+    # Calculates maxlength from length validations for string inputs
+    b.optional :maxlength
+
+    # Calculates pattern from format validations for string inputs
+    b.optional :pattern
+
+    # Calculates min and max from length validations for numeric inputs
+    b.optional :min_max
+
+    # Calculates readonly automatically from readonly attributes
+    b.optional :readonly
+
+    ## Inputs
+    b.use :label_input
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: :error }
+
+    ## full_messages_for
+    # If you want to display the full error message for the attribute, you can
+    # use the component :full_error, like:
+    #
+    # b.use :full_error, wrap_with: { tag: :span, class: :error }
+  end
+
+  # The default wrapper to be used by the FormBuilder.
+  config.default_wrapper = :default
+
+  # Define the way to render check boxes / radio buttons with labels.
+  # Defaults to :nested for bootstrap config.
+  #   inline: input + label
+  #   nested: label > input
+  config.boolean_style = :nested
+
+  # Default class for buttons
+  config.button_class = 'btn'
+
+  # Method used to tidy up errors. Specify any Rails Array method.
+  # :first lists the first message for each field.
+  # Use :to_sentence to list all errors for each field.
+  # config.error_method = :first
+
+  # Default tag used for error notification helper.
+  config.error_notification_tag = :div
+
+  # CSS class to add for error notification helper.
+  config.error_notification_class = 'error_notification'
+
+  # ID to add for error notification helper.
+  # config.error_notification_id = nil
+
+  # Series of attempts to detect a default label method for collection.
+  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
+
+  # Series of attempts to detect a default value method for collection.
+  # config.collection_value_methods = [ :id, :to_s ]
+
+  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
+  # config.collection_wrapper_tag = nil
+
+  # You can define the class to use on all collection wrappers. Defaulting to none.
+  # config.collection_wrapper_class = nil
+
+  # You can wrap each item in a collection of radio/check boxes with a tag,
+  # defaulting to :span. Please note that when using :boolean_style = :nested,
+  # SimpleForm will force this option to be a label.
+  # config.item_wrapper_tag = :span
+
+  # You can define a class to use in all item wrappers. Defaulting to none.
+  # config.item_wrapper_class = nil
+
+  # How the label text should be generated altogether with the required text.
+  # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" }
+
+  # You can define the class to use on all labels. Default is nil.
+  # config.label_class = nil
+
+  # You can define the default class to be used on forms. Can be overriden
+  # with `html: { :class }`. Defaulting to none.
+  # config.default_form_class = nil
+
+  # You can define which elements should obtain additional classes
+  # config.generate_additional_classes_for = [:wrapper, :label, :input]
+
+  # Whether attributes are required by default (or not). Default is true.
+  # config.required_by_default = true
+
+  # Tell browsers whether to use the native HTML5 validations (novalidate form option).
+  # These validations are enabled in SimpleForm's internal config but disabled by default
+  # in this configuration, which is recommended due to some quirks from different browsers.
+  # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
+  # change this configuration to true.
+  config.browser_validations = false
+
+  # Collection of methods to detect if a file type was given.
+  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
+
+  # Custom mappings for input types. This should be a hash containing a regexp
+  # to match as key, and the input type that will be used when the field name
+  # matches the regexp as value.
+  # config.input_mappings = { /count/ => :integer }
+
+  # Custom wrappers for input types. This should be a hash containing an input
+  # type as key and the wrapper that will be used for all inputs with specified type.
+  # config.wrapper_mappings = { string: :prepend }
+
+  # Namespaces where SimpleForm should look for custom input classes that
+  # override default inputs.
+  # config.custom_inputs_namespaces << "CustomInputs"
+
+  # Default priority for time_zone inputs.
+  # config.time_zone_priority = nil
+
+  # Default priority for country inputs.
+  # config.country_priority = nil
+
+  # When false, do not use translations for labels.
+  # config.translate_labels = true
+
+  # Automatically discover new inputs in Rails' autoload path.
+  # config.inputs_discovery = true
+
+  # Cache SimpleForm inputs discovery
+  # config.cache_discovery = !Rails.env.development?
+
+  # Default class for inputs
+  # config.input_class = nil
+
+  # Define the default class of the input wrapper of the boolean input.
+  config.boolean_label_class = 'checkbox'
+
+  # Defines if the default input wrapper class should be included in radio
+  # collection wrappers.
+  # config.include_default_input_wrapper_class = true
+
+  # Defines which i18n scope will be used in Simple Form.
+  # config.i18n_scope = 'simple_form'
+end

config/initializers/simple_form_bootstrap.rb

@@ -0,0 +1,136 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  config.error_notification_class = 'alert alert-danger'
+  config.button_class = 'btn btn-default'
+  config.boolean_label_class = nil
+
+  config.wrappers :vertical_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+
+    b.use :input, class: 'form-control'
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+
+    b.use :input
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.wrapper tag: 'div', class: 'checkbox' do |ba|
+      ba.use :label_input
+    end
+
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+    b.use :input
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :horizontal_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input, class: 'form-control'
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :readonly
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.wrapper tag: 'div', class: 'col-sm-offset-3 col-sm-9' do |wr|
+      wr.wrapper tag: 'div', class: 'checkbox' do |ba|
+        ba.use :label_input, class: 'col-sm-9'
+      end
+
+      wr.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      wr.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :inline_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'sr-only'
+
+    b.use :input, class: 'form-control'
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  # Wrappers for forms and inputs using the Bootstrap toolkit.
+  # Check the Bootstrap docs (http://getbootstrap.com)
+  # to learn about the different styles for forms and inputs,
+  # buttons and other elements.
+  config.default_wrapper = :vertical_form
+  config.wrapper_mappings = {
+    check_boxes: :vertical_radio_and_checkboxes,
+    radio_buttons: :vertical_radio_and_checkboxes,
+    file: :vertical_file_input,
+    boolean: :vertical_boolean,
+  }
+end

config/initializers/simple_form_materialize.rb

@@ -1,37 +0,0 @@
-SimpleForm.setup do |config|
-  config.error_notification_class = 'alert alert-danger'
-  config.button_class = 'waves-effect waves-light btn'
-  config.boolean_label_class = nil
-
-  config.wrappers :vertical_form, tag: 'div', class: 'input-field', error_class: 'has-error' do |b|
-    b.use :html5
-    b.use :placeholder
-    b.optional :maxlength
-    b.optional :pattern
-    b.optional :min_max
-    b.optional :readonly
-    b.use :input
-    b.use :label
-    b.use :error, wrap_with: { tag: 'span', class: 'error-block' }
-    b.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
-  end
-
-  config.wrappers :vertical_boolean, tag: 'p', error_class: 'has-error' do |b|
-    b.use :html5
-    b.optional :readonly
-
-    b.use :input
-    b.use :label
-    b.use :error, wrap_with: { tag: 'span', class: 'error-block' }
-    b.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
-  end
-
-  config.wrappers :vertical_radio_and_checkboxes, tag: 'p', error_class: 'has-error' do |b|
-    b.use :html5
-    b.optional :readonly
-    b.use :input
-    b.use :label
-    b.use :error, wrap_with: { tag: 'span', class: 'error-block' }
-    b.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
-  end
-end

config/locales/simple_form.en.yml

@@ -0,0 +1,31 @@
+en:
+  simple_form:
+    "yes": 'Yes'
+    "no": 'No'
+    required:
+      text: 'required'
+      mark: '*'
+      # You can uncomment the line below if you need to overwrite the whole required html.
+      # When using html, text and mark won't be used.
+      # html: '<abbr title="required">*</abbr>'
+    error_notification:
+      default_message: "Please review the problems below:"
+    # Examples
+    # labels:
+    #   defaults:
+    #     password: 'Password'
+    #   user:
+    #     new:
+    #       email: 'E-mail to sign in.'
+    #     edit:
+    #       email: 'E-mail.'
+    # hints:
+    #   defaults:
+    #     username: 'User name to sign in.'
+    #     password: 'No special characters, please.'
+    # include_blanks:
+    #   defaults:
+    #     age: 'Rather not say'
+    # prompts:
+    #   defaults:
+    #     age: 'Select your age'

lib/templates/slim/scaffold/_form.html.slim

@@ -0,0 +1,10 @@
+= simple_form_for(@<%= singular_table_name %>) do |f|
+  = f.error_notification
+
+  .form-inputs
+<%- attributes.each do |attribute| -%>
+    = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>
+<%- end -%>
+
+  .form-actions
+    = f.button :submit