Merge pull request #14 from tabler/dev

Dev

package.json

@@ -20,7 +20,6 @@
     "jekyll-watch": "jekyll build --watch",
     "jekyll-serve": "jekyll serve --livereload",
     "gh-pages": "./gh-pages.sh",
-
     "dist": "gulp build && JEKYLL_ENV=production jekyll build --destination dist",
     "publish-dist": "./gh-pages.sh",
     "watch": "gulp build && npm-run-all --parallel gulp-watch jekyll-watch",
@@ -37,7 +36,7 @@
   },
   "devDependencies": {
     "gulp": "^3.9.1",
-    "gulp-autoprefixer": "^4.0.0",
+    "gulp-autoprefixer": "^5.0.0",
     "gulp-rename": "^1.2.2",
     "gulp-sass": "^3.1.0",
     "npm-run-all": "^4.1.2"

src/_data/products.yml

@@ -1,53 +1,53 @@
 -
   name: Apple iPhone 7 Plus 256GB Red Special Edition
-  image: assets/images/products/apple-iphone7-special.jpg
+  image: demo/products/apple-iphone7-special.jpg
   producer: Apple
   price: $499
 
 -
   name: Apple MacBook Pro i7 3,1GHz/16/512/Radeon 560 Space Gray
-  image: assets/images/products/apple-macbook-pro.jpg
+  image: demo/products/apple-macbook-pro.jpg
   producer: Apple
   price: $1499
 
 -
   name: Apple iPhone 7 32GB Jet Black
-  image: assets/images/products/apple-iphone7.jpg
+  image: demo/products/apple-iphone7.jpg
   producer: Apple
   price: $499
 
 -
   name: GoPro HERO6 Black
-  image: assets/images/products/gopro-hero.jpg
+  image: demo/products/gopro-hero.jpg
   producer: GoPro
   price: $599
 
 -
   name: MSI GV62 i5-7300HQ/8GB/1TB/Win10X GTX1050
-  image: assets/images/products/msi.jpg
+  image: demo/products/msi.jpg
   producer: MSI
   price: $1599
 
 -
   name: Xiaomi Mi A1 64GB Black
-  image: assets/images/products/xiaomi-mi.jpg
+  image: demo/products/xiaomi-mi.jpg
   producer: Xiaomi
   price: $269
 
 -
   name: Huawei Mate 10 Pro Dual SIM Gray
-  image: assets/images/products/huawei-mate.jpg
+  image: demo/products/huawei-mate.jpg
   producer: Huawei
   price: $999
 
 -
   name: Sony KD-49XE7005
-  image: assets/images/products/sony-kd.jpg
+  image: demo/products/sony-kd.jpg
   producer: Sony
   price: $799
 
 -
   name: Samsung Galaxy A5 A520F 2017 LTE Black Sky
-  image: assets/images/products/samsung-galaxy.jpg
+  image: demo/products/samsung-galaxy.jpg
   producer: Samsung
   price: $399

src/_includes/parts/input-color.html

@@ -1,11 +1,13 @@
 <div class="form-group">
 	<label class="form-label">Color Input</label>
-	<div class="d-flex">
+	<div class="row gutters-xs">
 		{% for color in site.colors limit: 10 offset: 1 %}
-		<label class="colorinput mr-2">
-			<input name="color" type="checkbox" value="{{ color[0] }}" class="colorinput-input" {% if forloop.index == 2 %} checked{% endif %}/>
-			<span class="colorinput-color bg-{{ color[0] }}"></span>
-		</label>
+		<div class="col-auto">
+			<label class="colorinput">
+				<input name="color" type="checkbox" value="{{ color[0] }}" class="colorinput-input" {% if forloop.index== 2 %} checked{% endif %}/>
+				<span class="colorinput-color bg-{{ color[0] }}"></span>
+			</label>
+		</div>
 		{% endfor %}
 	</div>
 </div>

src/assets/scss/dashboard/_nav.scss

@@ -58,7 +58,7 @@
 		background: #fff;
 		border: 1px solid $border-color;
 		border-top: none;
-		z-index: 1;
+		z-index: 10;
 		box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
 		min-width: 10rem;
 		border-radius: 0 0 3px 3px;