Skip to content

Commit a8739ea

Browse files
sidhopostazure
authored andcommitted
Upgrade Bootstrap to latest version
[finishes #102090796] Signed-off-by: Jenny Chou <[email protected]>
1 parent ca6e7e0 commit a8739ea

17 files changed

+131
-200
lines changed

Gemfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ gem 'omniauth-saml'
88
gem 'github-markdown', require: 'github/markdown'
99
gem 'exceptional'
1010
gem 'protected_attributes'
11-
gem 'sass-rails', '4.0.3'
11+
gem 'sass-rails'
1212
gem 'compass-rails'
1313
gem 'coffee-rails'
1414
gem 'uglifier'
15-
gem 'bootstrap-sass', '~> 2.3.2'
15+
gem 'bootstrap-sass', '~> 3.3.5.1'
1616
gem 'font-awesome-sass-rails'
1717
gem 'evaporator', '~> 0.1.0', github: 'pivotal/evaporator'
1818

@@ -28,7 +28,6 @@ group :test, :development do
2828
gem 'faker'
2929
gem 'capybara'
3030
gem 'capybara-webkit'
31-
gem 'capybara-accessible'
3231
gem 'launchy'
3332
gem 'database_cleaner'
3433
gem 'letter_opener'

Gemfile.lock

+78-66
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,22 @@ GEM
3434
minitest (~> 5.1)
3535
thread_safe (~> 0.1)
3636
tzinfo (~> 1.1)
37-
addressable (2.3.5)
37+
addressable (2.3.8)
3838
arel (5.0.1.20140414130214)
3939
auto_tagger (0.2.11)
4040
capistrano (>= 2.5.3, <= 2.14.2)
41+
autoprefixer-rails (5.2.1.2)
42+
execjs
43+
json
4144
better_errors (2.1.1)
4245
coderay (>= 1.0.0)
4346
erubis (>= 2.6.6)
4447
rack (>= 0.9.0)
4548
binding_of_caller (0.7.2)
4649
debug_inspector (>= 0.0.1)
47-
bootstrap-sass (2.3.2.2)
48-
sass (~> 3.2)
50+
bootstrap-sass (3.3.5.1)
51+
autoprefixer-rails (>= 5.0.0.1)
52+
sass (>= 3.3.0)
4953
builder (3.2.2)
5054
byebug (6.0.2)
5155
capistrano (2.14.2)
@@ -54,38 +58,45 @@ GEM
5458
net-sftp (>= 2.0.0)
5559
net-ssh (>= 2.0.14)
5660
net-ssh-gateway (>= 1.1.0)
57-
capybara (2.4.1)
61+
capybara (2.4.4)
5862
mime-types (>= 1.16)
5963
nokogiri (>= 1.3.3)
6064
rack (>= 1.0.0)
6165
rack-test (>= 0.5.4)
6266
xpath (~> 2.0)
63-
capybara-accessible (0.2.0)
64-
capybara (~> 2.0)
65-
selenium-webdriver
66-
capybara-webkit (1.1.0)
67-
capybara (~> 2.0, >= 2.0.2)
67+
capybara-webkit (1.6.0)
68+
capybara (>= 2.3.0, < 2.5.0)
6869
json
69-
childprocess (0.5.3)
70+
childprocess (0.5.6)
7071
ffi (~> 1.0, >= 1.0.11)
71-
chunky_png (1.3.0)
72+
chunky_png (1.3.4)
7273
codeclimate-test-reporter (0.4.7)
7374
simplecov (>= 0.7.1, < 1.0.0)
7475
coderay (1.1.0)
75-
coffee-rails (4.0.1)
76+
coffee-rails (4.1.0)
7677
coffee-script (>= 2.2.0)
7778
railties (>= 4.0.0, < 5.0)
78-
coffee-script (2.2.0)
79+
coffee-script (2.4.1)
7980
coffee-script-source
8081
execjs
81-
coffee-script-source (1.7.0)
82-
compass (0.12.2)
82+
coffee-script-source (1.9.1.1)
83+
compass (1.0.3)
8384
chunky_png (~> 1.2)
84-
fssm (>= 0.2.7)
85-
sass (~> 3.1)
86-
compass-rails (1.1.3)
87-
compass (>= 0.12.2)
88-
database_cleaner (1.2.0)
85+
compass-core (~> 1.0.2)
86+
compass-import-once (~> 1.0.5)
87+
rb-fsevent (>= 0.9.3)
88+
rb-inotify (>= 0.9)
89+
sass (>= 3.3.13, < 3.5)
90+
compass-core (1.0.3)
91+
multi_json (~> 1.0)
92+
sass (>= 3.3.0, < 3.5)
93+
compass-import-once (1.0.5)
94+
sass (>= 3.2, < 3.5)
95+
compass-rails (2.0.5)
96+
compass (~> 1.0.0)
97+
sass-rails (< 5.1)
98+
sprockets (< 2.13)
99+
database_cleaner (1.4.1)
89100
debug_inspector (0.0.2)
90101
diff-lcs (1.2.5)
91102
docile (1.1.5)
@@ -96,69 +107,67 @@ GEM
96107
erubis (2.7.0)
97108
exceptional (2.0.33)
98109
rack
99-
execjs (2.0.2)
100-
factory_girl (4.4.0)
110+
execjs (2.6.0)
111+
factory_girl (4.5.0)
101112
activesupport (>= 3.0.0)
102-
factory_girl_rails (4.4.1)
103-
factory_girl (~> 4.4.0)
113+
factory_girl_rails (4.5.0)
114+
factory_girl (~> 4.5.0)
104115
railties (>= 3.0.0)
105-
fakefs (0.5.0)
106-
faker (1.2.0)
116+
fakefs (0.6.7)
117+
faker (1.5.0)
107118
i18n (~> 0.5)
108-
ffi (1.9.3)
119+
ffi (1.9.10)
109120
font-awesome-sass-rails (3.0.2.2)
110121
railties (>= 3.1.1)
111122
sass-rails (>= 3.1.1)
112-
foreman (0.63.0)
113-
dotenv (>= 0.7)
114-
thor (>= 0.13.6)
115-
fssm (0.2.10)
116-
github-markdown (0.6.4)
123+
foreman (0.78.0)
124+
thor (~> 0.19.1)
125+
github-markdown (0.6.9)
117126
hashie (3.4.2)
118-
highline (1.6.21)
127+
highline (1.7.3)
119128
hike (1.2.3)
120129
i18n (0.7.0)
121-
jquery-rails (3.1.0)
130+
jquery-rails (3.1.3)
122131
railties (>= 3.0, < 5.0)
123132
thor (>= 0.14, < 2.0)
124133
json (1.8.3)
125-
kgio (2.9.2)
126-
launchy (2.4.2)
134+
kgio (2.9.3)
135+
launchy (2.4.3)
127136
addressable (~> 2.3)
128-
letter_opener (1.2.0)
137+
letter_opener (1.4.1)
129138
launchy (~> 2.2)
130139
macaddr (1.7.1)
131140
systemu (~> 2.6.2)
132141
mail (2.6.3)
133142
mime-types (>= 1.16, < 3)
134143
method_source (0.8.2)
135144
mime-types (2.6.1)
136-
mini_portile (0.6.0)
145+
mini_portile (0.6.2)
137146
minitest (5.8.0)
138147
multi_json (1.11.2)
139-
net-scp (1.2.0)
148+
net-scp (1.2.1)
140149
net-ssh (>= 2.6.5)
141150
net-sftp (2.1.2)
142151
net-ssh (>= 2.6.5)
143-
net-ssh (2.8.0)
152+
net-ssh (2.9.2)
144153
net-ssh-gateway (1.2.0)
145154
net-ssh (>= 2.6.5)
146-
nokogiri (1.6.3.1)
147-
mini_portile (= 0.6.0)
155+
nokogiri (1.6.6.2)
156+
mini_portile (~> 0.6.0)
148157
omniauth (1.2.2)
149158
hashie (>= 1.2, < 4)
150159
rack (~> 1.0)
151160
omniauth-saml (1.4.1)
152161
omniauth (~> 1.1)
153162
ruby-saml (~> 1.0.0)
154-
pg (0.17.1)
155-
protected_attributes (1.0.5)
163+
pg (0.18.2)
164+
protected_attributes (1.1.3)
156165
activemodel (>= 4.0.1, < 5.0)
157166
pry (0.10.1)
158167
coderay (~> 1.1.0)
159168
method_source (~> 0.8.1)
160169
slop (~> 3.4)
161-
pry-rails (0.3.2)
170+
pry-rails (0.3.4)
162171
pry (>= 0.9.10)
163172
rack (1.5.5)
164173
rack-test (0.6.3)
@@ -176,15 +185,18 @@ GEM
176185
rails_12factor (0.0.3)
177186
rails_serve_static_assets
178187
rails_stdout_logging
179-
rails_serve_static_assets (0.0.2)
180-
rails_stdout_logging (0.0.3)
188+
rails_serve_static_assets (0.0.4)
189+
rails_stdout_logging (0.0.4)
181190
railties (4.1.9)
182191
actionpack (= 4.1.9)
183192
activesupport (= 4.1.9)
184193
rake (>= 0.8.7)
185194
thor (>= 0.18.1, < 2.0)
186-
raindrops (0.13.0)
195+
raindrops (0.15.0)
187196
rake (10.4.2)
197+
rb-fsevent (0.9.5)
198+
rb-inotify (0.9.5)
199+
ffi (>= 0.5.0)
188200
rspec-core (3.0.4)
189201
rspec-support (~> 3.0.0)
190202
rspec-expectations (3.0.4)
@@ -204,27 +216,28 @@ GEM
204216
ruby-saml (1.0.0)
205217
nokogiri (>= 1.5.10)
206218
uuid (~> 2.3)
207-
rubyzip (1.1.6)
208-
sass (3.2.19)
209-
sass-rails (4.0.3)
219+
rubyzip (1.1.7)
220+
sass (3.4.18)
221+
sass-rails (5.0.3)
210222
railties (>= 4.0.0, < 5.0)
211-
sass (~> 3.2.0)
212-
sprockets (~> 2.8, <= 2.11.0)
213-
sprockets-rails (~> 2.0)
214-
selenium-webdriver (2.42.0)
215-
childprocess (>= 0.5.0)
223+
sass (~> 3.1)
224+
sprockets (>= 2.8, < 4.0)
225+
sprockets-rails (>= 2.0, < 4.0)
226+
tilt (~> 1.1)
227+
selenium-webdriver (2.47.1)
228+
childprocess (~> 0.5)
216229
multi_json (~> 1.0)
217230
rubyzip (~> 1.0)
218-
websocket (~> 1.0.4)
219-
shoulda-matchers (2.5.0)
231+
websocket (~> 1.0)
232+
shoulda-matchers (2.8.0)
220233
activesupport (>= 3.0.0)
221234
simplecov (0.10.0)
222235
docile (~> 1.1.0)
223236
json (~> 1.8)
224237
simplecov-html (~> 0.10.0)
225238
simplecov-html (0.10.0)
226239
slop (3.6.0)
227-
sprockets (2.11.0)
240+
sprockets (2.12.4)
228241
hike (~> 1.2)
229242
multi_json (~> 1.0)
230243
rack (~> 1.0)
@@ -237,19 +250,19 @@ GEM
237250
thor (0.19.1)
238251
thread_safe (0.3.5)
239252
tilt (1.4.1)
240-
timecop (0.7.1)
253+
timecop (0.8.0)
241254
tzinfo (1.2.2)
242255
thread_safe (~> 0.1)
243-
uglifier (2.4.0)
256+
uglifier (2.7.1)
244257
execjs (>= 0.3.0)
245258
json (>= 1.8.0)
246-
unicorn (4.8.2)
259+
unicorn (4.9.0)
247260
kgio (~> 2.6)
248261
rack
249262
raindrops (~> 0.7)
250263
uuid (2.3.8)
251264
macaddr (~> 1.0)
252-
websocket (1.0.7)
265+
websocket (1.2.2)
253266
xpath (2.0.0)
254267
nokogiri (~> 1.3)
255268

@@ -260,10 +273,9 @@ DEPENDENCIES
260273
auto_tagger
261274
better_errors
262275
binding_of_caller
263-
bootstrap-sass (~> 2.3.2)
276+
bootstrap-sass (~> 3.3.5.1)
264277
byebug
265278
capybara
266-
capybara-accessible
267279
capybara-webkit
268280
codeclimate-test-reporter
269281
coffee-rails
@@ -289,7 +301,7 @@ DEPENDENCIES
289301
rails (= 4.1.9)
290302
rails_12factor
291303
rspec-rails (= 3.0.0)
292-
sass-rails (= 4.0.3)
304+
sass-rails
293305
selenium-webdriver
294306
shoulda-matchers
295307
timecop

app/assets/stylesheets/application.scss

+9-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@
99
* compiled file, but it's generally better to create a new file per style scope.
1010
*
1111
*= require_self
12-
*= require_tree ./media
1312
*/
1413

14+
@import "bootstrap-sprockets";
1515
@import "bootstrap";
16-
@import "bootstrap-responsive";
1716
@import 'font-awesome';
1817
@import "compass/css3/box";
1918
@import 'sass-flex-mixin';
2019

20+
$textColor: black;
21+
2122
body{
2223
color: #5D5C5C;
2324
}
@@ -40,7 +41,12 @@ a:hover {
4041

4142
height: 100%;
4243
width: 100%;
43-
margin-top: -18px;
44+
margin-top: 50px;
45+
}
46+
47+
.content-wrapper {
48+
padding: 0px 15px;
49+
margin: 50px 0px 0px 0px;
4450
}
4551

4652
.standup {

app/assets/stylesheets/deck.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
@import "bootstrap";
9-
@import "bootstrap-responsive";
9+
@import "bootstrap-sprockets";
1010
@import 'font-awesome';
1111
@import "compass/css3/box";
1212

0 commit comments

Comments
 (0)