From 8a4f0c6506bc1fc4dad99bbcf964bb368f276ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Gomes?= Date: Tue, 24 Feb 2015 14:38:56 +0000 Subject: [PATCH] Moving image and font files to final directory structure. Again. - Split images into src/images/ and src/demo-images/ - Moved fonts to own directory: src/fonts/ - Updating scss files with new locations - Updating compiled JS and CSS --- src/checkbox/_checkbox.scss | 6 +++--- src/{layout/images => demo-images}/app-icon.png | Bin src/{list/images => demo-images}/avatar.png | Bin .../desktop-handsfree-hero.jpg | Bin src/{typography/images => demo-images}/img-1.png | Bin src/{typography/images => demo-images}/img-2.png | Bin src/{icons => }/fonts/LICENSE.txt | 0 .../fonts/Material-Design-Iconic-Font.eot | Bin .../fonts/Material-Design-Iconic-Font.ttf | Bin .../fonts/Material-Design-Iconic-Font.woff | Bin src/icons/_icons.scss | 4 ++-- src/{checkbox => }/images/tick-mask.svg | 0 src/{checkbox => }/images/tick.svg | 0 src/layout/demo.html | 14 +++++++------- src/layout/demo.scss | 2 +- src/list/_list.scss | 3 +-- src/list/demo.scss | 5 +++++ src/typography/demo.scss | 4 ++-- 18 files changed, 21 insertions(+), 17 deletions(-) rename src/{layout/images => demo-images}/app-icon.png (100%) rename src/{list/images => demo-images}/avatar.png (100%) rename src/{layout/images => demo-images}/desktop-handsfree-hero.jpg (100%) rename src/{typography/images => demo-images}/img-1.png (100%) rename src/{typography/images => demo-images}/img-2.png (100%) rename src/{icons => }/fonts/LICENSE.txt (100%) rename src/{icons => }/fonts/Material-Design-Iconic-Font.eot (100%) rename src/{icons => }/fonts/Material-Design-Iconic-Font.ttf (100%) rename src/{icons => }/fonts/Material-Design-Iconic-Font.woff (100%) rename src/{checkbox => }/images/tick-mask.svg (100%) rename src/{checkbox => }/images/tick.svg (100%) diff --git a/src/checkbox/_checkbox.scss b/src/checkbox/_checkbox.scss index cd117afa..ac981c93 100644 --- a/src/checkbox/_checkbox.scss +++ b/src/checkbox/_checkbox.scss @@ -110,18 +110,18 @@ $checkbox-ripple-size: $checkbox-label-height * 1.5; left: 0; height: 100%; width: 100%; - mask: url("images/tick-mask.svg#mask"); + mask: url("../images/tick-mask.svg#mask"); background: transparent; @include material-animation-default(0.28s); transition-property: background; .wsk-checkbox.is-checked & { - background: $checkbox-color url("images/tick.svg"); + background: $checkbox-color url("../images/tick.svg"); } .wsk-checkbox.is-checked.is-disabled & { - background: $checkbox-disabled-color url("images/tick.svg"); + background: $checkbox-disabled-color url("../images/tick.svg"); } } diff --git a/src/layout/images/app-icon.png b/src/demo-images/app-icon.png similarity index 100% rename from src/layout/images/app-icon.png rename to src/demo-images/app-icon.png diff --git a/src/list/images/avatar.png b/src/demo-images/avatar.png similarity index 100% rename from src/list/images/avatar.png rename to src/demo-images/avatar.png diff --git a/src/layout/images/desktop-handsfree-hero.jpg b/src/demo-images/desktop-handsfree-hero.jpg similarity index 100% rename from src/layout/images/desktop-handsfree-hero.jpg rename to src/demo-images/desktop-handsfree-hero.jpg diff --git a/src/typography/images/img-1.png b/src/demo-images/img-1.png similarity index 100% rename from src/typography/images/img-1.png rename to src/demo-images/img-1.png diff --git a/src/typography/images/img-2.png b/src/demo-images/img-2.png similarity index 100% rename from src/typography/images/img-2.png rename to src/demo-images/img-2.png diff --git a/src/icons/fonts/LICENSE.txt b/src/fonts/LICENSE.txt similarity index 100% rename from src/icons/fonts/LICENSE.txt rename to src/fonts/LICENSE.txt diff --git a/src/icons/fonts/Material-Design-Iconic-Font.eot b/src/fonts/Material-Design-Iconic-Font.eot similarity index 100% rename from src/icons/fonts/Material-Design-Iconic-Font.eot rename to src/fonts/Material-Design-Iconic-Font.eot diff --git a/src/icons/fonts/Material-Design-Iconic-Font.ttf b/src/fonts/Material-Design-Iconic-Font.ttf similarity index 100% rename from src/icons/fonts/Material-Design-Iconic-Font.ttf rename to src/fonts/Material-Design-Iconic-Font.ttf diff --git a/src/icons/fonts/Material-Design-Iconic-Font.woff b/src/fonts/Material-Design-Iconic-Font.woff similarity index 100% rename from src/icons/fonts/Material-Design-Iconic-Font.woff rename to src/fonts/Material-Design-Iconic-Font.woff diff --git a/src/icons/_icons.scss b/src/icons/_icons.scss index 0b768c35..5820012c 100644 --- a/src/icons/_icons.scss +++ b/src/icons/_icons.scss @@ -1,7 +1,7 @@ @font-face { font-family: 'Material-Design-Iconic-Font'; - src: url('fonts/Material-Design-Iconic-Font.eot?v=1.1.1'); - src: url('fonts/Material-Design-Iconic-Font.eot?#iefix&v=1.1.1') format('embedded-opentype'), url('fonts/Material-Design-Iconic-Font.woff?v=1.1.1') format('woff'), url('fonts/Material-Design-Iconic-Font.ttf?v=1.1.1') format('truetype'); + src: url('../fonts/Material-Design-Iconic-Font.eot?v=1.1.1'); + src: url('../fonts/Material-Design-Iconic-Font.eot?#iefix&v=1.1.1') format('embedded-opentype'), url('../fonts/Material-Design-Iconic-Font.woff?v=1.1.1') format('woff'), url('../fonts/Material-Design-Iconic-Font.ttf?v=1.1.1') format('truetype'); font-weight: normal; font-style: normal; } diff --git a/src/checkbox/images/tick-mask.svg b/src/images/tick-mask.svg similarity index 100% rename from src/checkbox/images/tick-mask.svg rename to src/images/tick-mask.svg diff --git a/src/checkbox/images/tick.svg b/src/images/tick.svg similarity index 100% rename from src/checkbox/images/tick.svg rename to src/images/tick.svg diff --git a/src/layout/demo.html b/src/layout/demo.html index 8243371a..4bb3ce48 100644 --- a/src/layout/demo.html +++ b/src/layout/demo.html @@ -20,7 +20,7 @@
- + Web Starter Kit @@ -58,7 +58,7 @@
- + Web Starter Kit @@ -153,7 +153,7 @@
- + Web Starter Kit @@ -229,7 +229,7 @@
- + Web Starter Kit
@@ -285,7 +285,7 @@
- + Web Starter Kit @@ -321,7 +321,7 @@
- + Web Starter Kit
@@ -366,7 +366,7 @@
- + Web Starter Kit
diff --git a/src/layout/demo.scss b/src/layout/demo.scss index d54c8870..1c7209d9 100644 --- a/src/layout/demo.scss +++ b/src/layout/demo.scss @@ -82,7 +82,7 @@ // Styles for transparent header demo. .demo-page--layout #transparent_demo { background-color: #948d85; - background-image: url('images/desktop-handsfree-hero.jpg'); + background-image: url('../demo-images/desktop-handsfree-hero.jpg'); background-repeat: no-repeat; background-attachment: scroll; diff --git a/src/list/_list.scss b/src/list/_list.scss index a941b6e6..298fb255 100644 --- a/src/list/_list.scss +++ b/src/list/_list.scss @@ -39,8 +39,7 @@ $list-container-item-height: 70px; } .wsk-list-view--avatar { - background : url("images/avatar.png"); - background-size: 100%; + background: $list-container-item-border-color; border-radius : 50%; content : ''; display : inline-block; diff --git a/src/list/demo.scss b/src/list/demo.scss index c01bf69a..72072f96 100644 --- a/src/list/demo.scss +++ b/src/list/demo.scss @@ -1,2 +1,7 @@ @import "../styleguide_demo_bp"; @import "_list"; + +.demo-page--list .wsk-list-view--avatar { + background: url("../demo-images/avatar.png"); + background-size: 100%; +} diff --git a/src/typography/demo.scss b/src/typography/demo.scss index 3974541f..faa64ccb 100644 --- a/src/typography/demo.scss +++ b/src/typography/demo.scss @@ -37,11 +37,11 @@ } .demo-typography--img-1 { - background-image: url(images/img-1.png); + background-image: url(../demo-images/img-1.png); color: white; } .demo-typography--img-2 { - background-image: url(images/img-2.png); + background-image: url(../demo-images/img-2.png); color: white; }