From 236584c2f804286b8cffab69c40deb0bca8c8632 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 20 Nov 2012 20:01:25 +0200 Subject: [PATCH] update bootstrap to 2.2.1.1 --- Gemfile | 2 +- Gemfile.lock | 5 +++-- app/assets/stylesheets/gitlab_bootstrap/typography.scss | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index cb0976681..b0f31a615 100644 --- a/Gemfile +++ b/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 diff --git a/Gemfile.lock b/Gemfile.lock index 693b2060e..d5be48d1c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss index 97e854928..0afad789e 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss @@ -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 { -- 2.11.0