diff --git a/public/style/img/Merch.jpg b/public/style/img/Merch.jpg new file mode 100755 index 0000000..1485637 Binary files /dev/null and b/public/style/img/Merch.jpg differ 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/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 +