Merge branch 'laura_and_will'

2026-02-17 00:07:24 +00:00 · 2014-07-29 14:09:29 +10:00
parent 8496609cc2 71b898cdec
commit 2ef0545561
2 changed files with 3 additions and 1 deletions
--- a/app/assets/images/noimage/small.png
+++ b/app/assets/images/noimage/small.png
--- a/app/assets/stylesheets/darkswarm/_shop-product-thumb.css.sass
+++ b/app/assets/stylesheets/darkswarm/_shop-product-thumb.css.sass
@@ -1,3 +1,5 @@
+@import branding
+
 .darkswarm
  products
    product
@@ -7,7 +9,7 @@
        left: 0px
        width: 7rem
        height: 7rem
-        outline: 1px solid #999
+        outline: 1px solid $disabled-bright
        float: left
        display: block
        z-index: 999999