Merge branch 'main' of src.steve.ayerh.art:steve/dundo.farm

main
Steve Ayerhart 2022-02-22 23:18:46 +00:00
commit 961a417e58
9 changed files with 19 additions and 3 deletions

View File

@ -20,5 +20,5 @@
# Learn more: http://github.com/javan/whenever # Learn more: http://github.com/javan/whenever
every 1.minute do every 1.minute do
rake 'ig:update_media' rake 'db:seed:replant'
end end

BIN
public/style/img/Merch.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 KiB

0
public/style/img/dundo-farms-logo.png Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

0
public/style/img/dundo-farms-logo.svg Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

View File

@ -8,6 +8,7 @@
width: 100%; width: 100%;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex-wrap: wrap;
&:nth-child(even) { &:nth-child(even) {
flex-direction: row-reverse; flex-direction: row-reverse;
@ -23,7 +24,6 @@
&:nth-child(odd) { &:nth-child(odd) {
img { img {
box-shadow: -30px 0px 0px #f2dfce; box-shadow: -30px 0px 0px #f2dfce;
} }
} }
@ -47,6 +47,12 @@
p { p {
padding: 12px 0; padding: 12px 0;
} }
@media (max-width: 600px) {
h1,h2,p {
text-align: center;;
}
}
} }
img { img {

7
style/_merch.scss Normal file
View File

@ -0,0 +1,7 @@
img {
height: 100%;
width: 100%;
object-fit: contain;
border-radius: 5%;
}

View File

@ -87,7 +87,6 @@ body {
.container { .container {
max-width: 900px; max-width: 900px;
min-width: 760px;
} }
} }

View File

@ -11,5 +11,6 @@
@import 'variables'; @import 'variables';
@import 'shared'; @import 'shared';
@import 'merch';
@import 'gallery'; @import 'gallery';
@import 'critters'; @import 'critters';

View File

@ -0,0 +1,3 @@
<section id="merch">
<img src="style/img/Merch.jpg"/ alt="Merch"/>
</section>