diff --git a/forge.config.js b/forge.config.js index 223287f53..08d54cc34 100644 --- a/forge.config.js +++ b/forge.config.js @@ -1,5 +1,6 @@ const path = require('path'); const fs = require('fs'); +const sass = require('sass-embedded'); module.exports = { packagerConfig: { @@ -20,6 +21,12 @@ module.exports = { ] }, hooks: { + generateAssets: () => { + const result = sass.compile('./src/sass/app.scss', {style: "compressed"}); + fs.mkdirSync('./dist', { recursive: true }); + fs.writeFileSync('./dist/output.css', result.css); + console.log('generateAssets hook'); + }, // Uniform artifact file names postMake: async (config, makeResults) => { makeResults.forEach(result => { diff --git a/images/CF_settings_white.png b/images/CF_settings_white.png deleted file mode 100644 index 77b560d1a..000000000 Binary files a/images/CF_settings_white.png and /dev/null differ diff --git a/images/cf_logo_black.svg b/images/cf_logo_black.svg new file mode 100644 index 000000000..40c817225 --- /dev/null +++ b/images/cf_logo_black.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/cf_logo_white.svg b/images/cf_logo_white.svg index 5fdadf7d7..e04c7b2fa 100644 --- a/images/cf_logo_white.svg +++ b/images/cf_logo_white.svg @@ -1,58 +1,34 @@ - - - + - - - - - + + + + + - - + + - - + + - - + + - - - + + + - - - + + + - + diff --git a/images/flightindicators/altitude_pressure.svg b/images/flightindicators/altitude_pressure.svg deleted file mode 100644 index 5c1b195d1..000000000 --- a/images/flightindicators/altitude_pressure.svg +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - 990 - 985 - 980 - 995 - 1000 - 1005 - 1010 - 1015 - 1020 - 1025 - 1030 - - 1035 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/flightindicators/altitude_ticks.svg b/images/flightindicators/altitude_ticks.svg deleted file mode 100644 index a2ccffb99..000000000 --- a/images/flightindicators/altitude_ticks.svg +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -0 -ALT -1 -2 -3 -4 -5 -6 -7 -8 -9 - - - - - - - - - - - -FEET -100 -1000 FEET -CALIBRATEDTO25 000 FEET - diff --git a/images/flightindicators/fi_box.svg b/images/flightindicators/fi_box.svg deleted file mode 100644 index e7187b7d6..000000000 --- a/images/flightindicators/fi_box.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/images/flightindicators/fi_circle.svg b/images/flightindicators/fi_circle.svg deleted file mode 100644 index 1a5692111..000000000 --- a/images/flightindicators/fi_circle.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/images/flightindicators/fi_needle.svg b/images/flightindicators/fi_needle.svg deleted file mode 100644 index e94e94e0c..000000000 --- a/images/flightindicators/fi_needle.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/images/flightindicators/fi_needle_small.svg b/images/flightindicators/fi_needle_small.svg deleted file mode 100644 index 983087b11..000000000 --- a/images/flightindicators/fi_needle_small.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/images/flightindicators/fi_tc_airplane.svg b/images/flightindicators/fi_tc_airplane.svg deleted file mode 100644 index e9904889d..000000000 --- a/images/flightindicators/fi_tc_airplane.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/images/flightindicators/heading_mechanics.svg b/images/flightindicators/heading_mechanics.svg deleted file mode 100644 index 8020d3091..000000000 --- a/images/flightindicators/heading_mechanics.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/flightindicators/heading_yaw.svg b/images/flightindicators/heading_yaw.svg deleted file mode 100644 index 1d0f4e2be..000000000 --- a/images/flightindicators/heading_yaw.svg +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/flightindicators/horizon_back.svg b/images/flightindicators/horizon_back.svg deleted file mode 100644 index e7e2d0a0a..000000000 --- a/images/flightindicators/horizon_back.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/images/flightindicators/horizon_ball.svg b/images/flightindicators/horizon_ball.svg deleted file mode 100644 index d25a50b0a..000000000 --- a/images/flightindicators/horizon_ball.svg +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/flightindicators/horizon_circle.svg b/images/flightindicators/horizon_circle.svg deleted file mode 100644 index 8598d37a7..000000000 --- a/images/flightindicators/horizon_circle.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/flightindicators/horizon_mechanics.svg b/images/flightindicators/horizon_mechanics.svg deleted file mode 100644 index d1f6c008e..000000000 --- a/images/flightindicators/horizon_mechanics.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/flightindicators/speed_mechanics.svg b/images/flightindicators/speed_mechanics.svg deleted file mode 100644 index 47d31f6ca..000000000 --- a/images/flightindicators/speed_mechanics.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -20 -40 -60 -80 -100 -120 -140 -160 -KNOTS -AIR SPEED -0 - diff --git a/images/flightindicators/turn_coordinator.svg b/images/flightindicators/turn_coordinator.svg deleted file mode 100644 index a1525b22a..000000000 --- a/images/flightindicators/turn_coordinator.svg +++ /dev/null @@ -1,382 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NO PITCHINFORMATION - D.C.ELEC. - TURN COORDINATOR - - - - - 2 MIN. - R - L - - - - - - - - - - diff --git a/images/flightindicators/vertical_mechanics.svg b/images/flightindicators/vertical_mechanics.svg deleted file mode 100644 index 71bb9398f..000000000 --- a/images/flightindicators/vertical_mechanics.svg +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -0 - - - - -UP -DOWN -1 -1 -.5 -.5 -1.5 -1.5 -2 -VERTICAL SPEED -1000FT PER MIN - diff --git a/images/icons/cf_failsafe_procedure1.svg b/images/icons/cf_failsafe_procedure1.svg index 55fc0520b..f39bb568e 100644 --- a/images/icons/cf_failsafe_procedure1.svg +++ b/images/icons/cf_failsafe_procedure1.svg @@ -5,15 +5,16 @@ - + @@ -30,7 +31,7 @@ z"/> - + - + - diff --git a/images/icons/cf_failsafe_procedure3.svg b/images/icons/cf_failsafe_procedure3.svg index 47324fde5..5d3b4f7cc 100644 --- a/images/icons/cf_failsafe_procedure3.svg +++ b/images/icons/cf_failsafe_procedure3.svg @@ -7,12 +7,13 @@ .st1{enable-background:new ;} .st2{fill:#37A8DB;} .st3{fill:none;stroke:#37A8DB;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;} - .st4{fill:none;stroke:#1B171B;stroke-miterlimit:10;} + .st4{fill:none;stroke:#6c757d;stroke-miterlimit:10;} + .st5{fill:#6c757d} - + - + @@ -42,7 +43,7 @@ c0,1,0.2,1.7,0.6,2.2s0.9,0.8,1.7,0.8s1.3-0.2,1.7-0.7s0.6-1.2,0.6-2.2s-0.2-1.7-0.6-2.2c-0.4-0.5-1-0.7-1.7-0.7s-1.3,0.2-1.7,0.7 S-1021.3,102.3-1021.3,103.3z"/> - + - - - - - - - diff --git a/images/icons/cf_icon_info.svg b/images/icons/cf_icon_info.svg new file mode 100644 index 000000000..4229723fa --- /dev/null +++ b/images/icons/cf_icon_info.svg @@ -0,0 +1,17 @@ + + + + + + + diff --git a/images/icons/cf_icon_info_external.svg b/images/icons/cf_icon_info_external.svg new file mode 100644 index 000000000..feefc3150 --- /dev/null +++ b/images/icons/cf_icon_info_external.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/icons/nopass.svg b/images/icons/nopass.svg index 4751e5dde..f5a6a93c7 100644 --- a/images/icons/nopass.svg +++ b/images/icons/nopass.svg @@ -3,7 +3,7 @@ + + - + + @@ -13,373 +21,414 @@ -
-