Skip to content

Commit 5cffe13

Browse files
committed
Updated bootstrap & Blog Nav position
1 parent 11476e8 commit 5cffe13

File tree

2 files changed

+76
-75
lines changed

2 files changed

+76
-75
lines changed

Gemfile.lock

Lines changed: 75 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -7,71 +7,71 @@ GIT
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
actioncable (5.2.4.3)
11-
actionpack (= 5.2.4.3)
10+
actioncable (5.2.4.4)
11+
actionpack (= 5.2.4.4)
1212
nio4r (~> 2.0)
1313
websocket-driver (>= 0.6.1)
14-
actionmailer (5.2.4.3)
15-
actionpack (= 5.2.4.3)
16-
actionview (= 5.2.4.3)
17-
activejob (= 5.2.4.3)
14+
actionmailer (5.2.4.4)
15+
actionpack (= 5.2.4.4)
16+
actionview (= 5.2.4.4)
17+
activejob (= 5.2.4.4)
1818
mail (~> 2.5, >= 2.5.4)
1919
rails-dom-testing (~> 2.0)
20-
actionpack (5.2.4.3)
20+
actionpack (5.2.4.4)
2121
actionview (= 5.2.4.4)
22-
activesupport (= 5.2.4.3)
22+
activesupport (= 5.2.4.4)
2323
rack (~> 2.0, >= 2.0.8)
2424
rack-test (>= 0.6.3)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.2)
27-
actionview (5.2.4.3)
28-
activesupport (= 5.2.4.3)
27+
actionview (5.2.4.4)
28+
activesupport (= 5.2.4.4)
2929
builder (~> 3.1)
3030
erubi (~> 1.4)
3131
rails-dom-testing (~> 2.0)
3232
rails-html-sanitizer (~> 1.0, >= 1.0.3)
33-
activejob (5.2.4.3)
34-
activesupport (= 5.2.4.3)
33+
activejob (5.2.4.4)
34+
activesupport (= 5.2.4.4)
3535
globalid (>= 0.3.6)
36-
activemodel (5.2.4.3)
37-
activesupport (= 5.2.4.3)
38-
activerecord (5.2.4.3)
39-
activemodel (= 5.2.4.3)
40-
activesupport (= 5.2.4.3)
36+
activemodel (5.2.4.4)
37+
activesupport (= 5.2.4.4)
38+
activerecord (5.2.4.4)
39+
activemodel (= 5.2.4.4)
40+
activesupport (= 5.2.4.4)
4141
arel (>= 9.0)
42-
activestorage (5.2.4.3)
43-
actionpack (= 5.2.4.3)
44-
activerecord (= 5.2.4.3)
42+
activestorage (5.2.4.4)
43+
actionpack (= 5.2.4.4)
44+
activerecord (= 5.2.4.4)
4545
marcel (~> 0.3.1)
46-
activesupport (5.2.4.3)
46+
activesupport (5.2.4.4)
4747
concurrent-ruby (~> 1.0, >= 1.0.2)
4848
i18n (>= 0.7, < 2)
4949
minitest (~> 5.1)
5050
tzinfo (~> 1.1)
5151
addressable (2.7.0)
5252
public_suffix (>= 2.0.2, < 5.0)
5353
arel (9.0.0)
54-
autoprefixer-rails (9.8.5)
54+
autoprefixer-rails (10.2.0.0)
5555
execjs
5656
aws-eventstream (1.1.0)
57-
aws-partitions (1.350.0)
58-
aws-sdk-core (3.104.3)
57+
aws-partitions (1.416.0)
58+
aws-sdk-core (3.111.0)
5959
aws-eventstream (~> 1, >= 1.0.2)
6060
aws-partitions (~> 1, >= 1.239.0)
6161
aws-sigv4 (~> 1.1)
6262
jmespath (~> 1.0)
63-
aws-sdk-kms (1.36.0)
64-
aws-sdk-core (~> 3, >= 3.99.0)
63+
aws-sdk-kms (1.41.0)
64+
aws-sdk-core (~> 3, >= 3.109.0)
6565
aws-sigv4 (~> 1.1)
66-
aws-sdk-s3 (1.75.0)
67-
aws-sdk-core (~> 3, >= 3.104.1)
66+
aws-sdk-s3 (1.87.0)
67+
aws-sdk-core (~> 3, >= 3.109.0)
6868
aws-sdk-kms (~> 1)
6969
aws-sigv4 (~> 1.1)
70-
aws-sigv4 (1.2.1)
70+
aws-sigv4 (1.2.2)
7171
aws-eventstream (~> 1, >= 1.0.2)
72-
bcrypt (3.1.13)
72+
bcrypt (3.1.16)
7373
bindex (0.8.1)
74-
bootsnap (1.4.6)
74+
bootsnap (1.5.1)
7575
msgpack (~> 1.0)
7676
bootstrap (4.0.0)
7777
autoprefixer-rails (>= 6.0.3)
@@ -89,7 +89,7 @@ GEM
8989
carrierwave-aws (1.5.0)
9090
aws-sdk-s3 (~> 1.0)
9191
carrierwave (~> 2.0)
92-
cocoon (1.2.14)
92+
cocoon (1.2.15)
9393
coderay (1.1.3)
9494
coffee-rails (4.2.2)
9595
coffee-script (>= 2.2.0)
@@ -98,9 +98,9 @@ GEM
9898
coffee-script-source
9999
execjs
100100
coffee-script-source (1.12.2)
101-
concurrent-ruby (1.1.6)
101+
concurrent-ruby (1.1.7)
102102
crass (1.0.6)
103-
devise (4.7.2)
103+
devise (4.7.3)
104104
bcrypt (~> 3.0)
105105
orm_adapter (~> 0.1)
106106
railties (>= 4.1.0)
@@ -110,23 +110,23 @@ GEM
110110
dotenv-rails (2.7.6)
111111
dotenv (= 2.7.6)
112112
railties (>= 3.2)
113-
erubi (1.9.0)
113+
erubi (1.10.0)
114114
execjs (2.7.0)
115-
ffi (1.13.1)
116-
font-awesome-rails (4.7.0.5)
117-
railties (>= 3.2, < 6.1)
118-
friendly_id (5.3.0)
115+
ffi (1.14.2)
116+
font-awesome-rails (4.7.0.6)
117+
railties (>= 3.2, < 6.2)
118+
friendly_id (5.4.2)
119119
activerecord (>= 4.0.0)
120120
globalid (0.4.2)
121121
activesupport (>= 4.2.0)
122122
gritter (1.2.0)
123123
hirb (0.7.3)
124-
i18n (1.8.3)
124+
i18n (1.8.7)
125125
concurrent-ruby (~> 1.0)
126-
image_processing (1.11.0)
126+
image_processing (1.12.1)
127127
mini_magick (>= 4.9.5, < 5)
128128
ruby-vips (>= 2.0.17, < 3)
129-
jbuilder (2.10.0)
129+
jbuilder (2.10.1)
130130
activesupport (>= 5.0.0)
131131
jmespath (1.4.0)
132132
jquery-rails (4.4.0)
@@ -151,7 +151,7 @@ GEM
151151
rb-fsevent (~> 0.9, >= 0.9.4)
152152
rb-inotify (~> 0.9, >= 0.9.7)
153153
ruby_dep (~> 1.2)
154-
loofah (2.6.0)
154+
loofah (2.8.0)
155155
crass (~> 1.0.2)
156156
nokogiri (>= 1.5.9)
157157
mail (2.7.1)
@@ -160,14 +160,15 @@ GEM
160160
mimemagic (~> 0.3.2)
161161
method_source (1.0.0)
162162
mimemagic (0.3.5)
163-
mini_magick (4.10.1)
163+
mini_magick (4.11.0)
164164
mini_mime (1.0.2)
165-
mini_portile2 (2.4.0)
166-
minitest (5.14.1)
165+
mini_portile2 (2.5.0)
166+
minitest (5.14.3)
167167
msgpack (1.3.3)
168-
nio4r (2.5.2)
169-
nokogiri (1.10.9)
170-
mini_portile2 (~> 2.4.0)
168+
nio4r (2.5.4)
169+
nokogiri (1.11.1)
170+
mini_portile2 (~> 2.5.0)
171+
racc (~> 1.4)
171172
orm_adapter (0.5.0)
172173
petergate (2.0.1)
173174
activerecord (> 4.0.0)
@@ -179,41 +180,42 @@ GEM
179180
pry-byebug (3.9.0)
180181
byebug (~> 11.0)
181182
pry (~> 0.13.0)
182-
public_suffix (4.0.5)
183+
public_suffix (4.0.6)
183184
puma (3.12.6)
185+
racc (1.5.2)
184186
rack (2.2.3)
185187
rack-test (1.1.0)
186188
rack (>= 1.0, < 3)
187-
rails (5.2.4.3)
188-
actioncable (= 5.2.4.3)
189-
actionmailer (= 5.2.4.3)
190-
actionpack (= 5.2.4.3)
191-
actionview (= 5.2.4.3)
192-
activejob (= 5.2.4.3)
193-
activemodel (= 5.2.4.3)
194-
activerecord (= 5.2.4.3)
195-
activestorage (= 5.2.4.3)
196-
activesupport (= 5.2.4.3)
189+
rails (5.2.4.4)
190+
actioncable (= 5.2.4.4)
191+
actionmailer (= 5.2.4.4)
192+
actionpack (= 5.2.4.4)
193+
actionview (= 5.2.4.4)
194+
activejob (= 5.2.4.4)
195+
activemodel (= 5.2.4.4)
196+
activerecord (= 5.2.4.4)
197+
activestorage (= 5.2.4.4)
198+
activesupport (= 5.2.4.4)
197199
bundler (>= 1.3.0)
198-
railties (= 5.2.4.3)
200+
railties (= 5.2.4.4)
199201
sprockets-rails (>= 2.0.0)
200202
rails-dom-testing (2.0.3)
201203
activesupport (>= 4.2.0)
202204
nokogiri (>= 1.6)
203205
rails-html-sanitizer (1.3.0)
204206
loofah (~> 2.3)
205-
railties (5.2.4.3)
206-
actionpack (= 5.2.4.3)
207-
activesupport (= 5.2.4.3)
207+
railties (5.2.4.4)
208+
actionpack (= 5.2.4.4)
209+
activesupport (= 5.2.4.4)
208210
method_source
209211
rake (>= 0.8.7)
210212
thor (>= 0.19.0, < 2.0)
211-
rake (13.0.1)
213+
rake (13.0.3)
212214
rb-fsevent (0.10.4)
213215
rb-inotify (0.10.1)
214216
ffi (~> 1.0)
215-
redcarpet (3.5.0)
216-
redis (4.2.1)
217+
redcarpet (3.5.1)
218+
redis (4.2.5)
217219
responders (3.0.1)
218220
actionpack (>= 5.0)
219221
railties (>= 5.0)
@@ -231,14 +233,14 @@ GEM
231233
sprockets (>= 2.8, < 4.0)
232234
sprockets-rails (>= 2.0, < 4.0)
233235
tilt (>= 1.1, < 3)
234-
spring (2.1.0)
236+
spring (2.1.1)
235237
spring-watcher-listen (2.0.1)
236238
listen (>= 2.7, < 4.0)
237239
spring (>= 1.2, < 3.0)
238240
sprockets (3.7.2)
239241
concurrent-ruby (~> 1.0)
240242
rack (> 1, < 3)
241-
sprockets-rails (3.2.1)
243+
sprockets-rails (3.2.2)
242244
actionpack (>= 4.0)
243245
activesupport (>= 4.0)
244246
sprockets (>= 3.0.0)
@@ -248,18 +250,18 @@ GEM
248250
turbolinks (5.2.1)
249251
turbolinks-source (~> 5.2)
250252
turbolinks-source (5.2.0)
251-
tzinfo (1.2.7)
253+
tzinfo (1.2.9)
252254
thread_safe (~> 0.1)
253255
uglifier (4.2.0)
254256
execjs (>= 0.3.0, < 3)
255-
warden (1.2.8)
256-
rack (>= 2.0.6)
257+
warden (1.2.9)
258+
rack (>= 2.0.9)
257259
web-console (3.7.0)
258260
actionview (>= 5.0)
259261
activemodel (>= 5.0)
260262
bindex (>= 0.4.0)
261263
railties (>= 5.0)
262-
websocket-driver (0.7.2)
264+
websocket-driver (0.7.3)
263265
websocket-extensions (>= 0.1.0)
264266
websocket-extensions (0.1.5)
265267

app/views/shared/_blog_nav.html.erb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
<div class="container">
77
<%= link_to "D.B.Smith", root_path, class: 'navbar-brand' %>
8-
98
<div id="navbarSupportedContent" class="collapse navbar-collapse">
10-
<ul class="navbar-nav mr-auto">
9+
<ul class="navbar-nav ml-auto">
1110
<%= nav_helper 'nav-link', 'li' %>
1211
<%= login_helper 'nav-link' %>
1312
</ul>

0 commit comments

Comments
 (0)