railsstrap 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 576cfff798a3f38bbdcf0268a8177f0d014af88c
-  data.tar.gz: 9d433b38d88e8a48020fa97f0c24d8c04c69134d
+  metadata.gz: a5368848076f90de4d3bb93d722da03a756c8587
+  data.tar.gz: 89ace966b95408b74b85a76027cec3504d264def
 SHA512:
-  metadata.gz: 2b31ade8e0cd02f676c593b7deaf183ae816017a1f28018cf2f5f0615b75d2251fe3e03640d6ad50d4025fd6bd6a90dc1555379674943e4061e36d582b36c208
-  data.tar.gz: 4b9109e82154b84ade8438933212932bcb8bcac474d041331f06e498a071196e04845f46a6dc3a2ca0a3ce73a18125e4082a217acc5d2901c3a6091b99dc473c
+  metadata.gz: 84d1f162e59603eba4dd0a94d284c23ce7304a5d2acec3f13d0351f569130505a609813da16aebdf2c37aa2ed3da51bd170f993ff7f27d09c5c89d4a16a13057
+  data.tar.gz: 0b193c4a8a0d599cf33a6b56587dae0ea6b59302d212ea496348b0a6d350290c97bd9b25a67b1f186a9f9ebcd85806fd70c326a1da71bcf37cc6a8140c35eb72

data/README.md

@@ -1,4 +1,4 @@
-# Bootstrap 3.2.0 + FontAwesome 4.2.0 for Rails v3.1 & v4 Asset Pipeline
+# Bootstrap + FontAwesome for Rails v3.1 & v4 Asset Pipeline
 
 [![Bower version](https://badge.fury.io/bo/bootstrap.svg)](http://badge.fury.io/bo/bootstrap)
 [![Gem Version](https://badge.fury.io/rb/railsstrap.svg)](http://badge.fury.io/rb/railsstrap)
@@ -16,16 +16,15 @@ Railsstrap is more than just another gem providing bootstrap and fontawesome for
 
 ###Custom Components (in development)
 * Asides - A modal that slides in from the left or right. Used often in mobile apps for off-screen sidebars or overlays.
-* Callouts - Similar to an alert, it is used for drawing attention to content.
-* Datepicker - A styled HTML5 datepicker.
+* Callouts - Similar to an alert, it is used for drawing attention to content. - New in 3.3.0!
+* Date & Time picker - A styled HTML5 datepicker. - New in 3.3.1!
 * Modal enhancements - animations and real centering placement.
 * Popover enhancements - animations and custom placements for popover arrows and locations.
-* Timepicker - A styled HTML5 time picker.
 * Tooltip - animations and custom placements for tooltip arrows and locations.
 
 ###Animations
 
-Railsstrap comes with over 75 CSS animations. See the wiki or the [vendor/assets/stylesheets/animate](https://github.com/toadkicker/railsstrap/tree/develop/vendor/assets/stylesheets/animate) folder for more info.
+Railsstrap comes with over 75 CSS animations. See the wiki or the [vendor/assets/stylesheets/animate](https://github.com/toadkicker/railsstrap/tree/develop/vendor/assets/stylesheets/animate) folder for more info. Also the wiki has detailed instructions on using them.
 
 ## Example Application
 An example application is available at [toadkicker/teststrap](https://github.com/toadkicker/teststrap). You can view it running on heroku [here.](http://teststrap.herokuapp.com/) Contributions welcome.
@@ -48,11 +47,17 @@ This will insert the appropriate entries into your application.js and applicatio
 
 You will need to precompile your assets for FontAwesome support. To do this add this line:
 
+This is verbose:
 ```
 Rails.application.config.assets.precompile += %w( fontawesome/fonts/fontawesome-webfont.eot fontawesome/fonts/fontawesome-webfont.woff fontawesome/fonts/fontawesome-webfont.ttf fontawesome/fonts/fontawesome-webfont.svg )
 ```
 
-For Rails 3 applications, add it to config/environments/production.rb. For Rails 4, add it to config/initializers/assets.rb.
+This is all you really need:
+```
+Rails.application.config.assets.precompile += %w(.svg .eot .woff .ttf)
+```
+
+For Rails 3 applications, add it to ```config/environments/production.rb```. For Rails 4, add it to ```config/initializers/assets.rb```.
 
 
 Most of the info you'll need is in the wiki, and if it isn't please contribute!

data/app/helpers/railsstrap/date_picker_helper.rb

@@ -0,0 +1,84 @@
+# Railsstrap Datepicker Helper
+#
+# Setup instructions:
+# open your application.js & application.css asset manifest file and uncomment the block to include the UI libraries
+# use the date_picker helper for the html and the date_picker_javascript helper in your templates
+#
+# You can set these options a few ways:
+# with html data-date-{OPTIONNAME},
+# or pass a data option hash into date_picker, but change the key name to_underscore format so content_tag renders the data tag properly.
+# or in date_picker_javascript, keeping it as camelCase
+#
+# pickDate: true,                 //en/disables the date picker
+# pickTime: true,                 //en/disables the time picker
+# useMinutes: true,               //en/disables the minutes picker
+# useSeconds: true,               //en/disables the seconds picker
+# useCurrent: true,               //when true, picker will set the value to the current date/time
+# minuteStepping:1,               //set the minute stepping
+# minDate:`1/1/1900`,               //set a minimum date
+# maxDate: ,     //set a maximum date (defaults to today +100 years)
+# showToday: true,                 //shows the today indicator
+# language:'en',                  //sets language locale
+# defaultDate:"",                 //sets a default date, accepts js dates, strings and moment objects
+# disabledDates:[],               //an array of dates that cannot be selected
+# enabledDates:[],                //an array of dates that can be selected
+# icons = {
+#     time: 'glyphicon glyphicon-time',
+#     date: 'glyphicon glyphicon-calendar',
+#     up:   'glyphicon glyphicon-chevron-up',
+#     down: 'glyphicon glyphicon-chevron-down'
+# }
+# useStrict: false,               //use strict when validating dates
+# sideBySide: false,              //show the date and time picker side by side
+# daysOfWeekDisabled:[]          //for example use daysOfWeekDisabled: [0,6] to disable weekends
+#
+
+module Railsstrap
+  module DatePickerHelper
+
+    def date_picker(options = {})
+      opts = default_options.merge(options)
+      input = text_field_tag opts[:input_name], '', class: opts[:input_class]
+      icon_wrapper = content_tag opts[:icon_wrapper_tag], class: opts[:icon_wrapper_class] do
+        content_tag :i, '', class: opts[:icon]
+      end
+      content_tag(opts[:wrapper_tag], id: opts[:id], class: opts[:wrapper_class], data: opts[:data]) {
+        opts[:show_input] ? input + icon_wrapper : icon_wrapper
+      }
+    end
+
+    def date_picker_javascript(options = {})
+      opts = default_js_options.merge(options)
+      javascript_tag "(function ($) { $('#{opts[:selector]}').datetimepicker(#{opts.to_json});})(jQuery);"
+    end
+
+    private
+    def default_options
+      { id: 'date_picker',
+        wrapper_tag: :div,
+        show_input: true,
+        input_name: 'date_picker',
+        input_class: 'form-control',
+        input_type: 'text',
+        wrapper_class: 'input-group date',
+        icon_wrapper_tag: :span,
+        icon_wrapper_class: 'input-group-addon',
+        icon: 'fa fa-calendar',
+        data: { datepicker: true, date_language: 'en' }
+      }
+    end
+
+    def default_js_options
+      {
+          selector: '[data-datepicker="true"]',
+          language: 'en',
+          icons: {
+              time: 'fa fa-clock-o',
+              date: 'fa fa-calendar',
+              up:   'fa fa-chevron-up',
+              down: 'fa fa-chevron-down'
+          }
+      }
+    end
+  end
+end

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

@@ -14,7 +14,7 @@ module Railsstrap
         js_manifest = 'app/assets/javascripts/application.js'
         css_manifest = 'app/assets/stylesheets/application.css'
         asset_initializer = 'config/initializers/assets.rb'
-        config_asset_insert_line = "Rails.application.config.assets.precompile\s+=\s%w(\sbootstrap/fonts/glyphicons-halflings-regular.eot\sbootstrap/fonts/glyphicons-halflings-regular.svg\sbootstrap/fonts/glyphicons-halflings-regular.ttf\sbootstrap/fonts/glyphicons-halflings-regular.woff\sfontawesome/fonts/fontawesome-webfont.eot\sfontawesome/fonts/fontawesome-webfont.woff\sfontawesome/fonts/fontawesome-webfont.ttf\sfontawesome/fonts/fontawesome-webfont.svg\s)"
+        config_asset_insert_line = "Rails.application.config.assets.precompile\s+=\s%w(.svg .eot .woff .ttf)"
 
         if File.exists?(asset_initializer) && Rails::VERSION::MAJOR >= 4 #Must be Rails 4
           content = File.read(asset_initializer)
@@ -44,7 +44,7 @@ module Railsstrap
           if content.match(/require_tree\s+\.\s*$/)
             # Good enough - that'll include our bootstrap_and_overrides.css.less
           else
-            style_require_block = " *= require bootstrap_and_overrides\n"
+            style_require_block = " *= require bootstrap_and_overrides\n*=require fontawesome"
             insert_into_file css_manifest, style_require_block, :after => "require_self\n"
           end
         else

data/lib/generators/railsstrap/install/templates/application.css

@@ -2,6 +2,9 @@
  * This is a manifest file that'll automatically include all the stylesheets available in this directory
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require 'bootstrap'
+ *= require 'railsstrap'
+ *= require 'fontawesome'
  *= require_self
  *= require_tree .
 */

data/lib/generators/railsstrap/install/templates/application.js

@@ -15,4 +15,6 @@
 //= require jquery
 //= require jquery_ujs
 //= require bootstrap/dist/js/bootstrap.js
+// Date and Time Picker (remove *):
+//*= require datepicker/datepicker
 //= require_tree .

data/lib/generators/railsstrap/install/templates/bootstrap_and_overrides.css

@@ -1,7 +1,7 @@
 /*
   =require bootstrap/dist/bootstrap.css
   =require bootstrap/dist/bootstrap-theme.css
-  If you want exotic placement features, animations, and more, uncomment this
+  If you want exotic placement features, animations, components, and more, uncomment this:
   =require dist/railsstrap.css
   To use Font Awesome
   =require fontawesome/css/font-awesome.(min).css

data/lib/generators/railsstrap/install/templates/bootstrap_and_overrides.less

@@ -2,9 +2,6 @@
 //If you want exotic placement features, animations, and more, import this
 //@import "railsstrap";
 
-// Font Awesome
-@import "fontawesome/less/font-awesome";
-
 // Glyphicons - included by default in bootstrap.
 // You may need to customize config/initializers/assets.rb (Rails 4), or config/environments/[env].rb to add font paths in.
 // In either case of FontAwesome or Glyphicons, the railsstrap:install task should insert the appropriate entries for you.
@@ -21,3 +18,9 @@
 // Example:
 // @import (reference) 'bootstrap/less/variables.less';
 // @link-color: #ff0000;
+//
+// Date and Time Picker
+//
+// To enable the date and time picker, uncomment this line:
+// @import "datepicker/datepicker.less";
+// Don't forget to include the javascript library as well.

data/lib/generators/railsstrap/themed/templates/_form.html.erb

@@ -1,4 +1,4 @@
-<%%= form_for @<%= resource_name %>, :html => { :class => "form-horizontal <%= resource_name %>" } do |f| %>
+<%%= form_for @<%= resource_name %>, :html => { :role=> 'form', :class => "form-horizontal <%= resource_name %>" } do |f| %>
 
   <%% if @<%= resource_name %>.errors.any? %>
     <div id="error_expl" class="panel panel-danger">

data/lib/generators/railsstrap/themed/templates/_form.html.haml

@@ -1,4 +1,4 @@
-= form_for @<%= resource_name %>, html: { class: "form form-horizontal <%= resource_name %>" } do |f|
+= form_for @<%= resource_name %>, html: { role: "form", class: "form form-horizontal <%= resource_name %>" } do |f|
   <%- columns.each do |column| -%>
   .form-group
     = f.label :<%= column.name %>, class: 'control-label col-lg-2'

data/lib/generators/railsstrap/themed/templates/_form.html.slim

@@ -1,4 +1,4 @@
-= form_for @<%= resource_name %>, html: { class: "form form-horizontal <%= resource_name %>" } do |f|
+= form_for @<%= resource_name %>, html: { role: "form", class: "form form-horizontal <%= resource_name %>" } do |f|
   <%- columns.each do |column| -%>
   .form-group
     = f.label :<%= column.name %>, :class => 'control-label col-lg-2'

data/lib/generators/railsstrap/themed/templates/edit.html.slim

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
+.page-header
   h1=t '.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize
 = render :partial => "form"

data/lib/generators/railsstrap/themed/templates/index.html.slim

@@ -1,7 +1,7 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
+.page-header
   h1=t '.title', :default => model_class.model_name.human.pluralize.titleize
-table class="table table-striped"
+table.table table-striped
   thead
     tr
       th= model_class.human_attribute_name(:id)
@@ -23,5 +23,4 @@ table class="table table-striped"
           '
           = link_to t('.destroy', :default => t("helpers.links.destroy")), <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-xs btn-danger'
 
-= link_to t('.new', :default => t("helpers.links.new")), new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary'
-
+= link_to t('.new', :default => t("helpers.links.new")), new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary'

data/lib/generators/railsstrap/themed/templates/new.html.slim

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
+.page-header
   h1=t '.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize
 = render :partial => "form"

data/lib/generators/railsstrap/themed/templates/show.html.slim

@@ -1,5 +1,5 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
+.page-header
   h1=t '.title', :default => model_class.model_name.human.titleize
 
 <%- columns.each do |column| -%>

data/lib/railsstrap/constants.rb

@@ -1,6 +1,6 @@
 module Railsstrap
   module Constants
     #we follow along with Bootstrap's version number for easy identification
-    VERSION = '3.3.0'
+    VERSION = '3.3.1'
   end
 end

data/lib/railsstrap/engine.rb

@@ -7,6 +7,7 @@ require_relative '../../app/helpers/railsstrap/modal_helper.rb'
 require_relative '../../app/helpers/railsstrap/navbar_helper.rb'
 require_relative '../../app/helpers/railsstrap/bootstrap_flash_helper.rb'
 require_relative '../../app/helpers/railsstrap/form_errors_helper.rb'
+require_relative '../../app/helpers/railsstrap/date_picker_helper.rb'
 
 module Railsstrap
   class Engine < ::Rails::Engine
@@ -28,11 +29,13 @@ module Railsstrap
        Railsstrap::GlyphHelper,
        Railsstrap::IconHelper,
        Railsstrap::NavbarHelper,
-       Railsstrap::BadgeLabelHelper].each do |h|
+       Railsstrap::BadgeLabelHelper,
+       Railsstrap::DatePickerHelper].each do |h|
         app.config.to_prepare do
           ActionController::Base.send :helper, h
         end
       end
+
       ActionView::Helpers::FormBuilder.send :include, Railsstrap::FormErrorsHelper
     end
   end

data/vendor/assets/bower_components/bootstrap/Gruntfile.js

@@ -27,6 +27,13 @@ module.exports = function (grunt) {
   };
   var generateRawFiles = require('./grunt/bs-raw-files-generator.js');
   var generateCommonJSModule = require('./grunt/bs-commonjs-generator.js');
+  var configBridge = grunt.file.readJSON('./grunt/configBridge.json', { encoding: 'utf8' });
+
+  Object.keys(configBridge.paths).forEach(function (key) {
+    configBridge.paths[key].forEach(function (val, i, arr) {
+      arr[i] = path.join('./docs/assets', val);
+    });
+  });
 
   // Project configuration.
   grunt.initConfig({
@@ -38,21 +45,8 @@ module.exports = function (grunt) {
             ' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
             ' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' +
             ' */\n',
-    // NOTE: This jqueryCheck/jqueryVersionCheck code is duplicated in customizer.js;
-    //       if making changes here, be sure to update the other copy too.
-    jqueryCheck: [
-      'if (typeof jQuery === \'undefined\') {',
-      '  throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\')',
-      '}\n'
-    ].join('\n'),
-    jqueryVersionCheck: [
-      '+function ($) {',
-      '  var version = $.fn.jquery.split(\' \')[0].split(\'.\')',
-      '  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {',
-      '    throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery version 1.9.1 or higher\')',
-      '  }',
-      '}(jQuery);\n\n'
-    ].join('\n'),
+    jqueryCheck: configBridge.config.jqueryCheck.join('\n'),
+    jqueryVersionCheck: configBridge.config.jqueryVersionCheck.join('\n'),
 
     // Task configuration.
     clean: {
@@ -138,25 +132,11 @@ module.exports = function (grunt) {
         dest: 'dist/js/<%= pkg.name %>.min.js'
       },
       customize: {
-        // NOTE: This src list is duplicated in footer.html; if making changes here, be sure to update the other copy too.
-        src: [
-          'docs/assets/js/vendor/less.min.js',
-          'docs/assets/js/vendor/jszip.min.js',
-          'docs/assets/js/vendor/uglify.min.js',
-          'docs/assets/js/vendor/Blob.js',
-          'docs/assets/js/vendor/FileSaver.js',
-          'docs/assets/js/raw-files.min.js',
-          'docs/assets/js/src/customizer.js'
-        ],
+        src: configBridge.paths.customizerJs,
         dest: 'docs/assets/js/customize.min.js'
       },
       docsJs: {
-        // NOTE: This src list is duplicated in footer.html; if making changes here, be sure to update the other copy too.
-        src: [
-          'docs/assets/js/vendor/holder.js',
-          'docs/assets/js/vendor/ZeroClipboard.min.js',
-          'docs/assets/js/src/application.js'
-        ],
+        src: configBridge.paths.docsJs,
         dest: 'docs/assets/js/docs.min.js'
       }
     },
@@ -195,16 +175,7 @@ module.exports = function (grunt) {
 
     autoprefixer: {
       options: {
-        browsers: [
-          'Android 2.3',
-          'Android >= 4',
-          'Chrome >= 20',
-          'Firefox >= 24', // Firefox 24 is the latest ESR
-          'Explorer >= 8',
-          'iOS >= 6',
-          'Opera >= 12',
-          'Safari >= 6'
-        ]
+        browsers: configBridge.config.autoprefixerBrowsers
       },
       core: {
         options: {
@@ -350,7 +321,6 @@ module.exports = function (grunt) {
         failHard: true,
         reset: true,
         relaxerror: [
-          'Bad value X-UA-Compatible for attribute http-equiv on element meta.',
           'Element img is missing required attribute src.',
           'Attribute autocomplete not allowed on element input at this point.',
           'Attribute autocomplete not allowed on element button at this point.'

data/vendor/assets/bower_components/bootstrap/README.md

@@ -24,7 +24,7 @@ To get started, check out <http://getbootstrap.com>!
 
 Four quick start options are available:
 
-- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.0.zip).
+- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.1.zip).
 - Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
 - Install with [Bower](http://bower.io): `bower install bootstrap`.
 - Install with [npm](https://www.npmjs.org): `npm install bootstrap`.
@@ -67,7 +67,7 @@ Bootstrap's documentation, included in this repo in the root directory, is built
 
 ### Running documentation locally
 
-1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.3.x).
+1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.5.x).
   - **Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems.
 2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`.
 3. From the root `/bootstrap` directory, run `jekyll serve` in the command line.

data/vendor/assets/bower_components/bootstrap/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "bootstrap",
   "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "keywords": [
     "css",
     "js",

data/vendor/assets/bower_components/bootstrap/dist/css/bootstrap-theme.css

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v3.3.0 (http://getbootstrap.com)
+ * Bootstrap v3.3.1 (http://getbootstrap.com)
  * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
@@ -69,28 +69,28 @@
   background-image: none;
 }
 .btn-primary {
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
-  background-image:      -o-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#2d6ca2));
-  background-image:         linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);
+  background-image: -webkit-linear-gradient(top, #337ab7 0%, #265a88 100%);
+  background-image:      -o-linear-gradient(top, #337ab7 0%, #265a88 100%);
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#265a88));
+  background-image:         linear-gradient(to bottom, #337ab7 0%, #265a88 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   background-repeat: repeat-x;
-  border-color: #2b669a;
+  border-color: #245580;
 }
 .btn-primary:hover,
 .btn-primary:focus {
-  background-color: #2d6ca2;
+  background-color: #265a88;
   background-position: 0 -15px;
 }
 .btn-primary:active,
 .btn-primary.active {
-  background-color: #2d6ca2;
-  border-color: #2b669a;
+  background-color: #265a88;
+  border-color: #245580;
 }
 .btn-primary:disabled,
 .btn-primary[disabled] {
-  background-color: #2d6ca2;
+  background-color: #265a88;
   background-image: none;
 }
 .btn-success {
@@ -211,12 +211,12 @@
 .dropdown-menu > .active > a,
 .dropdown-menu > .active > a:hover,
 .dropdown-menu > .active > a:focus {
-  background-color: #357ebd;
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image:      -o-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#357ebd));
-  background-image:         linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+  background-color: #2e6da4;
+  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+  background-image:      -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
+  background-image:         linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
   background-repeat: repeat-x;
 }
 .navbar-default {
@@ -275,6 +275,19 @@
 .navbar-fixed-bottom {
   border-radius: 0;
 }
+@media (max-width: 767px) {
+  .navbar .navbar-nav .open .dropdown-menu > .active > a,
+  .navbar .navbar-nav .open .dropdown-menu > .active > a:hover,
+  .navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #fff;
+    background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+    background-image:      -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+    background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
+    background-image:         linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
+    background-repeat: repeat-x;
+  }
+}
 .alert {
   text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
   -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
@@ -325,11 +338,11 @@
   background-repeat: repeat-x;
 }
 .progress-bar {
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%);
-  background-image:      -o-linear-gradient(top, #428bca 0%, #3071a9 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#3071a9));
-  background-image:         linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+  background-image: -webkit-linear-gradient(top, #337ab7 0%, #286090 100%);
+  background-image:      -o-linear-gradient(top, #337ab7 0%, #286090 100%);
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#286090));
+  background-image:         linear-gradient(to bottom, #337ab7 0%, #286090 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);
   background-repeat: repeat-x;
 }
 .progress-bar-success {
@@ -377,14 +390,14 @@
 .list-group-item.active,
 .list-group-item.active:hover,
 .list-group-item.active:focus {
-  text-shadow: 0 -1px 0 #3071a9;
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%);
-  background-image:      -o-linear-gradient(top, #428bca 0%, #3278b3 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#3278b3));
-  background-image:         linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
+  text-shadow: 0 -1px 0 #286090;
+  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2b669a 100%);
+  background-image:      -o-linear-gradient(top, #337ab7 0%, #2b669a 100%);
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2b669a));
+  background-image:         linear-gradient(to bottom, #337ab7 0%, #2b669a 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);
   background-repeat: repeat-x;
-  border-color: #3278b3;
+  border-color: #2b669a;
 }
 .list-group-item.active .badge,
 .list-group-item.active:hover .badge,
@@ -404,11 +417,11 @@
   background-repeat: repeat-x;
 }
 .panel-primary > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image:      -o-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#357ebd));
-  background-image:         linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+  background-image:      -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
+  background-image:         linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
   background-repeat: repeat-x;
 }
 .panel-success > .panel-heading {