Download as
Browse Code »

Commit 236584c2f804286b8cffab69c40deb0bca8c8632

Authored by Dmitriy Zaporozhets
1 parent ebcbe0c8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

update bootstrap to 2.2.1.1

Showing 3 changed files with 7 additions and 3 deletions   Show diff stats
@@ -106,7 +106,7 @@ group :assets do @@ -106,7 +106,7 @@ group :assets do
106 gem "jquery-ui-rails", "2.0.2" 106 gem "jquery-ui-rails", "2.0.2"
107 gem "modernizr", "2.6.2" 107 gem "modernizr", "2.6.2"
108 gem "raphael-rails", "2.1.0" 108 gem "raphael-rails", "2.1.0"
109 - gem 'bootstrap-sass', "2.0.4" 109 + gem 'bootstrap-sass', "2.2.1.1"
110 gem "font-awesome-sass-rails", "~> 2.0.0" 110 gem "font-awesome-sass-rails", "~> 2.0.0"
111 gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' 111 gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
112 end 112 end
@@ -97,7 +97,8 @@ GEM @@ -97,7 +97,8 @@ GEM
97 backports (2.6.5) 97 backports (2.6.5)
98 bcrypt-ruby (3.0.1) 98 bcrypt-ruby (3.0.1)
99 blankslate (3.1.2) 99 blankslate (3.1.2)
100 - bootstrap-sass (2.0.4.0) 100 + bootstrap-sass (2.2.1.1)
  101 + sass (~> 3.2)
101 builder (3.0.4) 102 builder (3.0.4)
102 capybara (1.1.3) 103 capybara (1.1.3)
103 mime-types (>= 1.16) 104 mime-types (>= 1.16)
@@ -446,7 +447,7 @@ DEPENDENCIES @@ -446,7 +447,7 @@ DEPENDENCIES
446 acts-as-taggable-on (= 2.3.3) 447 acts-as-taggable-on (= 2.3.3)
447 annotate! 448 annotate!
448 awesome_print 449 awesome_print
449 - bootstrap-sass (= 2.0.4) 450 + bootstrap-sass (= 2.2.1.1)
450 capybara 451 capybara
451 carrierwave (~> 0.7.1) 452 carrierwave (~> 0.7.1)
452 chosen-rails (= 0.9.8) 453 chosen-rails (= 0.9.8)
app/assets/stylesheets/gitlab_bootstrap/typography.scss
  Diff comments   View file @236584c
@@ -2,6 +2,9 @@ @@ -2,6 +2,9 @@
2 * Headers 2 * Headers
3 * 3 *
4 */ 4 */
  5 +
  6 +body { font-size: 13px; }
  7 +h1, h2, h3, h4, h5, h6 { margin:0 }
5 h3, h4, h5, h6 { line-height: 36px; } 8 h3, h4, h5, h6 { line-height: 36px; }
6 h5 { font-size:14px; } 9 h5 { font-size:14px; }
7 h3.page_title { 10 h3.page_title {