diff --git a/config/schedule.rb b/config/schedule.rb index 1b98bab..f6129cb 100644 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -20,5 +20,5 @@ # Learn more: http://github.com/javan/whenever every 1.minute do - rake 'ig:update_media' + rake 'db:seed:replant' end diff --git a/public/style/img/Merch.jpg b/public/style/img/Merch.jpg new file mode 100644 index 0000000..bb9ddfe Binary files /dev/null and b/public/style/img/Merch.jpg differ diff --git a/public/style/img/dundo-farms-logo.png b/public/style/img/dundo-farms-logo.png old mode 100755 new mode 100644 diff --git a/public/style/img/dundo-farms-logo.svg b/public/style/img/dundo-farms-logo.svg old mode 100755 new mode 100644 diff --git a/style/_critters.scss b/style/_critters.scss index 19ca3d1..31b5498 100644 --- a/style/_critters.scss +++ b/style/_critters.scss @@ -8,6 +8,7 @@ width: 100%; justify-content: center; align-items: center; + flex-wrap: wrap; &:nth-child(even) { flex-direction: row-reverse; @@ -23,7 +24,6 @@ &:nth-child(odd) { img { box-shadow: -30px 0px 0px #f2dfce; - } } @@ -47,6 +47,12 @@ p { padding: 12px 0; } + + @media (max-width: 600px) { + h1,h2,p { + text-align: center;; + } + } } img { diff --git a/style/_merch.scss b/style/_merch.scss new file mode 100644 index 0000000..31afe54 --- /dev/null +++ b/style/_merch.scss @@ -0,0 +1,7 @@ + +img { + height: 100%; + width: 100%; + object-fit: contain; + border-radius: 5%; +} diff --git a/style/_shared.scss b/style/_shared.scss index 7a7ad12..4a56724 100644 --- a/style/_shared.scss +++ b/style/_shared.scss @@ -87,7 +87,6 @@ body { .container { max-width: 900px; - min-width: 760px; } } diff --git a/style/dundo.scss b/style/dundo.scss index fa79000..edf66b9 100644 --- a/style/dundo.scss +++ b/style/dundo.scss @@ -11,5 +11,6 @@ @import 'variables'; @import 'shared'; +@import 'merch'; @import 'gallery'; @import 'critters'; diff --git a/views/merch.erb b/views/merch.erb index e69de29..11b85f2 100644 --- a/views/merch.erb +++ b/views/merch.erb @@ -0,0 +1,3 @@ +
+ Merch +