diff --git a/public/css/build/app.css b/public/css/build/app.css index 3cb62452e3..9b58cf30f8 100644 Binary files a/public/css/build/app.css and b/public/css/build/app.css differ diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 4c96ce5bf3..8f731093ff 100644 Binary files a/public/css/build/overrides.css and b/public/css/build/overrides.css differ diff --git a/public/css/dist/all.css b/public/css/dist/all.css index d3235bf85d..30ab0af882 100644 Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ diff --git a/public/css/dist/skins/skin-black-dark.css b/public/css/dist/skins/skin-black-dark.css index 308d6bcbdd..72fda61740 100644 Binary files a/public/css/dist/skins/skin-black-dark.css and b/public/css/dist/skins/skin-black-dark.css differ diff --git a/public/css/dist/skins/skin-black-dark.min.css b/public/css/dist/skins/skin-black-dark.min.css index 308d6bcbdd..72fda61740 100644 Binary files a/public/css/dist/skins/skin-black-dark.min.css and b/public/css/dist/skins/skin-black-dark.min.css differ diff --git a/public/css/dist/skins/skin-black.css b/public/css/dist/skins/skin-black.css index 5dc1130f96..3928c9a26d 100644 Binary files a/public/css/dist/skins/skin-black.css and b/public/css/dist/skins/skin-black.css differ diff --git a/public/css/dist/skins/skin-black.min.css b/public/css/dist/skins/skin-black.min.css index 5dc1130f96..3928c9a26d 100644 Binary files a/public/css/dist/skins/skin-black.min.css and b/public/css/dist/skins/skin-black.min.css differ diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css index 9c069b39b6..e889ead724 100644 Binary files a/public/css/dist/skins/skin-blue-dark.css and b/public/css/dist/skins/skin-blue-dark.css differ diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css index 9c069b39b6..e889ead724 100644 Binary files a/public/css/dist/skins/skin-blue-dark.min.css and b/public/css/dist/skins/skin-blue-dark.min.css differ diff --git a/public/css/dist/skins/skin-blue.css b/public/css/dist/skins/skin-blue.css index 8c8066fa58..46ad39f5a9 100644 Binary files a/public/css/dist/skins/skin-blue.css and b/public/css/dist/skins/skin-blue.css differ diff --git a/public/css/dist/skins/skin-blue.min.css b/public/css/dist/skins/skin-blue.min.css index 8c8066fa58..46ad39f5a9 100644 Binary files a/public/css/dist/skins/skin-blue.min.css and b/public/css/dist/skins/skin-blue.min.css differ diff --git a/public/css/dist/skins/skin-contrast.css b/public/css/dist/skins/skin-contrast.css index 71ed3137b9..414cce45af 100644 Binary files a/public/css/dist/skins/skin-contrast.css and b/public/css/dist/skins/skin-contrast.css differ diff --git a/public/css/dist/skins/skin-contrast.min.css b/public/css/dist/skins/skin-contrast.min.css index 71ed3137b9..414cce45af 100644 Binary files a/public/css/dist/skins/skin-contrast.min.css and b/public/css/dist/skins/skin-contrast.min.css differ diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css index ac683b4e8c..54c251ae8e 100644 Binary files a/public/css/dist/skins/skin-green-dark.css and b/public/css/dist/skins/skin-green-dark.css differ diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css index ac683b4e8c..54c251ae8e 100644 Binary files a/public/css/dist/skins/skin-green-dark.min.css and b/public/css/dist/skins/skin-green-dark.min.css differ diff --git a/public/css/dist/skins/skin-green.css b/public/css/dist/skins/skin-green.css index ed5a829fe1..b61514f8b9 100644 Binary files a/public/css/dist/skins/skin-green.css and b/public/css/dist/skins/skin-green.css differ diff --git a/public/css/dist/skins/skin-green.min.css b/public/css/dist/skins/skin-green.min.css index ed5a829fe1..b61514f8b9 100644 Binary files a/public/css/dist/skins/skin-green.min.css and b/public/css/dist/skins/skin-green.min.css differ diff --git a/public/css/dist/skins/skin-orange-dark.css b/public/css/dist/skins/skin-orange-dark.css index 5f92b70f79..f70153b89f 100644 Binary files a/public/css/dist/skins/skin-orange-dark.css and b/public/css/dist/skins/skin-orange-dark.css differ diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css index 5f92b70f79..f70153b89f 100644 Binary files a/public/css/dist/skins/skin-orange-dark.min.css and b/public/css/dist/skins/skin-orange-dark.min.css differ diff --git a/public/css/dist/skins/skin-orange.css b/public/css/dist/skins/skin-orange.css index 7791e20be0..eb5931b308 100644 Binary files a/public/css/dist/skins/skin-orange.css and b/public/css/dist/skins/skin-orange.css differ diff --git a/public/css/dist/skins/skin-orange.min.css b/public/css/dist/skins/skin-orange.min.css index 7791e20be0..eb5931b308 100644 Binary files a/public/css/dist/skins/skin-orange.min.css and b/public/css/dist/skins/skin-orange.min.css differ diff --git a/public/css/dist/skins/skin-purple-dark.css b/public/css/dist/skins/skin-purple-dark.css index 406e570497..45f9158c8a 100644 Binary files a/public/css/dist/skins/skin-purple-dark.css and b/public/css/dist/skins/skin-purple-dark.css differ diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css index 406e570497..45f9158c8a 100644 Binary files a/public/css/dist/skins/skin-purple-dark.min.css and b/public/css/dist/skins/skin-purple-dark.min.css differ diff --git a/public/css/dist/skins/skin-purple.css b/public/css/dist/skins/skin-purple.css index 978009852b..b452078b3b 100644 Binary files a/public/css/dist/skins/skin-purple.css and b/public/css/dist/skins/skin-purple.css differ diff --git a/public/css/dist/skins/skin-purple.min.css b/public/css/dist/skins/skin-purple.min.css index 978009852b..b452078b3b 100644 Binary files a/public/css/dist/skins/skin-purple.min.css and b/public/css/dist/skins/skin-purple.min.css differ diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css index a07f9e52a6..9efcb72a21 100644 Binary files a/public/css/dist/skins/skin-red-dark.css and b/public/css/dist/skins/skin-red-dark.css differ diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css index a07f9e52a6..9efcb72a21 100644 Binary files a/public/css/dist/skins/skin-red-dark.min.css and b/public/css/dist/skins/skin-red-dark.min.css differ diff --git a/public/css/dist/skins/skin-red.css b/public/css/dist/skins/skin-red.css index 5152b6f555..661ceadb9a 100644 Binary files a/public/css/dist/skins/skin-red.css and b/public/css/dist/skins/skin-red.css differ diff --git a/public/css/dist/skins/skin-red.min.css b/public/css/dist/skins/skin-red.min.css index 5152b6f555..661ceadb9a 100644 Binary files a/public/css/dist/skins/skin-red.min.css and b/public/css/dist/skins/skin-red.min.css differ diff --git a/public/css/dist/skins/skin-yellow-dark.css b/public/css/dist/skins/skin-yellow-dark.css index f742fa04f1..1a7f31da16 100644 Binary files a/public/css/dist/skins/skin-yellow-dark.css and b/public/css/dist/skins/skin-yellow-dark.css differ diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css index f742fa04f1..1a7f31da16 100644 Binary files a/public/css/dist/skins/skin-yellow-dark.min.css and b/public/css/dist/skins/skin-yellow-dark.min.css differ diff --git a/public/css/dist/skins/skin-yellow.css b/public/css/dist/skins/skin-yellow.css index c754cacf07..364adbc64f 100644 Binary files a/public/css/dist/skins/skin-yellow.css and b/public/css/dist/skins/skin-yellow.css differ diff --git a/public/css/dist/skins/skin-yellow.min.css b/public/css/dist/skins/skin-yellow.min.css index c754cacf07..364adbc64f 100644 Binary files a/public/css/dist/skins/skin-yellow.min.css and b/public/css/dist/skins/skin-yellow.min.css differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index fdab66e25e..8e819002bb 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,24 +1,24 @@ { "/js/build/app.js": "/js/build/app.js?id=2041f181f1136a9a18d8", - "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=83e39e254b7f9035eddc", - "/css/build/overrides.css": "/css/build/overrides.css?id=2b4f308c2228f3cfb449", - "/css/build/app.css": "/css/build/app.css?id=8a7e1ade9cf77fecc75f", + "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=cf32592ae76e1134312c", + "/css/build/overrides.css": "/css/build/overrides.css?id=e450097d74701643c241", + "/css/build/app.css": "/css/build/app.css?id=f97816f469b4cc535af4", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=65ca7a34198fa16ba846", - "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=83271cb3576583918804", - "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=d81888449b72ecd8dd24", - "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=04b51f791329b22290c3", - "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=8b631c0444622bf0bfd3", - "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=a663ec2c7842a3507df9", - "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=32c66312057953f69651", - "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=0a901949068bc7ce7f80", - "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=523144d33c7706098ed2", - "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=fafb61603f6db2f250df", - "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=ec96c42439cdeb022133", - "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=6e35fb4cb2f1063b3047", - "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=efda2335fa5243175850", - "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=6a9d0ac448c28b88e5d6", - "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c24716a423d375902723", - "/css/dist/all.css": "/css/dist/all.css?id=0c1473e16f0d2bb916d8", + "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=b25c92dab95a46c8573a", + "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=da8f1b5753826de00425", + "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=c995032fb9d7ead1a81e", + "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=52270c18eead3ff6befe", + "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=32703c9c4c6c3f994513", + "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=fc5b34b9cc0f355af17e", + "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=7b070ab3e32bae0bb3bc", + "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=15968907f30bdcbc5e01", + "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=570265b44a7776fdb893", + "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=f8391674b91dc1320f5a", + "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=d8f647c1c43ee72e7000", + "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=39defadc0705db43a793", + "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=3f9f3427eccdf82db31e", + "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=f9015c9b4554c6bfa4fe", + "/css/dist/all.css": "/css/dist/all.css?id=f848fecd03425889e9cb", "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212", "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced", @@ -27,19 +27,19 @@ "/js/build/vendor.js": "/js/build/vendor.js?id=651427cc4b45d8e68d0c", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=867755a1544f6c0ea828", "/js/dist/all.js": "/js/dist/all.js?id=872df2da32a9dcbfd252", - "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=efda2335fa5243175850", - "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=6e35fb4cb2f1063b3047", - "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=ec96c42439cdeb022133", - "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=fafb61603f6db2f250df", - "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=83e39e254b7f9035eddc", - "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=04b51f791329b22290c3", - "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=a663ec2c7842a3507df9", - "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=8b631c0444622bf0bfd3", - "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=c24716a423d375902723", - "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=523144d33c7706098ed2", - "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=0a901949068bc7ce7f80", - "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=32c66312057953f69651", - "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=83271cb3576583918804", - "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=d81888449b72ecd8dd24", - "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=6a9d0ac448c28b88e5d6" + "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=39defadc0705db43a793", + "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=d8f647c1c43ee72e7000", + "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=f8391674b91dc1320f5a", + "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=570265b44a7776fdb893", + "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=cf32592ae76e1134312c", + "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=c995032fb9d7ead1a81e", + "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=32703c9c4c6c3f994513", + "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=52270c18eead3ff6befe", + "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=f9015c9b4554c6bfa4fe", + "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=15968907f30bdcbc5e01", + "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=7b070ab3e32bae0bb3bc", + "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=fc5b34b9cc0f355af17e", + "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=b25c92dab95a46c8573a", + "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=da8f1b5753826de00425", + "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=3f9f3427eccdf82db31e" } diff --git a/resources/assets/js/snipeit.js b/resources/assets/js/snipeit.js index f3f576cae5..2877727ae9 100755 --- a/resources/assets/js/snipeit.js +++ b/resources/assets/js/snipeit.js @@ -541,6 +541,8 @@ $(document).ready(function () { }); + + /** * Toggle disabled */ diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index bde2c8fadb..92cb874334 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -502,6 +502,84 @@ h4 { display: table-cell; } + +/** +* Ribbon stuff +* https://codepen.io/devinsays/pen/PwEbmR +**/ + +.product { + width: 100%; + min-width: 100%; +} + +.product-image { + position: relative; + min-height: 250px; + min-width: 4; +} + +.onsale-section { + position: absolute; + top: -6px; + right: 15px; +} + +.onsale-section:after { + position: absolute; + content: ''; + display: block; + width: 0; + height: 0; + border-left: 50px solid transparent; + border-right: 50px solid transparent; + //border-top: 6px solid #6ec5d5; +} + + +.onsale { + position: relative; + display: inline-block; + text-align: center; + color: #fff; + + font-size: 12px; + line-height: 1; + padding: 12px 8px 6px; + border-top-right-radius: 8px; + width: 100px; + text-transform: uppercase +} + +.onsale:before, +.onsale:after { + position: absolute; + content: ''; + display: block; +} + +.onsale:before { + height: 7px; + width: 6px; + left: -6px; + top: 0; +} + + +.onsale:after { + background: #96a0a2; + height: 7px; + width: 8px; + border-radius: 8px 8px 0 0; + left: -8px; + top: 0; +} + +.product img { + display: block; +} + + /** * This just adds a little extra padding on mobile **/ @@ -514,6 +592,14 @@ h4 { .firstnav { padding-top: 120px !important; } + + .product { + width: 400px; + } + + .product img { + min-width: 400px; + } } .card-view-title { @@ -527,10 +613,6 @@ h4 { flex-direction: column; } - - - - // --------------- /** diff --git a/resources/assets/less/variables.less b/resources/assets/less/variables.less index d3fd358add..30db20c5a4 100644 --- a/resources/assets/less/variables.less +++ b/resources/assets/less/variables.less @@ -128,3 +128,30 @@ // Transition global options @transition-speed: .3s; @transition-fn: ease-in-out; + +// Color varaity +.onsale-section.danger, .onsale.danger { + background-color: @red; +} +.onsale.warning { + background-color: @yellow; + } + .onsale-section.info, .onsale.info { + border-left-color: @aqua; + border-top: 6px solid @aqua; + } + .onsale-section.success, .onsale.success { + border-left-color: @green; + border-top: 6px solid @green; + } + .onsale-section.primary, .onsale.primary { + border-left-color: @light-blue; + border-top: 6px solid @light-blue; + } + + .onsale-section.danger:after, .onsale.danger { + background-color: @red; + //border-top: 6px solid @red; + } + +