From 6f252b47d3087bd421da3e15aeab66dcea9bb09d Mon Sep 17 00:00:00 2001 From: Humberto Alfonso Díaz Date: Sat, 21 Sep 2019 16:04:32 +0200 Subject: FUNCT First dummy release --- package.json | 6 +- src/config.xml | 6 +- src/icon.svg | 734 +++++++++++++++------------ src/images/HMI_HVAC_Active.svg | 35 -- src/images/HMI_HVAC_AirDown_Active.svg | 66 --- src/images/HMI_HVAC_AirDown_Inactive.svg | 69 --- src/images/HMI_HVAC_AirRight_Active.svg | 69 --- src/images/HMI_HVAC_AirRight_Inactive.svg | 72 --- src/images/HMI_HVAC_AirUp_Active.svg | 74 --- src/images/HMI_HVAC_AirUp_Inactive.svg | 75 --- src/images/HMI_HVAC_ChairIndicator_OFF.svg | 76 --- src/images/HMI_HVAC_ChairIndicator_One.svg | 31 -- src/images/HMI_HVAC_ChairIndicator_Two.svg | 30 -- src/images/HMI_HVAC_Circulation_Active.svg | 87 ---- src/images/HMI_HVAC_Circulation_Inactive.svg | 87 ---- src/images/HMI_HVAC_Fan_Icon.svg | 46 -- src/images/HMI_HVAC_Front_Active.svg | 75 --- src/images/HMI_HVAC_Front_Inactive.svg | 72 --- src/images/HMI_HVAC_Inactive.svg | 31 -- src/images/HMI_HVAC_Left_Chair_OFF.svg | 87 ---- src/images/HMI_HVAC_Left_Chair_ON.svg | 59 --- src/images/HMI_HVAC_Rear_Active.svg | 101 ---- src/images/HMI_HVAC_Rear_Inactive.svg | 91 ---- src/images/HMI_HVAC_Right_Chair_OFF.svg | 87 ---- src/images/HMI_HVAC_Right_Chair_ON.svg | 60 --- src/index.html | 131 +++-- src/index.js | 4 - src/styles/app.scss | 1 + src/styles/fonts/icomoon.eot | Bin 0 -> 1412 bytes src/styles/fonts/icomoon.svg | 12 + src/styles/fonts/icomoon.ttf | Bin 0 -> 1248 bytes src/styles/fonts/icomoon.woff | Bin 0 -> 1324 bytes src/styles/main.scss | 173 ++----- src/styles/style.css | 33 ++ webpack.config.js | 20 +- 35 files changed, 575 insertions(+), 2025 deletions(-) delete mode 100644 src/images/HMI_HVAC_Active.svg delete mode 100644 src/images/HMI_HVAC_AirDown_Active.svg delete mode 100644 src/images/HMI_HVAC_AirDown_Inactive.svg delete mode 100644 src/images/HMI_HVAC_AirRight_Active.svg delete mode 100644 src/images/HMI_HVAC_AirRight_Inactive.svg delete mode 100644 src/images/HMI_HVAC_AirUp_Active.svg delete mode 100644 src/images/HMI_HVAC_AirUp_Inactive.svg delete mode 100644 src/images/HMI_HVAC_ChairIndicator_OFF.svg delete mode 100644 src/images/HMI_HVAC_ChairIndicator_One.svg delete mode 100644 src/images/HMI_HVAC_ChairIndicator_Two.svg delete mode 100644 src/images/HMI_HVAC_Circulation_Active.svg delete mode 100644 src/images/HMI_HVAC_Circulation_Inactive.svg delete mode 100644 src/images/HMI_HVAC_Fan_Icon.svg delete mode 100644 src/images/HMI_HVAC_Front_Active.svg delete mode 100644 src/images/HMI_HVAC_Front_Inactive.svg delete mode 100644 src/images/HMI_HVAC_Inactive.svg delete mode 100644 src/images/HMI_HVAC_Left_Chair_OFF.svg delete mode 100644 src/images/HMI_HVAC_Left_Chair_ON.svg delete mode 100644 src/images/HMI_HVAC_Rear_Active.svg delete mode 100644 src/images/HMI_HVAC_Rear_Inactive.svg delete mode 100644 src/images/HMI_HVAC_Right_Chair_OFF.svg delete mode 100644 src/images/HMI_HVAC_Right_Chair_ON.svg create mode 100755 src/styles/fonts/icomoon.eot create mode 100755 src/styles/fonts/icomoon.svg create mode 100755 src/styles/fonts/icomoon.ttf create mode 100755 src/styles/fonts/icomoon.woff create mode 100755 src/styles/style.css diff --git a/package.json b/package.json index e761cbc..fabae34 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "agl-hvac", + "name": "agl-mixer", "version": "0.0.0", "description": "HVAC project for AGL based on html5 technologies", "scripts": { @@ -7,11 +7,11 @@ "build": "webpack", "start": "webpack-dev-server" }, - "homepage": "https://bitbucket.org/smarsol/hvac", + "homepage": "https://bitbucket.org/smarsol/mixer", "author": "humberto.alfonso@asvito.es", "repository": { "type": "git", - "url": "git@bitbucket.org:smarsol/hvac.git" + "url": "git@bitbucket.org:smarsol/mixer.git" }, "keywords": [ "agl", diff --git a/src/config.xml b/src/config.xml index 2923172..9a21f67 100644 --- a/src/config.xml +++ b/src/config.xml @@ -1,9 +1,9 @@ - - HVAC + + MIXER - HTML5 HVAC demo + HTML5 MIXER demo Igalia, S.L. APL 2.0 diff --git a/src/icon.svg b/src/icon.svg index 67918e6..85f7384 100644 --- a/src/icon.svg +++ b/src/icon.svg @@ -1,28 +1,218 @@ - + image/svg+xml \ No newline at end of file + id="style4"> + .st0{display:none;} + .st1{display:inline;} + .st2{opacity:0.4;fill:url(#SVGID_1_);} + .st3{fill:url(#SVGID_2_);} + .st4{fill:#FFFFFF;} + .st5{font-family:'Roboto-Regular';} + .st6{font-size:25px;} + .st7{letter-spacing:6;} + .st8{fill:url(#SVGID_3_);} + .st9{fill:url(#SVGID_4_);} + .st10{fill:url(#SVGID_5_);} + .st11{fill:url(#SVGID_6_);} + .st12{fill:url(#SVGID_7_);} + .st13{fill:url(#SVGID_8_);} + .st14{fill:url(#SVGID_9_);} + .st15{fill:url(#SVGID_10_);} + .st16{fill:url(#SVGID_11_);} + .st17{fill:url(#SVGID_12_);} + .st18{fill:url(#SVGID_13_);} + .st19{fill:url(#SVGID_14_);} + .st20{fill:url(#SVGID_15_);} + .st21{fill:url(#SVGID_16_);} + .st22{fill:url(#SVGID_17_);} + .st23{fill:url(#SVGID_18_);} + .st24{opacity:0.29;} + .st25{fill:url(#SVGID_19_);} + .st26{fill:url(#SVGID_20_);} + .st27{fill:url(#SVGID_21_);} + .st28{fill:url(#SVGID_22_);} + .st29{fill:url(#SVGID_23_);} + .st30{fill:url(#SVGID_24_);} + .st31{fill:url(#SVGID_25_);} + .st32{fill:url(#SVGID_26_);} + .st33{fill:url(#SVGID_27_);} + .st34{fill:url(#SVGID_28_);} + .st35{fill:url(#SVGID_29_);} + .st36{fill:url(#SVGID_30_);} + .st37{fill:url(#SVGID_31_);} + .st38{fill:url(#SVGID_32_);} + .st39{fill:url(#SVGID_33_);} + .st40{fill:url(#SVGID_34_);} + .st41{fill:url(#SVGID_35_);} + .st42{fill:url(#SVGID_36_);} + .st43{opacity:0.4;fill:url(#SVGID_37_);} + .st44{fill:url(#SVGID_38_);} + .st45{fill:url(#SVGID_39_);} + .st46{fill:url(#SVGID_40_);} + .st47{fill:url(#SVGID_41_);} + .st48{fill:url(#SVGID_42_);} + .st49{fill:url(#SVGID_43_);} + .st50{fill:url(#SVGID_44_);} + .st51{display:inline;opacity:0.29;} + .st52{display:inline;fill:url(#SVGID_45_);} + .st53{display:inline;fill:url(#SVGID_46_);} + .st54{display:inline;fill:#FFFFFF;} + .st55{display:inline;fill:url(#SVGID_47_);} + .st56{display:inline;fill:url(#SVGID_48_);} + .st57{display:inline;fill:url(#SVGID_49_);} + .st58{display:inline;fill:url(#SVGID_50_);} + .st59{display:inline;fill:url(#SVGID_51_);} + .st60{display:inline;fill:url(#SVGID_52_);} + .st61{opacity:0.4;fill:url(#SVGID_53_);} + .st62{fill:url(#SVGID_54_);} + .st63{fill:url(#SVGID_55_);} + .st64{fill:url(#SVGID_56_);} + .st65{fill:url(#SVGID_57_);} + .st66{fill:url(#SVGID_58_);} + .st67{opacity:0.4;fill:url(#SVGID_59_);} + .st68{fill:url(#SVGID_60_);} + .st69{fill:url(#SVGID_61_);} + .st70{fill:url(#SVGID_62_);} + .st71{fill:url(#SVGID_63_);} + .st72{fill:url(#SVGID_64_);} + .st73{fill:url(#SVGID_65_);} + .st74{fill:url(#SVGID_66_);} + .st75{fill:url(#SVGID_67_);} + .st76{fill:url(#SVGID_68_);} + .st77{fill:url(#SVGID_69_);} + .st78{fill:url(#SVGID_70_);} + .st79{fill:url(#SVGID_71_);} + .st80{fill:url(#SVGID_72_);} + .st81{fill:url(#SVGID_73_);} + .st82{fill:url(#SVGID_74_);} + .st83{fill:url(#SVGID_75_);} + .st84{fill:url(#SVGID_76_);} + .st85{fill:url(#SVGID_77_);} + .st86{fill:url(#SVGID_78_);} + .st87{fill:url(#SVGID_79_);} + .st88{fill:url(#SVGID_80_);} + .st89{fill:url(#SVGID_81_);} + .st90{fill:url(#SVGID_82_);} + .st91{fill:url(#SVGID_83_);} + .st92{fill:url(#SVGID_84_);} + .st93{fill:url(#SVGID_85_);} + .st94{fill:url(#SVGID_86_);} + .st95{opacity:0.4;fill:url(#SVGID_87_);} + .st96{fill:url(#SVGID_88_);} + .st97{fill:url(#SVGID_89_);} + .st98{fill:url(#SVGID_90_);} + .st99{fill:url(#SVGID_91_);} + .st100{fill:url(#SVGID_92_);} + .st101{fill:url(#SVGID_93_);} + .st102{fill:url(#SVGID_94_);} + .st103{opacity:0.4;fill:url(#SVGID_95_);} + .st104{fill:url(#SVGID_96_);} + .st105{fill:url(#SVGID_97_);} + .st106{fill:url(#SVGID_98_);} + .st107{fill:url(#SVGID_99_);} + .st108{fill:url(#SVGID_100_);} + .st109{fill:url(#SVGID_101_);} + .st110{display:inline;fill:url(#SVGID_102_);} + .st111{display:inline;fill:url(#SVGID_103_);} + .st112{fill:url(#SVGID_104_);} + .st113{fill:url(#SVGID_105_);} + .st114{fill:url(#SVGID_106_);} + .st115{fill:url(#SVGID_107_);} + .st116{fill:url(#SVGID_108_);} + .st117{opacity:0.4;fill:url(#SVGID_109_);} + .st118{fill:url(#SVGID_110_);} + .st119{fill:url(#SVGID_111_);} + .st120{fill:url(#SVGID_112_);} + .st121{fill:url(#SVGID_113_);} + .st122{fill:url(#SVGID_114_);} + .st123{opacity:0.4;fill:url(#SVGID_115_);} + .st124{fill:url(#SVGID_116_);} + .st125{fill:url(#SVGID_117_);} + .st126{fill:url(#SVGID_118_);} + .st127{display:inline;fill:url(#SVGID_119_);} + .st128{display:inline;fill:url(#SVGID_120_);} + .st129{fill:url(#SVGID_121_);} + .st130{fill:url(#SVGID_122_);} +MMIXERA + \ No newline at end of file diff --git a/src/images/HMI_HVAC_Active.svg b/src/images/HMI_HVAC_Active.svg deleted file mode 100644 index 71e6aa0..0000000 --- a/src/images/HMI_HVAC_Active.svg +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - diff --git a/src/images/HMI_HVAC_AirDown_Active.svg b/src/images/HMI_HVAC_AirDown_Active.svg deleted file mode 100644 index 85dd533..0000000 --- a/src/images/HMI_HVAC_AirDown_Active.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/images/HMI_HVAC_AirDown_Inactive.svg b/src/images/HMI_HVAC_AirDown_Inactive.svg deleted file mode 100644 index a013f4b..0000000 --- a/src/images/HMI_HVAC_AirDown_Inactive.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/src/images/HMI_HVAC_AirRight_Active.svg b/src/images/HMI_HVAC_AirRight_Active.svg deleted file mode 100644 index cfb9452..0000000 --- a/src/images/HMI_HVAC_AirRight_Active.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/images/HMI_HVAC_AirRight_Inactive.svg b/src/images/HMI_HVAC_AirRight_Inactive.svg deleted file mode 100644 index 991a773..0000000 --- a/src/images/HMI_HVAC_AirRight_Inactive.svg +++ /dev/null @@ -1,72 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/src/images/HMI_HVAC_AirUp_Active.svg b/src/images/HMI_HVAC_AirUp_Active.svg deleted file mode 100644 index f168a39..0000000 --- a/src/images/HMI_HVAC_AirUp_Active.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/images/HMI_HVAC_AirUp_Inactive.svg b/src/images/HMI_HVAC_AirUp_Inactive.svg deleted file mode 100644 index 39e1fa1..0000000 --- a/src/images/HMI_HVAC_AirUp_Inactive.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/src/images/HMI_HVAC_ChairIndicator_OFF.svg b/src/images/HMI_HVAC_ChairIndicator_OFF.svg deleted file mode 100644 index 1fcd17f..0000000 --- a/src/images/HMI_HVAC_ChairIndicator_OFF.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/src/images/HMI_HVAC_ChairIndicator_One.svg b/src/images/HMI_HVAC_ChairIndicator_One.svg deleted file mode 100644 index d560c84..0000000 --- a/src/images/HMI_HVAC_ChairIndicator_One.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - diff --git a/src/images/HMI_HVAC_ChairIndicator_Two.svg b/src/images/HMI_HVAC_ChairIndicator_Two.svg deleted file mode 100644 index b31cc90..0000000 --- a/src/images/HMI_HVAC_ChairIndicator_Two.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - diff --git a/src/images/HMI_HVAC_Circulation_Active.svg b/src/images/HMI_HVAC_Circulation_Active.svg deleted file mode 100644 index def92bb..0000000 --- a/src/images/HMI_HVAC_Circulation_Active.svg +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/images/HMI_HVAC_Circulation_Inactive.svg b/src/images/HMI_HVAC_Circulation_Inactive.svg deleted file mode 100644 index 9c7d43f..0000000 --- a/src/images/HMI_HVAC_Circulation_Inactive.svg +++ /dev/null @@ -1,87 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/src/images/HMI_HVAC_Fan_Icon.svg b/src/images/HMI_HVAC_Fan_Icon.svg deleted file mode 100644 index ee583a0..0000000 --- a/src/images/HMI_HVAC_Fan_Icon.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - diff --git a/src/images/HMI_HVAC_Front_Active.svg b/src/images/HMI_HVAC_Front_Active.svg deleted file mode 100644 index 146e509..0000000 --- a/src/images/HMI_HVAC_Front_Active.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - -]> - - - - - - - FRONT - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/images/HMI_HVAC_Front_Inactive.svg b/src/images/HMI_HVAC_Front_Inactive.svg deleted file mode 100644 index c5d9166..0000000 --- a/src/images/HMI_HVAC_Front_Inactive.svg +++ /dev/null @@ -1,72 +0,0 @@ - - - -image/svg+xmlFRONT - \ No newline at end of file diff --git a/src/images/HMI_HVAC_Inactive.svg b/src/images/HMI_HVAC_Inactive.svg deleted file mode 100644 index 2956a26..0000000 --- a/src/images/HMI_HVAC_Inactive.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - diff --git a/src/images/HMI_HVAC_Left_Chair_OFF.svg b/src/images/HMI_HVAC_Left_Chair_OFF.svg deleted file mode 100644 index 1412266..0000000 --- a/src/images/HMI_HVAC_Left_Chair_OFF.svg +++ /dev/null @@ -1,87 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/src/images/HMI_HVAC_Left_Chair_ON.svg b/src/images/HMI_HVAC_Left_Chair_ON.svg deleted file mode 100644 index b27b126..0000000 --- a/src/images/HMI_HVAC_Left_Chair_ON.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/images/HMI_HVAC_Rear_Active.svg b/src/images/HMI_HVAC_Rear_Active.svg deleted file mode 100644 index 182ccbd..0000000 --- a/src/images/HMI_HVAC_Rear_Active.svg +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - -]> - - - - - - REAR - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/images/HMI_HVAC_Rear_Inactive.svg b/src/images/HMI_HVAC_Rear_Inactive.svg deleted file mode 100644 index 574c541..0000000 --- a/src/images/HMI_HVAC_Rear_Inactive.svg +++ /dev/null @@ -1,91 +0,0 @@ - - - -image/svg+xmlREAR - \ No newline at end of file diff --git a/src/images/HMI_HVAC_Right_Chair_OFF.svg b/src/images/HMI_HVAC_Right_Chair_OFF.svg deleted file mode 100644 index 711a942..0000000 --- a/src/images/HMI_HVAC_Right_Chair_OFF.svg +++ /dev/null @@ -1,87 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/src/images/HMI_HVAC_Right_Chair_ON.svg b/src/images/HMI_HVAC_Right_Chair_ON.svg deleted file mode 100644 index 74b4861..0000000 --- a/src/images/HMI_HVAC_Right_Chair_ON.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/index.html b/src/index.html index 4a1fdfd..7d124cb 100644 --- a/src/index.html +++ b/src/index.html @@ -21,84 +21,83 @@ -
-
- -
-
-
- - +
+
+
+ Volume 1: 50% +
+ + + +
+ +
+ + + +
+
- FAN SPEED + Volume 1: 50%
+ + + +
+ + +
+ + +
-
-
- - - - - - - - - - +
- A/C + Volume 1: 50% +
+
+ + +
+ +
- - - - - - - - -
-
+ + +
-
- - - -
- AUTO -
+
+
+ Volume 1: 50% +
+
+ - - - +
+ + +
+
+
-
-
+
+
+ Volume 1: 50% +
+ + + +
+ + +
+ + +
-
diff --git a/src/index.js b/src/index.js index 67f800a..142b8d1 100644 --- a/src/index.js +++ b/src/index.js @@ -19,7 +19,3 @@ import './js/AFB.js'; /* CSS */ import './styles/app.scss'; - -document.addEventListener('DOMContentLoaded', function(){ - TEMPERATURE.init(); -}); \ No newline at end of file diff --git a/src/styles/app.scss b/src/styles/app.scss index c2a4c72..a67dbfe 100644 --- a/src/styles/app.scss +++ b/src/styles/app.scss @@ -4,6 +4,7 @@ $colors: ( grey: #848286 ); +@import "style.css"; @import "main.scss"; @import "portrait.scss"; @import "landscape.scss"; \ No newline at end of file diff --git a/src/styles/fonts/icomoon.eot b/src/styles/fonts/icomoon.eot new file mode 100755 index 0000000..1de3233 Binary files /dev/null and b/src/styles/fonts/icomoon.eot differ diff --git a/src/styles/fonts/icomoon.svg b/src/styles/fonts/icomoon.svg new file mode 100755 index 0000000..c58b9e7 --- /dev/null +++ b/src/styles/fonts/icomoon.svg @@ -0,0 +1,12 @@ + + + +Generated by IcoMoon + + + + + + + + \ No newline at end of file diff --git a/src/styles/fonts/icomoon.ttf b/src/styles/fonts/icomoon.ttf new file mode 100755 index 0000000..520b0ff Binary files /dev/null and b/src/styles/fonts/icomoon.ttf differ diff --git a/src/styles/fonts/icomoon.woff b/src/styles/fonts/icomoon.woff new file mode 100755 index 0000000..d1c4591 Binary files /dev/null and b/src/styles/fonts/icomoon.woff differ diff --git a/src/styles/main.scss b/src/styles/main.scss index 6c3ed5a..07fc408 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -22,9 +22,9 @@ input[type=range]::-webkit-slider-runnable-track { } input[type=range]::-webkit-slider-thumb { - height: 32px; - width: 32px; - border-radius: 16px; + height: 64px; + width: 64px; + border-radius: 32px; background: #FFFFFF; cursor: pointer; -webkit-appearance: none; @@ -34,11 +34,11 @@ input[type=range]::-webkit-slider-thumb { progress { -webkit-appearance: none; - height: 8.4px; + height: 16px; width: 100%; - margin-top: -22px; - position: absolute; + margin-top: -12px; z-index: -1000; + display: block; } ::-webkit-progress-bar { @@ -56,10 +56,11 @@ html { } body { - font-size: 1.2rem; + font-size: 2rem; font-family: Arial; color: map-get($colors, font); - margin: 5%; + margin: 0 5%; + height: 100%; a { color: map-get($colors, font); @@ -86,148 +87,38 @@ body { } } - .top { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: space-between; - align-items: center; - margin-top: 10%; - margin-bottom: 15%; - - .icon { - flex-basis: 10%; - } - - .fanSpeed { - flex-basis: 85%; - height: 100%; - - .fanSpeedContainer { - position: relative; - width: 100%; - height: 100%; - } - } - } - - .center { + .content { display: flex; - flex-direction: row; + flex-direction: column; flex-wrap: wrap; - justify-content: flex-start; - align-items: flex-start; + justify-content: space-around; height: 100%; - .item { - &:before { - content:''; - float:left; - padding-top:75%; - } - - &.ac, &.auto { - .label { - font-weight: bold; - font-size: 2.5rem; - text-align: center; - margin-top: -50%; - } - } - - &.seat { - img { - width: 50%; - margin: 0 25%; - } - - &[value="0"] { - .one, .two { - display: none; - } - .off { - display: block; - } - } - - &[value="1"] { - .off, .two { - display: none; - } - .one { - display: block; - } - } - - &[value="2"] { - .one, .off { - display: none; - } - .two { - display: block; - } - } + .entry { + height: 100px; + .label { + margin: 10px 0; } - &.circulation { - - } - - &.block { - &:before { - padding-top:150%; - } - - .item { - height: 50%; - position: relative; - float: left; - width: 100%; - } - } - - &.temperatures { - .temperatures-container { - width: 100%; - height: 240px; - overflow-y: scroll; - - .temperature { - &[enabled='true'] { - color: map-get($colors, primary); - } - &[enabled='false'] { - color: map-get($colors, grey); - } - font-size: 5rem; - font-weight: bold; - text-align: center; - width: 100%; - } - } + .button { + width: 10%; + position: relative; + float: left; + text-align: center; + height: 80px; + line-height: 80px; + background-color: map-get($colors, primary); + color: #FFFFFF; + border-radius: 20px; + text-decoration: none; } - text-decoration: none; - flex-basis: 33%; - } - } - - .bottom { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: flex-start; - align-items: flex-start; - height: 100%; - margin-top: 10%; - - .button { - flex-basis: 20%; - - img { - width: 80%; - margin: 0 10%; + .slider { + width: 78%; + position: relative; + float: left; + margin: 0 1%; } } } diff --git a/src/styles/style.css b/src/styles/style.css new file mode 100755 index 0000000..e86165c --- /dev/null +++ b/src/styles/style.css @@ -0,0 +1,33 @@ +@font-face { + font-family: 'icomoon'; + src: url('fonts/icomoon.eot?41hzv3'); + src: url('fonts/icomoon.eot?41hzv3#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?41hzv3') format('truetype'), + url('fonts/icomoon.woff?41hzv3') format('woff'), + url('fonts/icomoon.svg?41hzv3#icomoon') format('svg'); + font-weight: normal; + font-style: normal; + font-display: block; +} + +[class^="icon-"], [class*=" icon-"] { + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: 'icomoon' !important; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-volume-increase:before { + content: "\ea2b"; +} +.icon-volume-decrease:before { + content: "\ea2c"; +} diff --git a/webpack.config.js b/webpack.config.js index 072f70a..ac50a74 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -10,11 +10,7 @@ const ZipPlugin = require('zip-webpack-plugin'); module.exports = { mode: 'production', entry: { - index: './src/index.js', - FANSPEED: './src/js/fan_speed.js', - CHAIR: './src/js/chair.js', - BUTTON: './src/js/buttons.js', - TEMPERATURE: './src/js/temperature.js' + index: './src/index.js' }, output: { path: __dirname + '/dist', @@ -59,7 +55,7 @@ module.exports = { }), new ZipPlugin({ path: __dirname + '/dist', - filename: 'hvac', + filename: 'mixer', extension: 'wgt', exclude: [] }) @@ -81,6 +77,18 @@ module.exports = { "sass-loader" ] }, + { + test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, + use: [ + { + loader: 'file-loader', + options: { + name: '[name].[ext]', + outputPath: 'fonts/' + } + } + ] + }, { test: /\.(gif|png|jpe?g|svg)$/i, use: [ -- cgit 1.2.3-korg