Mirrors/tabler
1
0
Fork 0
mirror of https://github.com/tabler/tabler.git synced 2025-12-21 17:34:25 +04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14 from tabler/dev

Browse Source 
Dev
This commit is contained in:
Paweł Kuna
2018-03-26 21:18:49 +02:00
committed by GitHub
parent da5069ed68 ae6a14836e
commit f194e72790
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

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

18
src/_data/products.yml
View File

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

12
src/_includes/parts/input-color.html
View File

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

2
src/assets/scss/dashboard/_nav.scss
View File

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