isark
/
Nothing
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

Lots of design changes

Browse Source
merge-notes
isark 2 years ago
parent 06f40733ba
commit 9f610739ce
13 changed files with 276 additions and 130 deletions
Show Stats Download Patch File Download Diff File

7
src-tauri/src/main.rs
Unescape View File

@ -128,10 +128,12 @@ fn main() {
let settings = CustomMenuItem::new("settings".to_string(), "Settings"); let settings = CustomMenuItem::new("settings".to_string(), "Settings");
let editor = CustomMenuItem::new("editor".to_string(), "Plan Editor"); let editor = CustomMenuItem::new("editor".to_string(), "Plan Editor");
let force_show = CustomMenuItem::new("force_show".to_string(), "Force show");
let exit = CustomMenuItem::new("exit".to_string(), "Exit"); let exit = CustomMenuItem::new("exit".to_string(), "Exit");
let tray_menu = SystemTrayMenu::new() let tray_menu = SystemTrayMenu::new()
.add_item(settings) .add_item(settings)
.add_item(editor) .add_item(editor)
.add_item(force_show)
.add_native_item(SystemTrayMenuItem::Separator) .add_native_item(SystemTrayMenuItem::Separator)
.add_item(exit); .add_item(exit);
let system_tray = SystemTray::new().with_menu(tray_menu); let system_tray = SystemTray::new().with_menu(tray_menu);
@ -181,9 +183,12 @@ fn main() {
"editor" | "settings" => { "editor" | "settings" => {
if let Some(window) = app.get_window("Normal") { if let Some(window) = app.get_window("Normal") {
window.show().ok(); window.show().ok();
window.emit_to("Normal", "loadTab", id); window.emit_to("Normal", "loadTab", id).ok();
} }
} }
"force_show" => {
app.state::<Sender<Event>>().send(overlay::State::Interactable {}.into()).ok();
}
_ => {} _ => {}
}, },
_ => {} _ => {}

6
src/app/app.component.html
Unescape View File

@ -2,7 +2,11 @@
<mat-tab-group color="accent" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)" <mat-tab-group color="accent" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)"
mat-stretch-tabs="false" class="tabs"> mat-stretch-tabs="false" class="tabs">
<mat-tab label="Settings"> <mat-tab label="Settings">
<settings class="content h-100 w-100"></settings> <div class="d-flex w-100 h-100 align-items-center">
<div class="col-xl-4 offset-xl-4 col-lg-6 offset-lg-3 col-md-8 offset-md-2 col-sm-10 offset-sm-1 col-xs-12">
<settings class="content h-100 w-100"></settings>
</div>
</div>
</mat-tab> </mat-tab>
<mat-tab label="Editor"> <mat-tab label="Editor">
<plan-editor class="content"></plan-editor> <plan-editor class="content"></plan-editor>

6
src/app/app.module.ts
Unescape View File

@ -12,7 +12,8 @@ import { EditorComponent } from "./editor/editor.component";
import { AngularResizeEventModule } from "angular-resize-event"; import { AngularResizeEventModule } from "angular-resize-event";
import { OverlayModule } from "@angular/cdk/overlay"; import { OverlayModule } from "@angular/cdk/overlay";
import { SettingsComponent } from "./settings/settings.component"; import { SettingsComponent } from "./settings/settings.component";
import {MatTabsModule} from '@angular/material/tabs'; import { MatTabsModule } from '@angular/material/tabs';
import { MAT_DIALOG_DEFAULT_OPTIONS } from "@angular/material/dialog";
// import { GemFinderComponent } from "./gem-finder/gem-finder.component"; // import { GemFinderComponent } from "./gem-finder/gem-finder.component";
export function initializeApp(configService: ConfigService) { export function initializeApp(configService: ConfigService) {
@ -44,7 +45,8 @@ export function initializeApp(configService: ConfigService) {
useFactory: initializeApp, useFactory: initializeApp,
deps: [ConfigService], deps: [ConfigService],
multi: true multi: true
} },
{ provide: MAT_DIALOG_DEFAULT_OPTIONS, useValue: { panelClass: 'mat-field-inside-dialog-workaround' } },
], ],
bootstrap: [AppComponent], bootstrap: [AppComponent],
}) })

93
src/app/editor/editor.component.html
Unescape View File

@ -1,46 +1,81 @@
<div class="buttons"> <div class="buttons m-2">
<button (click)="save()">Save plan</button> <button mat-raised-button color="primary" (click)="save()">Save plan</button>
<button (click)="openPlan()">Open plan for editing</button> <button mat-raised-button color="primary" (click)="openPlan()">Open plan for editing</button>
<button (click)="loadBasePlan()">Load base plan preset</button> <button mat-raised-button color="primary" (click)="loadBasePlan()">Load base plan preset</button>
</div> </div>
<div cdkDropListGroup *ngIf="areas" class="editor-container"> <div cdkDropListGroup *ngIf="areas" class="editor-container">
<div class="row">
</div>
<div class="container"> <div class="container">
Area filter<input type="text" [(ngModel)]="areaSearchString"> <mat-form-field color="accent">
Act filter <select [(ngModel)]="filterAct"> <mat-label>Area filter</mat-label>
<option *ngFor="let item of acts" [ngValue]="item">{{item.name}}</option> <input matInput type="text" [(ngModel)]="areaSearchString">
</select> </mat-form-field>
<mat-form-field>
<mat-label>Act filter</mat-label>
<mat-select [(value)]="filterAct">
<mat-option *ngFor="let item of acts" [value]="item">{{item.name}}</mat-option>
</mat-select>
<!-- <select [(ngModel)]="filterAct">
<option *ngFor="let item of acts" [ngValue]="item">{{item.name}}</option>
</select> -->
</mat-form-field>
<h2>Campaign zones</h2> <h2>Campaign zones</h2>
<div cdkDropList [cdkDropListData]="filterAreas()" class="list areas" cdkDropListSortingDisabled <div cdkDropList [cdkDropListData]="filterAreas()" class="list areas" cdkDropListSortingDisabled
(cdkDropListDropped)="dropHandler($event)"> (cdkDropListDropped)="dropHandler($event)">
<div class="box" *ngFor="let item of filterAreas()" cdkDrag (dblclick)="doubleClickArea(item)"> <div class="box" *ngFor="let item of filterAreas()" cdkDrag (dblclick)="doubleClickArea(item)">
<div class="zone-name">{{item.name}}</div> <div class="zone-name">{{item.name}}</div>
<div class="act">Act {{item.act}}</div> <div class="act">Act {{item.act}}</div>
</div> </div>
</div> </div>
</div> </div>
<div class="container"> <div class="container">
<span>Auto scroll to end on add to end<input type="checkbox" [(ngModel)]="autoScrollToEnd"></span> <div class="d-flex flex-column right-settings">
<span>Reverse display: <input type="checkbox" [(ngModel)]="reverseDisplay"></span> <mat-slide-toggle color="accent" [(ngModel)]="autoScrollToEnd">Auto scroll to end on add to
<button (click)="clearPlan()">Clear</button> end</mat-slide-toggle><mat-slide-toggle color="accent" [(ngModel)]="reverseDisplay">Reverse
Area filter<input type="text" [(ngModel)]="planSearchString"> display</mat-slide-toggle>
Act filter<select [(ngModel)]="planFilterAct"> <button mat-stroked-button color="warn" (click)="clearPlan()">Clear</button>
<option *ngFor="let item of acts" [ngValue]="item">{{item.name}}</option>
</select> <mat-form-field>
<mat-label>Area filter</mat-label>
<input matInput type="text" [(ngModel)]="planSearchString">
</mat-form-field>
<mat-form-field>
<mat-label>Act filter</mat-label>
<mat-select [(value)]="planFilterAct">
<mat-option *ngFor="let item of acts" [value]="item">{{item.name}}</mat-option>
</mat-select>
<!-- <select [(ngModel)]="planFilterAct">
<option *ngFor="let item of acts" [ngValue]="item">{{item.name}}</option>
</select> -->
</mat-form-field>
</div>
<h2>Plan</h2> <h2>Plan</h2>
<div cdkDropList #planList [cdkDropListData]="filterPlanElements()" class="list planlist" (cdkDropListDropped)="dropHandler($event)" [cdkDropListDisabled]="disabledPlanDD" [cdkDropListEnterPredicate]="canDrop"> <div cdkDropList #planList [cdkDropListData]="filterPlanElements()" class="list planlist"
<div class="box" *ngFor="let item of filterPlanElements()" cdkDrag (contextmenu)="addNote($event, item)"> (cdkDropListDropped)="dropHandler($event)" [cdkDropListDisabled]="disabledPlanDD"
<div class="content"> [cdkDropListEnterPredicate]="canDrop">
<div class="zone-name">{{areasMap?.get(item.area_key)?.name}}</div> <div class="box" *ngFor="let item of filterPlanElements()" cdkDrag (contextmenu)="addNote($event, item)">
<div class="act">Act {{areasMap?.get(item.area_key)?.act}}</div> <div class="content">
</div> <div class="zone-name">{{areasMap?.get(item.area_key)?.name}}</div>
<div *ngIf="item.notes" class="notes">(Note)</div> <div class="act">Act {{areasMap?.get(item.area_key)?.act}}</div>
<div class="index">#{{planIndexOf(item)}}</div> </div>
<div class="delete" (click)="remove(item)">+</div> <div *ngIf="item.notes" class="notes">(Note)</div>
<div class="index">#{{planIndexOf(item)}}</div>
<div class="delete" (click)="remove(item)">+</div>
</div> </div>
</div> </div>
<div cdkDropList [cdkDropListData]="plan.plan" class="list planlist end" style="position: relative;display: flex; flex-direction: column; justify-content: center;" (cdkDropListDropped)="dropEndHandler($event)"> <div cdkDropList [cdkDropListData]="plan.plan" class="list planlist end"
style="position: relative;display: flex; flex-direction: column; justify-content: center;"
(cdkDropListDropped)="dropEndHandler($event)">
<span style="position: absolute; ">Place at end of list</span> <span style="position: absolute; ">Place at end of list</span>
</div> </div>
</div> </div>

19
src/app/editor/editor.component.scss
Unescape View File

@ -1,4 +1,5 @@
:host {} @use '/src/app/scss/_palette.scss';
@use "sass:map";
.container { .container {
width: 400px; width: 400px;
@ -11,8 +12,8 @@
} }
.list { .list {
background: white; background: map.get(palette.$nothing-dark-map, 300);
border: solid 1px #ccc; border: solid 1px map.get(palette.$nothing-dark-map, 50);
display: block; display: block;
border-radius: 4px; border-radius: 4px;
min-height: 60px; min-height: 60px;
@ -31,14 +32,14 @@
.box { .box {
position: relative; position: relative;
border-bottom: solid 1px #ccc; border-bottom: solid 1px map.get(palette.$nothing-dark-map, 50);
color: rgba(0, 0, 0, 0.87); color: palette.$light-primary-text;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
cursor: move; cursor: move;
background-color: white; background-color: map.get(palette.$nothing-dark-map, 400);
font-size: 14px; font-size: 14px;
padding: 20px 20px 20px 5px; padding: 20px 20px 20px 5px;
width: 100%; width: 100%;
@ -64,7 +65,7 @@
font-size: 2em; font-size: 2em;
color: darken(red, 10%); color: darken(red, 10%);
position: absolute; position: absolute;
top: 0px; top: 2px;
right: 13px; right: 13px;
width: 15px; width: 15px;
height: 15px; height: 15px;
@ -113,4 +114,8 @@
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
justify-content: center; justify-content: center;
}
.right-settings {
gap: 8px;
} }

12
src/app/editor/editor.component.ts
Unescape View File

@ -20,6 +20,11 @@ import { PlanService } from '../_services/plan.service';
import { MatDialog, MatDialogModule } from '@angular/material/dialog'; import { MatDialog, MatDialogModule } from '@angular/material/dialog';
import { EditNotesComponentDialog } from './notes/notes.component'; import { EditNotesComponentDialog } from './notes/notes.component';
import { open } from '@tauri-apps/api/dialog'; import { open } from '@tauri-apps/api/dialog';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MatSelectModule} from '@angular/material/select';
import { MatButtonModule } from '@angular/material/button';
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
interface Act { interface Act {
value: number; value: number;
@ -37,7 +42,12 @@ interface Act {
CdkDropListGroup, CdkDropListGroup,
CdkDropList, CdkDropList,
CdkDrag, CdkDrag,
MatDialogModule MatDialogModule,
MatFormFieldModule,
MatInputModule,
MatSelectModule,
MatButtonModule,
MatSlideToggleModule
], ],
}) })
export class EditorComponent implements OnInit { export class EditorComponent implements OnInit {

10
src/app/plan-display/plan-display.component.html
Unescape View File

@ -41,11 +41,11 @@
[cdkConnectedOverlayOpen]="(settingsOpen || !planService.currentPlan) && overlayService.interactable" [cdkConnectedOverlayOpen]="(settingsOpen || !planService.currentPlan) && overlayService.interactable"
[cdkConnectedOverlayOrigin]="globalTopLeft" (detach)="settingsOpen = false"> [cdkConnectedOverlayOrigin]="globalTopLeft" (detach)="settingsOpen = false">
<div class="overlay container-fluid vw-100"> <div class="overlay container-fluid vw-100">
<div class="row"> <div class="row row-cols-2">
<div class="planChooser col-3 mt-4"> <div class="planChooser col-xs-6 col-sm-6 col-md-4 col-lg-3 col-xl-3">
<div> <div>
<button mat-raised-button color="accent" (click)="openDialog()">Browse Plans</button> <button class="col-xs-6" mat-raised-button color="accent" (click)="openDialog()">Browse Plans</button>
<button mat-raised-button color="accent" (click)="loadBasePlan()">Load base plan</button> <button class="col-xs-6" mat-raised-button color="accent" (click)="loadBasePlan()">Load base plan</button>
</div> </div>
<div class="enumerated"> <div class="enumerated">
<mat-list role="list"> <mat-list role="list">
@ -55,7 +55,7 @@
</div> </div>
</div> </div>
<settings class="col offset-3"></settings> <settings class="col-xs-6 col-sm-6 offset-md-3 col-md-5 offset-lg-5 col-lg-4 offset-xl-5 col-xl-4"></settings>
</div> </div>
<button mat-icon-button class="exit" *ngIf="planService.currentPlan" <button mat-icon-button class="exit" *ngIf="planService.currentPlan"
(click)="settingsOpen = false"><span>+</span></button> (click)="settingsOpen = false"><span>+</span></button>

136
src/app/scss/_palette.scss
Unescape View File

@ -28,24 +28,88 @@ $nothing-dark-map: (
A200 : #4da6a6, A200 : #4da6a6,
A400 : #375656, A400 : #375656,
A700 : #334040, A700 : #334040,
contrast: ( contrast: (50 : $dark-primary-text,
50 : $dark-primary-text, 100 : $dark-primary-text,
100 : $dark-primary-text, 200 : $light-primary-text,
200 : $light-primary-text, 300 : $light-primary-text,
300 : $light-primary-text, 400 : $light-primary-text,
400 : $light-primary-text, 500 : $light-primary-text,
500 : $light-primary-text, 600 : $light-primary-text,
600 : $light-primary-text, 700 : $light-primary-text,
700 : $light-primary-text, 800 : $light-primary-text,
800 : $light-primary-text, 900 : $light-primary-text,
900 : $light-primary-text, A100 : $dark-primary-text,
A100 : $dark-primary-text, A200 : $dark-primary-text,
A200 : $dark-primary-text, A400 : $light-primary-text,
A400 : $light-primary-text, A700 : $light-primary-text,
A700 : $light-primary-text,
) )
); );
$nothing-dark-map: (
50 : #acb7b7,
100 : #849393,
200 : #687777,
300 : #475151,
400 : #384040,
500 : #2a3030,
600 : #1c2020,
700 : #0d0f0f,
800 : #000000,
900 : #000000,
A100 : #8ecbcb,
A200 : #4da6a6,
A400 : #375656,
A700 : #334040,
contrast: (50 : $dark-primary-text,
100 : $dark-primary-text,
200 : $light-primary-text,
300 : $light-primary-text,
400 : $light-primary-text,
500 : $light-primary-text,
600 : $light-primary-text,
700 : $light-primary-text,
800 : $light-primary-text,
900 : $light-primary-text,
A100 : $dark-primary-text,
A200 : $dark-primary-text,
A400 : $light-primary-text,
A700 : $light-primary-text,
)
);
$nothing-light-map: (
50 : #ffffff,
100 : #ffffff,
200 : #ffffff,
300 : #ffffff,
400 : #f2f2f2,
500 : #e3e3e3,
600 : #d4d4d4,
700 : #c4c4c4,
800 : #b5b5b5,
900 : #a6a6a6,
A100 : #ffffff,
A200 : #ffffff,
A400 : #fdfcfc,
A700 : #f0efef,
contrast: (
50 : #000000,
100 : #000000,
200 : #000000,
300 : #000000,
400 : #000000,
500 : #000000,
600 : #000000,
700 : #000000,
800 : #000000,
900 : #000000,
A100 : #000000,
A200 : #000000,
A400 : #000000,
A700 : #000000,
)
);
@ -54,8 +118,8 @@ $nothing-theme-background-palette: (
app-bar: map.get($nothing-dark-map, 900), app-bar: map.get($nothing-dark-map, 900),
background: map.get($nothing-dark-map, 500), background: map.get($nothing-dark-map, 500),
hover: rgba(white, 0.04), hover: rgba(white, 0.04),
card: map.get($nothing-dark-map, 800), card: map.get($nothing-dark-map, 400),
dialog: map.get($nothing-dark-map, 800), dialog: map.get($nothing-dark-map, 500),
disabled-button: rgba(white, 0.12), disabled-button: rgba(white, 0.12),
raised-button: map.get($nothing-dark-map, 800), raised-button: map.get($nothing-dark-map, 800),
focused-button: $light-focused, focused-button: $light-focused,
@ -65,22 +129,22 @@ $nothing-theme-background-palette: (
unselected-chip: map.get($nothing-dark-map, 700), unselected-chip: map.get($nothing-dark-map, 700),
disabled-list-option: #243b53, disabled-list-option: #243b53,
tooltip: map.get($nothing-dark-map, 700), tooltip: map.get($nothing-dark-map, 700),
); );
$nothing-theme-foreground-palette: ( $nothing-theme-foreground-palette: (
base: white, base: white,
divider: $light-dividers, divider: $light-dividers,
dividers: $light-dividers, dividers: $light-dividers,
disabled: $light-disabled-text, disabled: $light-disabled-text,
disabled-button: rgba(white, 0.3), disabled-button: rgba(white, 0.3),
disabled-text: $light-disabled-text, disabled-text: $light-disabled-text,
elevation: black, elevation: black,
hint-text: $light-disabled-text, hint-text: $light-disabled-text,
secondary-text: $light-secondary-text, secondary-text: $light-secondary-text,
icon: white, icon: white,
icons: white, icons: white,
text: white, text: white,
slider-min: white, slider-min: white,
slider-off: rgba(white, 0.3), slider-off: rgba(white, 0.3),
slider-off-active: rgba(white, 0.3), slider-off-active: rgba(white, 0.3),
); );

2
src/app/scss/_theming.scss
Unescape View File

@ -1,7 +1,9 @@
@forward 'palette';
@use '@angular/material' as mat; @use '@angular/material' as mat;
@use 'sass:map'; @use 'sass:map';
@use 'palette'; @use 'palette';
@function define-nothing-theme($config) { @function define-nothing-theme($config) {
$theme: mat.define-dark-theme($config); $theme: mat.define-dark-theme($config);
$color: map.get($theme, color); $color: map.get($theme, color);

10
src/app/settings/bind-dialog.html
Unescape View File

@ -1,10 +1,12 @@
<div mat-dialog-content> <div mat-dialog-content class="overflow-visible">
<p>What's your favorite animal?</p> <p>What's your desired key</p>
<mat-form-field> <div class="container w-100 h-100">
<mat-label>data.title</mat-label> <mat-form-field appearance="outline" color="accent">
<mat-label>Key</mat-label>
<input matInput [(ngModel)]="data.chord" readonly RecordKeyChord (chord)="onChord($event)"> <input matInput [(ngModel)]="data.chord" readonly RecordKeyChord (chord)="onChord($event)">
</mat-form-field> </mat-form-field>
</div> </div>
</div>
<div mat-dialog-actions> <div mat-dialog-actions>
<button mat-button (click)="onNoClick()">Cancel</button> <button mat-button (click)="onNoClick()">Cancel</button>

78
src/app/settings/settings.component.html
Unescape View File

@ -1,43 +1,39 @@
<div class="d-flex w-100 h-100 align-items-center"> <div class="d-flex flex-column settings col">
<div class="d-flex flex-column settings col-xl-4 offset-xl-4 col-lg-6 offset-lg-3 col-md-8 offset-md-2 col-sm-10 offset-sm-1 col-xs-12"> <div class="row">
<div class="row"> <h1>
<h1> Settings
Settings <mat-divider></mat-divider>
<mat-divider></mat-divider> </h1>
</h1> </div>
</div> <div class="row">
<div class="row"> <color-picker [setColor]="configService.config.planBg" (color)="onPlanColorChange($event)">Plan window
<color-picker [setColor]="configService.config.planBg" (color)="onPlanColorChange($event)">Plan window background</color-picker>
background</color-picker> </div>
</div> <div class="row">
<div class="row"> <color-picker [setColor]="configService.config.backdropBg" (color)="onBackdropColorChange($event)">Overlay
<color-picker [setColor]="configService.config.backdropBg" backdrop color</color-picker>
(color)="onBackdropColorChange($event)">Overlay </div>
backdrop color</color-picker> <div class="row">
</div> <color-picker [setColor]="configService.config.noteDefaultFg" (color)="onNoteColorChange($event)">Overlay
<div class="row"> default
<color-picker [setColor]="configService.config.noteDefaultFg" font color</color-picker>
(color)="onNoteColorChange($event)">Overlay
default
font color</color-picker>
</div> </div>
<div class="row"> <div class="d-flex flex-row justify-content-between">
<mat-slide-toggle [color]="overlayService.isOverlay ? 'primary-on-dark' : 'primary'" <span class="d-block">Auto hide on unfocus</span>
[(ngModel)]="configService.config.hideOnUnfocus">Auto hide on unfocus</mat-slide-toggle> <mat-slide-toggle [color]="overlayService.isOverlay ? 'primary-on-dark' : 'primary'"
[(ngModel)]="configService.config.hideOnUnfocus"></mat-slide-toggle>
</div> </div>
<div class="row"> <div class="row">
<button mat-raised-button color="primary" (click)="rebindOverlayToggle()">Overlay toggle shortcut: <button mat-raised-button color="primary" (click)="rebindOverlayToggle()">Overlay toggle shortcut:
{{configService.config.toggleOverlay}}</button> {{configService.config.toggleOverlay}}</button>
</div> </div>
<div class="row"> <div class="row">
<button mat-raised-button color="primary" (click)="rebindPreviousZone()">Previous zone shortcut: <button mat-raised-button color="primary" (click)="rebindPreviousZone()">Previous zone shortcut:
{{configService.config.prev}}</button> {{configService.config.prev}}</button>
</div> </div>
<div class="row"> <div class="row">
<button mat-raised-button color="primary" (click)="rebindNextZone()">Next zone shortcut: <button mat-raised-button color="primary" (click)="rebindNextZone()">Next zone shortcut:
{{configService.config.next}}</button> {{configService.config.next}}</button>
</div> </div>
</div>
</div> </div>

2
src/app/settings/settings.component.scss
Unescape View File

@ -1,6 +1,6 @@
:host { :host {
display: block; display: block;
width: fit-content; // width: fit-content;
} }
.checkboxes { .checkboxes {

25
src/styles.scss
Unescape View File

@ -7,8 +7,9 @@
@include mat.core(); @include mat.core();
$nothing-primary-palette: mat.define-palette(mat.$indigo-palette, 500); $nothing-primary-palette: mat.define-palette(mat.$indigo-palette, 800);
$nothing-accent-palette: mat.define-palette(mat.$indigo-palette, 200); $nothing-darker-primary-palette: mat.define-palette(mat.$indigo-palette, 900);
$nothing-accent-palette: mat.define-palette(app.$nothing-light-map, 400);
$nothing-theme: app.define-nothing-theme(( $nothing-theme: app.define-nothing-theme((
color: ( color: (
@ -18,6 +19,14 @@ $nothing-theme: app.define-nothing-theme((
// density: 0, // density: 0,
)); ));
$nothing-darker-theme: app.define-nothing-theme((
color: (
primary: $nothing-darker-primary-palette,
accent: $nothing-accent-palette,
)
// density: 0,
));
.mat-primary-on-dark { .mat-primary-on-dark {
--mdc-theme-text-primary-on-background: white; --mdc-theme-text-primary-on-background: white;
} }
@ -59,4 +68,16 @@ div.picker_wrapper.popup {
.mat-divider { .mat-divider {
--mat-divider-color: mat.get-color-from-palette($nothing-primary-palette, 100); --mat-divider-color: mat.get-color-from-palette($nothing-primary-palette, 100);
}
.darker-primary {
@include mat.all-component-colors($nothing-darker-theme)
}
.mat-field-inside-dialog-workaround .mat-mdc-dialog-title + .mat-mdc-dialog-content {
padding-top: 4.3px;
}
.mdc-notched-outline__notch {
clip-path: none !important;
} }
Write Preview
Loading…
Cancel
Save