diff --git a/Front/skydivelogs-app/angular.json b/Front/skydivelogs-app/angular.json index b276b75..a6fbc96 100644 --- a/Front/skydivelogs-app/angular.json +++ b/Front/skydivelogs-app/angular.json @@ -24,7 +24,7 @@ ], "styles": [ "src/assets/css/styles-app-loading.scss", - "src/assets/css/custom-theme.scss", + "src/assets/css/custom-theme-dark.scss", "src/assets/css/styles.css" ], "scripts": [] diff --git a/Front/skydivelogs-app/src/assets/css/custom-theme-dark.scss b/Front/skydivelogs-app/src/assets/css/custom-theme-dark.scss new file mode 100644 index 0000000..6f8c456 --- /dev/null +++ b/Front/skydivelogs-app/src/assets/css/custom-theme-dark.scss @@ -0,0 +1,246 @@ +/** +* Generated theme by Material Theme Generator +* https://materialtheme.arcsine.dev +*/ + +@import '~@angular/material/theming'; +// Include the common styles for Angular Material. We include this here so that you only +// have to load a single css file for Angular Material in your app. + +// Fonts +@import url('https://fonts.googleapis.com/css?family=Material+Icons'); +@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,500'); + +$fontConfig: ( + display-4: mat-typography-level(112px, 112px, 300, 'Roboto', -0.0134em), + display-3: mat-typography-level(56px, 56px, 400, 'Roboto', -0.0089em), + display-2: mat-typography-level(45px, 48px, 400, 'Roboto', 0.0000em), + display-1: mat-typography-level(34px, 40px, 400, 'Roboto', 0.0074em), + headline: mat-typography-level(24px, 32px, 400, 'Roboto', 0.0000em), + title: mat-typography-level(20px, 32px, 500, 'Roboto', 0.0075em), + subheading-2: mat-typography-level(16px, 28px, 400, 'Roboto', 0.0094em), + subheading-1: mat-typography-level(15px, 24px, 500, 'Roboto', 0.0067em), + body-2: mat-typography-level(14px, 24px, 500, 'Roboto', 0.0179em), + body-1: mat-typography-level(14px, 20px, 400, 'Roboto', 0.0179em), + button: mat-typography-level(14px, 14px, 500, 'Roboto', 0.0893em), + caption: mat-typography-level(12px, 20px, 400, 'Roboto', 0.0333em), + input: mat-typography-level(inherit, 1.125, 400, 'Roboto', 1.5px) +); + +// Foreground Elements + +// Light Theme Text +$dark-text: #000000; +$dark-primary-text: rgba($dark-text, 0.87); +$dark-accent-text: rgba($dark-primary-text, 0.54); +$dark-disabled-text: rgba($dark-primary-text, 0.38); +$dark-dividers: rgba($dark-primary-text, 0.12); +$dark-focused: rgba($dark-primary-text, 0.12); + +$mat-light-theme-foreground: ( + base: black, + divider: $dark-dividers, + dividers: $dark-dividers, + disabled: $dark-disabled-text, + disabled-button: rgba($dark-text, 0.26), + disabled-text: $dark-disabled-text, + elevation: black, + secondary-text: $dark-accent-text, + hint-text: $dark-disabled-text, + accent-text: $dark-accent-text, + icon: $dark-accent-text, + icons: $dark-accent-text, + text: $dark-primary-text, + slider-min: $dark-primary-text, + slider-off: rgba($dark-text, 0.26), + slider-off-active: $dark-disabled-text, +); + +// Dark Theme text +$light-text: #ffffff; +$light-primary-text: $light-text; +$light-accent-text: rgba($light-primary-text, 0.7); +$light-disabled-text: rgba($light-primary-text, 0.5); +$light-dividers: rgba($light-primary-text, 0.12); +$light-focused: rgba($light-primary-text, 0.12); + +$mat-dark-theme-foreground: ( + base: $light-text, + divider: $light-dividers, + dividers: $light-dividers, + disabled: $light-disabled-text, + disabled-button: rgba($light-text, 0.3), + disabled-text: $light-disabled-text, + elevation: black, + hint-text: $light-disabled-text, + secondary-text: $light-accent-text, + accent-text: $light-accent-text, + icon: $light-text, + icons: $light-text, + text: $light-text, + slider-min: $light-text, + slider-off: rgba($light-text, 0.3), + slider-off-active: rgba($light-text, 0.3), +); + +// Background config +// Light bg +$light-background: #fafafa; +$light-bg-darker-5: darken($light-background, 5%); +$light-bg-darker-10: darken($light-background, 10%); +$light-bg-darker-20: darken($light-background, 20%); +$light-bg-darker-30: darken($light-background, 30%); +$light-bg-lighter-5: lighten($light-background, 5%); +$dark-bg-tooltip: lighten(#2c2c2c, 20%); +$dark-bg-alpha-4: rgba(#2c2c2c, 0.04); +$dark-bg-alpha-12: rgba(#2c2c2c, 0.12); + +$mat-light-theme-background: ( + background: $light-background, + status-bar: $light-bg-darker-20, + app-bar: $light-bg-darker-5, + hover: $dark-bg-alpha-4, + card: $light-bg-lighter-5, + dialog: $light-bg-lighter-5, + tooltip: $dark-bg-tooltip, + disabled-button: $dark-bg-alpha-12, + raised-button: $light-bg-lighter-5, + focused-button: $dark-focused, + selected-button: $light-bg-darker-20, + selected-disabled-button: $light-bg-darker-30, + disabled-button-toggle: $light-bg-darker-10, + unselected-chip: $light-bg-darker-10, + disabled-list-option: $light-bg-darker-10, +); + +// Dark bg +$dark-background: #2c2c2c; +$dark-bg-lighter-5: lighten($dark-background, 5%); +$dark-bg-lighter-10: lighten($dark-background, 10%); +$dark-bg-lighter-20: lighten($dark-background, 20%); +$dark-bg-lighter-30: lighten($dark-background, 30%); +$light-bg-alpha-4: rgba(#fafafa, 0.04); +$light-bg-alpha-12: rgba(#fafafa, 0.12); + +// Background palette for dark themes. +$mat-dark-theme-background: ( + background: $dark-background, + status-bar: $dark-bg-lighter-20, + app-bar: $dark-bg-lighter-5, + hover: $light-bg-alpha-4, + card: $dark-bg-lighter-5, + dialog: $dark-bg-lighter-5, + tooltip: $dark-bg-lighter-20, + disabled-button: $light-bg-alpha-12, + raised-button: $dark-bg-lighter-5, + focused-button: $light-focused, + selected-button: $dark-bg-lighter-20, + selected-disabled-button: $dark-bg-lighter-30, + disabled-button-toggle: $dark-bg-lighter-10, + unselected-chip: $dark-bg-lighter-20, + disabled-list-option: $dark-bg-lighter-10, +); + +// Compute font config +@include mat-core($fontConfig); + +// Theme Config + +body { + --primary-color: #cc33ca; + --primary-lighter-color: #f0c2ef; + --primary-darker-color: #b920b7; + --text-primary-color: #{$light-primary-text}; + --text-primary-lighter-color: #{$dark-primary-text}; + --text-primary-darker-color: #{$light-primary-text}; +} + +$mat-primary: ( + main: #cc33ca, + lighter: #f0c2ef, + darker: #b920b7, + 200: #cc33ca, // For slide toggle, + contrast : ( + main: $light-primary-text, + lighter: $dark-primary-text, + darker: $light-primary-text, + ) +); +$theme-primary: mat-palette($mat-primary, main, lighter, darker); + +body { + --accent-color: #797979; + --accent-lighter-color: #d7d7d7; + --accent-darker-color: #5c5c5c; + --text-accent-color: #{$light-primary-text}; + --text-accent-lighter-color: #{$dark-primary-text}; + --text-accent-darker-color: #{$light-primary-text}; +} + +$mat-accent: ( + main: #797979, + lighter: #d7d7d7, + darker: #5c5c5c, + 200: #797979, // For slide toggle, + contrast : ( + main: $light-primary-text, + lighter: $dark-primary-text, + darker: $light-primary-text, + ) +); +$theme-accent: mat-palette($mat-accent, main, lighter, darker); + +body { + --warn-color: #ff0000; + --warn-lighter-color: #ffb3b3; + --warn-darker-color: #ff0000; + --text-warn-color: #{$light-primary-text}; + --text-warn-lighter-color: #{$dark-primary-text}; + --text-warn-darker-color: #{$light-primary-text}; +} + +$mat-warn: ( + main: #ff0000, + lighter: #ffb3b3, + darker: #ff0000, + 200: #ff0000, // For slide toggle, + contrast : ( + main: $light-primary-text, + lighter: $dark-primary-text, + darker: $light-primary-text, + ) +); +$theme-warn: mat-palette($mat-warn, main, lighter, darker);; + +$theme: mat-dark-theme($theme-primary, $theme-accent, $theme-warn); +$altTheme: mat-light-theme($theme-primary, $theme-accent, $theme-warn); + +// Theme Init +@include angular-material-theme($theme); + +.theme-alternate { + @include angular-material-theme($altTheme); +} + +// Specific component overrides, pieces that are not in line with the general theming + +// Handle buttons appropriately, with respect to line-height +.mat-raised-button, .mat-stroked-button, .mat-flat-button { + padding: 0 1.15em; + margin: 0 .65em; + min-width: 3em; + line-height: 36.4px +} + +.mat-standard-chip { + padding: .5em .85em; + min-height: 2.5em; +} + +.material-icons { + font-size: 24px; + font-family: 'Material Icons', 'Material Icons'; + .mat-badge-content { + font-family: 'Roboto'; + } +} diff --git a/Front/skydivelogs-app/src/assets/css/custom-theme.scss b/Front/skydivelogs-app/src/assets/css/custom-theme-light.scss similarity index 100% rename from Front/skydivelogs-app/src/assets/css/custom-theme.scss rename to Front/skydivelogs-app/src/assets/css/custom-theme-light.scss diff --git a/Front/skydivelogs-app/src/assets/css/styles.css b/Front/skydivelogs-app/src/assets/css/styles.css index 92138f3..5e1bf22 100644 --- a/Front/skydivelogs-app/src/assets/css/styles.css +++ b/Front/skydivelogs-app/src/assets/css/styles.css @@ -1,55 +1,12 @@ html, body { min-height: 100vh; - /*width: 100vw;*/ box-sizing: border-box; overflow: auto; } body { font-family: Roboto, "Helvetica Neue", sans-serif; - color: #424242; margin: 0; padding: 10px; -} - -/* Doc : https://github.com/google/material-design-icons/tree/master/iconfont */ -/* https://material.io/resources/icons/?style=baseline */ -@font-face { - font-family: 'Material Icons'; - font-style: normal; - font-weight: 400; - src: url(../font/MaterialIcons.woff2); - /* For IE6-8 */ - src: local('Material Icons'), - local('MaterialIcons-Regular'), - url(/assets/font/MaterialIcons.woff2) format('woff2'), - url(/assets//font/MaterialIcons-Regular.woff) format('woff'), - url(/assets//font/MaterialIcons-Regular.ttf) format('truetype') -} - -.material-icons { - font-family: 'Material Icons'; - font-weight: normal; - font-style: normal; - font-size: 24px; - /* Preferred icon size */ - display: inline-block; - line-height: 1; - text-transform: none; - letter-spacing: normal; - word-wrap: normal; - white-space: nowrap; - direction: ltr; - - /* Support for all WebKit browsers. */ - -webkit-font-smoothing: antialiased; - /* Support for Safari and Chrome. */ - text-rendering: optimizeLegibility; - - /* Support for Firefox. */ - -moz-osx-font-smoothing: grayscale; - - /* Support for IE. */ - font-feature-settings: 'liga'; -} +} \ No newline at end of file diff --git a/Front/skydivelogs-app/src/index.html b/Front/skydivelogs-app/src/index.html index 628d473..ce3b1fb 100644 --- a/Front/skydivelogs-app/src/index.html +++ b/Front/skydivelogs-app/src/index.html @@ -9,7 +9,7 @@ -
+