update bootstrap to 2.2.1.1
This commit is contained in:
parent
ebcbe0c87b
commit
236584c2f8
3 changed files with 7 additions and 3 deletions
2
Gemfile
2
Gemfile
|
@ -106,7 +106,7 @@ group :assets do
|
|||
gem "jquery-ui-rails", "2.0.2"
|
||||
gem "modernizr", "2.6.2"
|
||||
gem "raphael-rails", "2.1.0"
|
||||
gem 'bootstrap-sass', "2.0.4"
|
||||
gem 'bootstrap-sass', "2.2.1.1"
|
||||
gem "font-awesome-sass-rails", "~> 2.0.0"
|
||||
gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
|
||||
end
|
||||
|
|
|
@ -97,7 +97,8 @@ GEM
|
|||
backports (2.6.5)
|
||||
bcrypt-ruby (3.0.1)
|
||||
blankslate (3.1.2)
|
||||
bootstrap-sass (2.0.4.0)
|
||||
bootstrap-sass (2.2.1.1)
|
||||
sass (~> 3.2)
|
||||
builder (3.0.4)
|
||||
capybara (1.1.3)
|
||||
mime-types (>= 1.16)
|
||||
|
@ -446,7 +447,7 @@ DEPENDENCIES
|
|||
acts-as-taggable-on (= 2.3.3)
|
||||
annotate!
|
||||
awesome_print
|
||||
bootstrap-sass (= 2.0.4)
|
||||
bootstrap-sass (= 2.2.1.1)
|
||||
capybara
|
||||
carrierwave (~> 0.7.1)
|
||||
chosen-rails (= 0.9.8)
|
||||
|
|
|
@ -2,6 +2,9 @@
|
|||
* Headers
|
||||
*
|
||||
*/
|
||||
|
||||
body { font-size: 13px; }
|
||||
h1, h2, h3, h4, h5, h6 { margin:0 }
|
||||
h3, h4, h5, h6 { line-height: 36px; }
|
||||
h5 { font-size:14px; }
|
||||
h3.page_title {
|
||||
|
|
Loading…
Reference in a new issue