diff --git a/App/constants/interfaces/IPaths.ts b/App/constants/interfaces/IPaths.ts deleted file mode 100644 index f6fac2aa..00000000 --- a/App/constants/interfaces/IPaths.ts +++ /dev/null @@ -1,24 +0,0 @@ -module Constants { - 'use strict'; - - export interface IPaths { - Core: string, - Modules: string, - Tabs: string, - Side?: { - Base: string, - Left?: string, - Right?: string - }, - Home: { - Base: string, - Scroll: string - }, - Actions: { - Base: string - }, - Buttons: { - Base: string - } - } -} diff --git a/App/constants/paths.ts b/App/constants/paths.ts index 2e7cca6f..131cf0e7 100644 --- a/App/constants/paths.ts +++ b/App/constants/paths.ts @@ -1,7 +1,7 @@ module Constants { 'use strict'; - export let Paths: IPaths = { + export let Paths = { Core: 'core', Modules: 'modules/', Tabs: 'tabs', diff --git a/App/gulpfile.js b/App/gulpfile.js index 06684180..e9ae5d40 100644 --- a/App/gulpfile.js +++ b/App/gulpfile.js @@ -15,7 +15,7 @@ var runSequence = require('run-sequence'); gulp.task('default', function () { // Compile Sass, TypeScript and inject files into index.html - runSequence('default:clean', 'default:scss', 'default:ts', 'default:html', 'default:inject'); + runSequence('default:clean', 'default:html', 'default:scss', 'default:ts', 'default:inject'); }); gulp.task('initialize', function () { @@ -25,5 +25,5 @@ gulp.task('initialize', function () { gulp.task('build', function () { // Build project - runSequence('build:files', 'build:html', 'build:clean'); -}); \ No newline at end of file + runSequence('build:clean', 'build:html', 'build:files'); +}); diff --git a/App/merges/android/modules/home/views/home.html b/App/merges/android/modules/home/views/home.html new file mode 100644 index 00000000..6f0d8a51 --- /dev/null +++ b/App/merges/android/modules/home/views/home.html @@ -0,0 +1,20 @@ + + +
+ + +
+ +
+ Submit +
+ + \ No newline at end of file diff --git a/App/merges/android/modules/tabs/templates/wrapper.html b/App/merges/android/modules/tabs/templates/wrapper.html index 3b2853ee..fc2f0c62 100644 --- a/App/merges/android/modules/tabs/templates/wrapper.html +++ b/App/merges/android/modules/tabs/templates/wrapper.html @@ -1,5 +1,6 @@ + @@ -7,6 +8,7 @@ class="button button-clear icon ion-navicon-round" ng-hide="$exposeAside.active"> + \ No newline at end of file diff --git a/App/merges/windows/modules/home/views/home.html b/App/merges/windows/modules/home/views/home.html new file mode 100644 index 00000000..a8a0c327 --- /dev/null +++ b/App/merges/windows/modules/home/views/home.html @@ -0,0 +1,18 @@ + + +
+ + +
+ +
+ Submit +
+ + \ No newline at end of file diff --git a/App/merges/windows/platform.css b/App/merges/windows/platform.css index a0ab5e29..45d259ed 100644 --- a/App/merges/windows/platform.css +++ b/App/merges/windows/platform.css @@ -4,6 +4,10 @@ GitHub: https://github.com/CKGrafico/Segoe-mdl2-assets-css */ [class*=mdl2-],[class^=mdl2-]{font-family:'Segoe MDL2 Assets'}[class*=mdl2-]::before,[class^=mdl2-]::before{font-size:1.8pc}.mdl2-heart-legacy::before{content:'\e006'}.mdl2-heart-fill-legacy::before{content:'\e0a5'}.mdl2-heart-broken-legacy::before{content:'\e007'}.mdl2-heart-fill-zero-width-legacy::before{content:'\e00b'}.mdl2-heart-broken-zero-width-legacy::before{content:'\e00c'}.mdl2-rating-star-legacy::before{content:'\e224'}.mdl2-rating-star-fill-legacy::before{content:'\e0b4'}.mdl2-rating-star-fill-zero-width-legacy::before{content:'\e00a'}.mdl2-rating-star-fill-reduced-padding-HTML-legacy::before{content:'\e082'}.mdl2-rating-star-fill-small-legacy::before{content:'\e0b5'}.mdl2-half-star-left::before{content:'\e7c6'}.mdl2-half-star-right::before{content:'\e7c7'}.mdl2-check-mark-legacy::before{content:'\e001'}.mdl2-checkbox-fill-legacy::before{content:'\e002'}.mdl2-checkbox-legacy::before{content:'\e003'}.mdl2-checkbox-indeterminate-legacy::before{content:'\e004'}.mdl2-checkbox-composite-reversed-legacy::before{content:'\e005'}.mdl2-check-mark-zero-width-legacy::before{content:'\e008'}.mdl2-checkbox-fill-zero-width-legacy::before{content:'\e009'}.mdl2-checkbox-composite-legacy::before{content:'\e0a2'}.mdl2-checkbox::before{content:'\e739'}.mdl2-checkbox-composite::before{content:'\e73a'}.mdl2-checkbox-fill::before{content:'\e73b'}.mdl2-checkbox-indeterminate::before{content:'\e73c'}.mdl2-checkbox-composite-reversed::before{content:'\e73d'}.mdl2-check-mark::before{content:'\e73e'}.mdl2-comment-legacy::before{content:'\e134'}.mdl2-favorite-legacy::before{content:'\e113'}.mdl2-unfavorite-legacy::before{content:'\e195'}.mdl2-unfavorite::before{content:'\e8d9'}.mdl2-like-legacy::before{content:'\e19f'}.mdl2-dislike-legacy::before{content:'\e19e'}.mdl2-like-dislike-legacy::before{content:'\e19d'}.mdl2-video-legacy::before{content:'\e116'}.mdl2-video::before{content:'\e714'}.mdl2-mail-message-legacy::before{content:'\e20b'}.mdl2-reply-legacy::before{content:'\e248'}.mdl2-favorite-2-legacy::before{content:'\e249'}.mdl2-unfavorite-2-legacy::before{content:'\e24e'}.mdl2-mobile-contact-legacy::before{content:'\e25a'}.mdl2-blocked-legacy::before{content:'\e25b'}.mdl2-typing-indicator-legacy::before{content:'\e25c'}.mdl2-presence-chicklet-video-legacy::before{content:'\e25d'}.mdl2-presence-chicklet-legacy::before{content:'\e25e'}.mdl2-scroll-chevron-left-legacy::before{content:'\e00e'}.mdl2-scroll-chevron-right-legacy::before{content:'\e00f'}.mdl2-scroll-chevron-up-legacy::before{content:'\e010'}.mdl2-scroll-chevron-down-legacy::before{content:'\e011'}.mdl2-scroll-chevron-left-bold-legacy::before{content:'\e016'}.mdl2-scroll-chevron-right-bold-legacy::before{content:'\e017'}.mdl2-scroll-chevron-up-bold-legacy::before{content:'\e018'}.mdl2-scroll-chevron-down-bold-legacy::before{content:'\e019'}.mdl2-back-bttn-arrow-2-0-legacy::before{content:'\e0c4'}.mdl2-back-bttn-arrow-4-2-legacy::before{content:'\e0a6'}.mdl2-back-bttn-mirrored-arrow-2-0-legacy::before{content:'\e0ad'}.mdl2-back-bttn-mirrored-arrow-4-2-legacy::before{content:'\e0ab'}.mdl2-chrome-back::before{content:'\e830'}.mdl2-chrome-back-mirrored::before{content:'\ea47'}.mdl2-arrow-HTML-legacy::before{content:'\e0d5'}.mdl2-arrow-HTML-mirrored-legacy::before{content:'\e0ae'}.mdl2-accept::before{content:'\e8fb'}.mdl2-accounts::before{content:'\e910'}.mdl2-add::before{content:'\e710'}.mdl2-add-friend::before{content:'\e8fa'}.mdl2-admin::before{content:'\e7ef'}.mdl2-align-center::before{content:'\e8e3'}.mdl2-align-left::before{content:'\e8e4'}.mdl2-alignright::before{content:'\e8e2'}.mdl2-all-apps::before{content:'\e71d'}.mdl2-attach::before{content:'\e723'}.mdl2-attach-camera::before{content:'\e8a2'}.mdl2-audio::before{content:'\e8d6'}.mdl2-back::before{content:'\e72b'}.mdl2-back-to-window::before{content:'\e73f'}.mdl2-block-contact::before{content:'\e8f8'}.mdl2-bold::before{content:'\e8dd'}.mdl2-bookmarks::before{content:'\e8a4'}.mdl2-browse-photos::before{content:'\e7c5'}.mdl2-bulleted-list::before{content:'\e8fd'}.mdl2-calculator::before{content:'\e8ef'}.mdl2-calendar::before{content:'\e787'}.mdl2-calendar-day::before{content:'\e8bf'}.mdl2-calendar-reply::before{content:'\e8f5'}.mdl2-calendar-week::before{content:'\e8c0'}.mdl2-camera::before{content:'\e722'}.mdl2-cancel::before{content:'\e711'}.mdl2-caption::before{content:'\e8ba'}.mdl2-c-c::before{content:'\e7f0'}.mdl2-cellphone::before{content:'\e8ea'}.mdl2-characters::before{content:'\e8c1'}.mdl2-clear::before{content:'\e894'}.mdl2-clear-selection::before{content:'\e8e6'}.mdl2-close-pane::before{content:'\e89f'}.mdl2-cloud::before{content:'\e753'}.mdl2-comment::before{content:'\e90a'}.mdl2-contact::before{content:'\e77b'}.mdl2-contact-2::before{content:'\e8d4'}.mdl2-contact-info::before{content:'\e779'}.mdl2-contact-presence::before{content:'\e8cf'}.mdl2-copy::before{content:'\e8c8'}.mdl2-crop::before{content:'\e7a8'}.mdl2-cut::before{content:'\e8c6'}.mdl2-delete::before{content:'\e74d'}.mdl2-directions::before{content:'\e8f0'}.mdl2-disable-updates::before{content:'\e8d8'}.mdl2-disconnect-drive::before{content:'\e8cd'}.mdl2-dislike::before{content:'\e8e0'}.mdl2-dock-bottom::before{content:'\e90e'}.mdl2-dock-left::before{content:'\e90c'}.mdl2-dock-right::before{content:'\e90d'}.mdl2-document::before{content:'\e8a5'}.mdl2-download::before{content:'\e896'}.mdl2-edit::before{content:'\e70f'}.mdl2-emoji::before{content:'\e899'}.mdl2-emoji-2::before{content:'\e76e'}.mdl2-favorite-list::before{content:'\e728'}.mdl2-favorite-star::before{content:'\e734'}.mdl2-favorite-star-fill::before{content:'\e735'}.mdl2-filter::before{content:'\e71c'}.mdl2-find-legacy::before{content:'\e11a'}.mdl2-flag::before{content:'\e7c1'}.mdl2-folder::before{content:'\e8b7'}.mdl2-font::before{content:'\e8d2'}.mdl2-fontcolor::before{content:'\e8d3'}.mdl2-font-decrease::before{content:'\e8e7'}.mdl2-font-increase::before{content:'\e8e8'}.mdl2-font-size::before{content:'\e8e9'}.mdl2-forward::before{content:'\e72a'}.mdl2-four-bars::before{content:'\e908'}.mdl2-full-screen::before{content:'\e740'}.mdl2-globe::before{content:'\e774'}.mdl2-go::before{content:'\e8ad'}.mdl2-go-to-start::before{content:'\e8fc'}.mdl2-go-to-today::before{content:'\e8d1'}.mdl2-hangup::before{content:'\e778'}.mdl2-help::before{content:'\e897'}.mdl2-hide-BCC::before{content:'\e8c5'}.mdl2-highlight::before{content:'\e7e6'}.mdl2-home::before{content:'\e80f'}.mdl2-import::before{content:'\e8b5'}.mdl2-import-all::before{content:'\e8b6'}.mdl2-important::before{content:'\e8c9'}.mdl2-italic::before{content:'\e8db'}.mdl2-keyboard-classic::before{content:'\e765'}.mdl2-leave-chat::before{content:'\e89b'}.mdl2-library::before{content:'\e8f1'}.mdl2-like::before{content:'\e8e1'}.mdl2-like-dislike::before{content:'\e8df'}.mdl2-link::before{content:'\e71b'}.mdl2-list::before{content:'\ea37'}.mdl2-location::before{content:'\e81d'}.mdl2-mail::before{content:'\e715'}.mdl2-mail-fill::before{content:'\e8a8'}.mdl2-mail-forward::before{content:'\e89c'}.mdl2-mail-reply::before{content:'\e8ca'}.mdl2-mail-reply-all::before{content:'\e8c2'}.mdl2-manage::before{content:'\e912'}.mdl2-map-drive::before{content:'\e8ce'}.mdl2-mappin::before{content:'\e707'}.mdl2-memo::before{content:'\e77c'}.mdl2-message::before{content:'\e8bd'}.mdl2-microphone::before{content:'\e720'}.mdl2-more::before{content:'\e712'}.mdl2-move-to-folder::before{content:'\e8de'}.mdl2-music-info::before{content:'\e90b'}.mdl2-mute::before{content:'\e74f'}.mdl2-new-folder::before{content:'\e8f4'}.mdl2-new-window::before{content:'\e78b'}.mdl2-next::before{content:'\e893'}.mdl2-one-bar::before{content:'\e905'}.mdl2-open-file::before{content:'\e8e5'}.mdl2-open-local::before{content:'\e8da'}.mdl2-open-pane::before{content:'\e8a0'}.mdl2-open-with::before{content:'\e7ac'}.mdl2-orientation::before{content:'\e8b4'}.mdl2-other-user::before{content:'\e7ee'}.mdl2-outline-star-legacy::before{content:'\e1ce'}.mdl2-page::before{content:'\e7c3'}.mdl2-paste::before{content:'\e77f'}.mdl2-pause::before{content:'\e769'}.mdl2-people::before{content:'\e716'}.mdl2-permissions::before{content:'\e8d7'}.mdl2-phone::before{content:'\e717'}.mdl2-phone-book::before{content:'\e780'}.mdl2-pin::before{content:'\e718'}.mdl2-play::before{content:'\e768'}.mdl2-post-update::before{content:'\e8f3'}.mdl2-preview::before{content:'\e8ff'}.mdl2-preview-link::before{content:'\e8a1'}.mdl2-previous::before{content:'\e892'}.mdl2-priority::before{content:'\e8d0'}.mdl2-protected-document::before{content:'\e8a6'}.mdl2-read::before{content:'\e8c3'}.mdl2-redo::before{content:'\e7a6'}.mdl2-refresh::before{content:'\e72c'}.mdl2-remote::before{content:'\e8af'}.mdl2-remove::before{content:'\e738'}.mdl2-rename::before{content:'\e8ac'}.mdl2-repair::before{content:'\e90f'}.mdl2-repeat-all::before{content:'\e8ee'}.mdl2-repeat-one::before{content:'\e8ed'}.mdl2-report-hacked::before{content:'\e730'}.mdl2-reshare::before{content:'\e8eb'}.mdl2-rotate::before{content:'\e7ad'}.mdl2-rotate-camera::before{content:'\e89e'}.mdl2-save::before{content:'\e74e'}.mdl2-save-local::before{content:'\e78c'}.mdl2-scan::before{content:'\e8fe'}.mdl2-select-all::before{content:'\e8b3'}.mdl2-send::before{content:'\e724'}.mdl2-set-lock-screen::before{content:'\e7b5'}.mdl2-set-tile::before{content:'\e97b'}.mdl2-settings::before{content:'\e713'}.mdl2-share::before{content:'\e72d'}.mdl2-shop::before{content:'\e719'}.mdl2-show-BCC::before{content:'\e8c4'}.mdl2-show-results::before{content:'\e8bc'}.mdl2-shuffle::before{content:'\e8b1'}.mdl2-slideshow::before{content:'\e786'}.mdl2-solid-star-legacy::before{content:'\e1cf'}.mdl2-sort::before{content:'\e8cb'}.mdl2-stop::before{content:'\e71a'}.mdl2-street::before{content:'\e913'}.mdl2-switch::before{content:'\e8ab'}.mdl2-switch-apps::before{content:'\e8f9'}.mdl2-sync::before{content:'\e895'}.mdl2-sync-folder::before{content:'\e8f7'}.mdl2-tag::before{content:'\e8ec'}.mdl2-three-bars::before{content:'\e907'}.mdl2-touch-pointer::before{content:'\e7c9'}.mdl2-trim::before{content:'\e78a'}.mdl2-two-bars::before{content:'\e906'}.mdl2-two-page::before{content:'\e89a'}.mdl2-underline::before{content:'\e8dc'}.mdl2-undo::before{content:'\e7a7'}.mdl2-un-favorite::before{content:'\e8d9'}.mdl2-un-pin::before{content:'\e77a'}.mdl2-un-sync-folder::before{content:'\e8f6'}.mdl2-up::before{content:'\e74a'}.mdl2-upload::before{content:'\e898'}.mdl2-video-chat::before{content:'\e8aa'}.mdl2-view::before{content:'\e890'}.mdl2-view-all::before{content:'\e8a9'}.mdl2-volume::before{content:'\e767'}.mdl2-webcam::before{content:'\e8b8'}.mdl2-world::before{content:'\e909'}.mdl2-zero-bars::before{content:'\e904'}.mdl2-zoom::before{content:'\e71e'}.mdl2-zoom-in::before{content:'\e8a3'}.mdl2-zoom-out::before{content:'\e71f'}.mdl2-battery-unknown::before{content:'\e996'}.mdl2-battery-0::before{content:'\e850'}.mdl2-battery-1::before{content:'\e851'}.mdl2-battery-2::before{content:'\e852'}.mdl2-battery-3::before{content:'\e853'}.mdl2-battery-4::before{content:'\e854'}.mdl2-battery-5::before{content:'\e855'}.mdl2-battery-6::before{content:'\e856'}.mdl2-battery-7::before{content:'\e857'}.mdl2-battery-8::before{content:'\e858'}.mdl2-battery-9::before{content:'\e859'}.mdl2-battery-10::before{content:'\e83f'}.mdl2-battery-charging-0::before{content:'\e85a'}.mdl2-battery-charging-1::before{content:'\e85b'}.mdl2-battery-charging-2::before{content:'\e85c'}.mdl2-battery-charging-3::before{content:'\e85d'}.mdl2-battery-charging-4::before{content:'\e85e'}.mdl2-battery-charging-5::before{content:'\e85f'}.mdl2-battery-charging-6::before{content:'\e860'}.mdl2-battery-charging-7::before{content:'\e861'}.mdl2-battery-charging-8::before{content:'\e862'}.mdl2-battery-charging-9::before{content:'\e83e'}.mdl2-battery-charging-10::before{content:'\ea93'}.mdl2-battery-saver-0::before{content:'\e863'}.mdl2-battery-saver-1::before{content:'\e864'}.mdl2-battery-saver-2::before{content:'\e865'}.mdl2-battery-saver-3::before{content:'\e866'}.mdl2-battery-saver-4::before{content:'\e867'}.mdl2-battery-saver-5::before{content:'\e868'}.mdl2-battery-saver-6::before{content:'\e869'}.mdl2-battery-saver-7::before{content:'\e86a'}.mdl2-battery-saver-8::before{content:'\e86b'}.mdl2-battery-saver-9::before{content:'\ea94'}.mdl2-battery-saver-10::before{content:'\ea95'} +.scroll { + -ms-touch-action: pan-y; +} + /* Transform buttons right in action bar*/ ion-header-bar .buttons-right { background-color: #f8f8f8; @@ -32,6 +36,11 @@ ion-header-bar .buttons-right.hidden { transition: all 0.5s; } +ion-header-bar .buttons-right.disabled { + visibility: hidden; + top: 100vh !important; +} + @media only screen and (orientation: landscape) { ion-header-bar .buttons-right { @@ -81,4 +90,4 @@ ion-nav-bar, ion-nav-bar ion-header-bar, ion-nav-bar ion-header-bar .title { .scroll { padding-bottom: 7vh; -} \ No newline at end of file +} diff --git a/App/merges/windows/platformOverrides.js b/App/merges/windows/platformOverrides.js index 1f52779d..f21fec62 100644 --- a/App/merges/windows/platformOverrides.js +++ b/App/merges/windows/platformOverrides.js @@ -13,7 +13,7 @@ if (window.Windows && Windows.Phone && Windows.Phone.UI.Input.HardwareButtons && var lastScroll = 0; var frame = 0; function checkScroll() { - if (frame === 30) { + if (frame === 20) { frame = 0; var s = document.querySelectorAll('.overflow-scroll'); var sum = 0; @@ -34,6 +34,12 @@ function checkScroll() { }, false); } + if (b[i].querySelectorAll('button').length < 1) { + b[i].classList.add('disabled'); + } else { + b[i].classList.remove('disabled'); + } + if (sum < 15 || b[i].clicked) { b[i].classList.remove('hidden'); } else { diff --git a/App/modules/actions/controllers/actionsController.ts b/App/modules/actions/controllers/actionsController.ts index c57975a2..24b5a907 100644 --- a/App/modules/actions/controllers/actionsController.ts +++ b/App/modules/actions/controllers/actionsController.ts @@ -7,8 +7,7 @@ constructor( private loadingService: Core.ILoadingService - ){ - + ) { this.addTextAsync(); } diff --git a/App/modules/core/services/loadingService.ts b/App/modules/core/services/loadingService.ts index ff712519..01e38e79 100644 --- a/App/modules/core/services/loadingService.ts +++ b/App/modules/core/services/loadingService.ts @@ -5,8 +5,7 @@ constructor( private $ionicLoading: ionic.loading.IonicLoadingService - ){ - } + ){} public show(): void { let options: ionic.loading.IonicLoadingOptions = { diff --git a/App/modules/home/views/home.html b/App/modules/home/views/home.html index 281ff08a..5b0b941c 100644 --- a/App/modules/home/views/home.html +++ b/App/modules/home/views/home.html @@ -1,8 +1,18 @@  -

Parent page

- - Open Scroll page +
+ + +
+
+ Submit +
\ No newline at end of file diff --git a/App/modules/tabs/controllers/navigationController.ts b/App/modules/tabs/controllers/navigationController.ts index d1d74965..275f6f08 100644 --- a/App/modules/tabs/controllers/navigationController.ts +++ b/App/modules/tabs/controllers/navigationController.ts @@ -1,4 +1,4 @@ -module Tabs { +module Tabs { 'use strict'; export class NavigationController { @@ -7,8 +7,7 @@ private $ionicHistory: ionic.navigation.IonicHistoryService, private $ionicTabsDelegate: ionic.tabs.IonicTabsDelegate, private $ionicPlatform: ionic.platform.IonicPlatformService - ){ - + ){ $ionicPlatform.registerBackButtonAction(e => this.checkBack(e), 100); } @@ -16,10 +15,10 @@ this.$ionicHistory.goBack(); } - public checkBack(e: Event) { + public checkBack(e: Event): void { var page = this.$ionicHistory.currentStateName(); if (page === Constants.Paths.Home.Base) { - var nav: any = navigator; + let nav: any = navigator; if (nav.app && nav.app.exitApp) { nav.app.exitApp(); } else { @@ -30,13 +29,20 @@ } } - // On Windows phone - public onSwipeLeft() { + private disableSwipe(e: Event): void { + // For example on + e.stopPropagation(); + } + + public onSwipeLeft(): void { this.$ionicTabsDelegate.select(this.$ionicTabsDelegate.selectedIndex() + 1); } - public onSwipeRight() { - this.$ionicTabsDelegate.select(this.$ionicTabsDelegate.selectedIndex() - 1); + public onSwipeRight(): void { + let index: number = this.$ionicTabsDelegate.selectedIndex(); + if (index > 0) { + this.$ionicTabsDelegate.select(this.$ionicTabsDelegate.selectedIndex() - 1); + } } } @@ -44,4 +50,3 @@ .controller('navigationController', NavigationController); } - diff --git a/App/scss/helpers/_overrides.scss b/App/scss/helpers/_overrides.scss index ee6c59d7..ea8ae28d 100644 --- a/App/scss/helpers/_overrides.scss +++ b/App/scss/helpers/_overrides.scss @@ -1,5 +1,4 @@ -//////////////////// -// Ionic Overrides +@import "variables"; -$calm: #1AA8D0; +$calm: $Color-Brand-main; $ionicons-font-path: '../fonts/ionic/release/fonts' \ No newline at end of file diff --git a/App/scss/helpers/_variables.scss b/App/scss/helpers/_variables.scss index af2ed251..ad24102e 100644 --- a/App/scss/helpers/_variables.scss +++ b/App/scss/helpers/_variables.scss @@ -1,8 +1,5 @@ -//////////////////// -// Global variables - -// Colors -$Color-Brand-main: #046dfb; +// Colors +$Color-Brand-main: #1AA8D0; $Color-Brand-secondary: #DB8718; $Color-Background-dark: #454545;