Skip to content

Commit

Permalink
Format & Fix linting
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphiiko committed Mar 16, 2024
1 parent 3531ee2 commit 0cc781e
Show file tree
Hide file tree
Showing 59 changed files with 293 additions and 239 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[style.width]="innerWidth"
>
<div class="brightness-slider-bar-label"
><span>{{ (dragging ? dragValue : value) | number : '1.0-0' }}%</span></div
><span>{{ (dragging ? dragValue : value) | number : '1.0-0' }}%</span></div
>
</div>
<div class="brightness-slider-bar-range-guide" #rangeGuideEl></div>
Expand Down
13 changes: 8 additions & 5 deletions src-ui/app/components/color-picker/color-picker.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<div class="color-input-wrapper"
[style.--picked-color]="cssColor"
[class.disabled]="disabled"
>
<input type="color" [value]="hexValue" (input)="onColorChange(colorInput.value)" #colorInput [disabled]="disabled" />
<div class="color-input-wrapper" [style.--picked-color]="cssColor" [class.disabled]="disabled">
<input
type="color"
[value]="hexValue"
(input)="onColorChange(colorInput.value)"
#colorInput
[disabled]="disabled"
/>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ input {
outline: none;
border: var(--color-surface-3) 0.2em solid;
border-radius: 0.5em;
transition: all .15s ease;
transition: all 0.15s ease;
position: relative;
overflow: hidden;


&.disabled {
opacity: 0.5;
}
Expand All @@ -46,7 +45,7 @@ input {
left: 0;
position: absolute;
opacity: 0.25;
background: linear-gradient(210deg, rgba(255, 255, 255, 1.0) 0%, rgba(0, 0, 0, 1.0) 100%);
background: linear-gradient(210deg, rgba(255, 255, 255, 1) 0%, rgba(0, 0, 0, 1) 100%);
pointer-events: none;
}

Expand Down
5 changes: 4 additions & 1 deletion src-ui/app/components/color-picker/color-picker.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ export class ColorPickerComponent {
public get color(): [number, number, number] {
return this._color;
}
@Input() public set color(value: [number, number, number]) {

@Input()
public set color(value: [number, number, number]) {
this._color = value;
this.hexValue = this.rgbToHex(value);
}

@Output() public colorChange = new EventEmitter<[number, number, number]>();
protected hexValue = '#ffffff';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
<div class="text-wrapper" *ngIf="!error">
<div class="line0">{{ activeBinding?.localizedControllerType }}</div>
<div class="line1"
>{{ activeBinding?.localizedHand }} {{ activeBinding?.localizedInputSource }}</div
>
<div class="line2">{{
'comp.controller-binding.slot.' + activeBinding?.slotName | translate
}}</div>
>{{ activeBinding?.localizedHand }} {{ activeBinding?.localizedInputSource }}
</div>
<div class="line2"
>{{ 'comp.controller-binding.slot.' + activeBinding?.slotName | translate }}
</div>
</div>
</button>
<div class="dropdown-container">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,11 @@
color: var(--color-text-2);
cursor: pointer;
transition: all 0.15s;

&:hover {
background: var(--color-surface-1);
}

&:active {
opacity: 0.6;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
'gpuAutomations',
'resolutionAutomations',
'audioVolumeAutomations',
'hmdAutomations',
'hmdAutomations'
])
"
>
Expand All @@ -48,7 +48,7 @@
</div>
<div class="menu-item-label" translate>comp.dashboard-navbar.hardwareAutomations</div>
<div class="menu-item-submenu-icon"
><i class="material-icons-round">arrow_forward_ios</i></div
><i class="material-icons-round">arrow_forward_ios</i></div
>
</div>

Expand All @@ -70,7 +70,7 @@
</div>
<div class="menu-item-label" translate>comp.dashboard-navbar.vrcAutomations</div>
<div class="menu-item-submenu-icon"
><i class="material-icons-round">arrow_forward_ios</i></div
><i class="material-icons-round">arrow_forward_ios</i></div
>
</div>

Expand All @@ -84,7 +84,7 @@
</div>
<div class="menu-item-label" translate>comp.dashboard-navbar.miscAutomations</div>
<div class="menu-item-submenu-icon"
><i class="material-icons-round">arrow_forward_ios</i></div
><i class="material-icons-round">arrow_forward_ios</i></div
>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
.logo-title {
font-size: 2em;
font-weight: 300;

b {
font-weight: 500;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<button class="btn btn-secondary" (click)="audioDeviceService.getAudioDevices()"
>Refresh Devices</button
>
>Refresh Devices
</button>
<div class="device-lists">
<div class="device-list">
<h3>Render Devices</h3>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,22 @@
display: flex;
flex-direction: row;
align-items: flex-start;

.device-list {
flex: 1;

&:not(:first-child) {
margin-left: 1em;
}

.device {
margin-bottom: 1em;
background: var(--color-surface-1);
padding: 1em;
display: flex;
flex-direction: column;
align-items: stretch;

.row {
display: flex;
flex-direction: row;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
></app-select-box>
</div>
<div class="chart-container">
<div class="timeseries-chart" #sleepDetectionTimeSeriesChart> </div>
<div class="timeseries-chart" #sleepDetectionTimeSeriesChart></div>
</div>
<div class="state-handling-timeline">
<h3>Report Handling Timeline</h3>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

.state-handling-timeline {
user-select: all;

&-entry {
display: flex;
flex-direction: row;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<h3>Navigation</h3>
<div class="row">
<button class="btn btn-secondary" (click)="navigateTo(['translation'])"
>Translation Module</button
>
>Translation Module
</button>
</div>
<h3>Actions</h3>
<button class="btn btn-secondary" (click)="openBindingConfig()">Open Binding Config</button>
Expand All @@ -11,11 +11,11 @@ <h3>Actions</h3>
<h3>Notification Sounds</h3>
<div class="row">
<button class="btn btn-secondary" (click)="playSound('notification_bell')"
>notification_bell</button
>
>notification_bell
</button>
<button class="btn btn-secondary" (click)="playSound('notification_block')"
>notification_block</button
>
>notification_block
</button>
<button class="btn btn-secondary" (click)="playSound('mic_mute')">mic_mute</button>
<button class="btn btn-secondary" (click)="playSound('mic_unmute')">mic_unmute</button>
<app-slider-setting [(value)]="soundVolume" [max]="200"></app-slider-setting>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
</div>
<div class="header-bar-info" (click)="editDevice()">
<div class="device-name" translate>{{ deviceName }}</div>
<div class="device-serial" *ngIf="!deviceNickname && deviceRole">{{
'comp.device-list.deviceRole.' + deviceRole | translate
}}</div>
<div class="device-serial" *ngIf="!deviceNickname && !deviceRole">{{
deviceIdentifier
}}</div>
<div class="device-serial" *ngIf="!deviceNickname && deviceRole"
>{{ 'comp.device-list.deviceRole.' + deviceRole | translate }}
</div>
<div class="device-serial" *ngIf="!deviceNickname && !deviceRole"
>{{ deviceIdentifier }}
</div>
<div class="device-nickname" *ngIf="deviceNickname">{{ deviceNickname }}</div>
</div>
<div class="header-bar-spacer"></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
&.power-on {
--spinner-color: var(--color-alert-success);
}

&.power-off {
--spinner-color: var(--color-alert-error);
}
Expand Down
5 changes: 5 additions & 0 deletions src-ui/app/components/device-list/device-list.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
flex-direction: row;
align-items: center;
padding: 0 1em;

span {
vertical-align: middle;
}
Expand Down Expand Up @@ -81,9 +82,11 @@
margin-right: 0.4em;
filter: invert(24%) sepia(84%) saturate(1782%) hue-rotate(340deg) brightness(106%) contrast(93%);
}

> i.material-icons {
margin-left: -0.3em;
}

&:hover {
.category-icon {
filter: invert(99%) sepia(0%) saturate(2934%) hue-rotate(279deg) brightness(116%)
Expand Down Expand Up @@ -116,12 +119,14 @@

&:not(:disabled) {
cursor: pointer;

&:hover {
background: var(--color-surface-2);
}

&:active {
background: var(--color-surface-1);

& > * {
opacity: 0.8;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="pane modal modal-lg" @fadeUp>
<div class="pane-title" translate> comp.hotkey-selector-modal.title </div>
<div class="pane-title" translate> comp.hotkey-selector-modal.title</div>
<div class="pane-content">
<p translate>comp.hotkey-selector-modal.description</p>
<div class="input-wrapper">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
transition: all 0.3s;
margin: 0;
padding: 0;

&.success {
font-weight: 700;
color: var(--color-vrchat-status-green);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
<div *ngIf="selected" @hshrink>
{{ hotkeyString }}
</div>
<div *ngIf="!selected" @hshrink translate> comp.hotkey-selector.select </div>
<div *ngIf="!selected" @hshrink translate> comp.hotkey-selector.select</div>
</button>
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ button {
display: flex;
flex-direction: row;
align-items: center;

& > div {
overflow: hidden;
white-space: nowrap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ p {
flex-direction: column;
align-items: center;
justify-content: center;

i.material-icons {
font-size: 0.75em;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,13 +218,16 @@ $background-color: var(--color-surface-2);
margin: 0;
transition: all 0.15s;
opacity: 0.5;

i {
opacity: 1;
color: white;
}

&.active {
opacity: 1;
}

&:active {
opacity: 0.5;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export class OscScriptSimpleEditorComponent implements OnInit {
this.scriptChange.emit(this._script);
});
}

onAdd(item: DropdownItem) {
switch (item.id) {
case 'COMMAND':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
height: 20em;
position: relative;
filter: url(#ambilight);

.stage {
transition: all 0.25s ease;
position: absolute;
Expand Down
1 change: 1 addition & 0 deletions src-ui/app/components/slider/slider.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ $thumb-size: 1.25em;

&-fill {
border-radius: 0.125em;

&,
&-audio-level {
height: 100%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
&-logo {
flex-shrink: 0;
padding: 0 2em 0 1em;

img {
width: 4em;
height: 4em;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ p,
padding: 1em;
border-radius: var(--surface-border-radius);
background-color: var(--color-surface-1);

.left {
flex: 1;
}

.right {
flex-shrink: 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,5 @@
}}%)</span
>
</div>
<div class="right"> </div>
<div class="right"></div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,13 @@
align-items: stretch;
justify-content: space-between;
background: var(--color-surface-3);

.left {
font-weight: 700;
flex: 1;
padding: 0.5em 1em;
}

.right {
flex-shrink: 0;
}
Expand Down
Loading

0 comments on commit 0cc781e

Please sign in to comment.