Skip to content

Commit 2e89b98

Browse files
Finalize re-work of toolbar
1 parent ddddbc4 commit 2e89b98

3 files changed

Lines changed: 67 additions & 45 deletions

File tree

apps/notebook/components/src/app/components/animation-controls/animation-controls.component.html

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,53 @@
22
fxLayout="row"
33
fxLayoutAlign="center center"
44
class="renderer-toolbar"
5-
style="max-width: 350px"
5+
style="max-width: 350px; padding-top: 5px"
66
>
7-
<!-- icons and buttons -->
8-
<div fxLayout="row" fxLayoutAlign="center center" style="padding-right: 15px">
9-
<p style="padding-right: 10px">{{ multiplierText() }}</p>
10-
<mat-icon
11-
svgIcon="fast-rewind"
12-
(click)="slowDown()"
13-
class="icon-button"
14-
></mat-icon>
15-
<mat-icon
16-
*ngIf="isPaused"
17-
svgIcon="play"
18-
(click)="pauseOrPlay()"
19-
class="icon-button"
20-
></mat-icon>
21-
<mat-icon
22-
*ngIf="!isPaused"
23-
svgIcon="pause"
24-
(click)="pauseOrPlay()"
25-
class="icon-button"
26-
></mat-icon>
27-
<mat-icon
28-
svgIcon="fast-forward"
29-
(click)="speedUp()"
30-
class="icon-button"
31-
></mat-icon>
32-
</div>
7+
<div fxLayout="row" fxLayoutAlign="center center" class="toolbar">
8+
<!-- icons and buttons -->
9+
<div
10+
fxLayout="row"
11+
fxLayoutAlign="center center"
12+
style="padding-left: 10px; padding-right: 15px"
13+
>
14+
<p style="padding-right: 10px">{{ multiplierText() }}</p>
15+
<mat-icon
16+
svgIcon="fast-rewind"
17+
(click)="slowDown()"
18+
class="icon-button"
19+
></mat-icon>
20+
<mat-icon
21+
*ngIf="isPaused"
22+
svgIcon="play"
23+
(click)="pauseOrPlay()"
24+
class="icon-button"
25+
></mat-icon>
26+
<mat-icon
27+
*ngIf="!isPaused"
28+
svgIcon="pause"
29+
(click)="pauseOrPlay()"
30+
class="icon-button"
31+
></mat-icon>
32+
<mat-icon
33+
svgIcon="fast-forward"
34+
(click)="speedUp()"
35+
class="icon-button"
36+
></mat-icon>
37+
</div>
3338

34-
<div class="custom-slider">
35-
<input
36-
type="range"
37-
[value]="frame"
38-
min="0"
39-
max="{{ nFrames - 1 }}"
40-
(mousedown)="pause()"
41-
(mouseup)="play()"
42-
(input)="onInputChange($event)"
43-
/>
44-
</div>
39+
<div class="custom-slider" style="padding-right: 10px">
40+
<input
41+
type="range"
42+
[value]="frame"
43+
min="0"
44+
max="{{ nFrames - 1 }}"
45+
(mousedown)="pause()"
46+
(mouseup)="play()"
47+
(input)="onInputChange($event)"
48+
/>
49+
</div>
4550

46-
<!-- <mat-slider
51+
<!-- <mat-slider
4752
style="width: 50%"
4853
min="0"
4954
max="{{ nFrames - 1 }}"
@@ -57,4 +62,5 @@
5762
(input)="onInputChange($event)"
5863
/>
5964
</mat-slider> -->
65+
</div>
6066
</div>

apps/notebook/components/src/app/components/map/map.component.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
<div class="map-container cell-item-full-height" style="position: relative">
44
<canvas #MapCanvas></canvas>
55

6-
<div class="map-controls" fxLayout="row" fxLayoutAlign="space-around center">
6+
<div
7+
class="map-controls toolbar"
8+
fxLayout="row"
9+
fxLayoutAlign="space-around center"
10+
>
711
<mat-icon
812
(click)="resetView()"
913
class="icon-button"

apps/notebook/components/src/app/styles/shared-styles.scss

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ $cell-height-limit: 500px;
3535
// override class for more compact icon buttons without "<button>"
3636
.icon-button {
3737
cursor: pointer;
38-
color: var(--vscode-activityBar-foreground);
38+
// color: var(--vscode-activityBar-foreground);
3939
}
4040

4141
.renderer-toolbar {
@@ -77,18 +77,30 @@ $cell-height-limit: 500px;
7777
max-width: calc(100% - 50px);
7878
}
7979

80+
.toolbar {
81+
color: var(--vscode-activityBar-foreground);
82+
background: var(--vscode-activityBar-background);
83+
border-radius: 10px;
84+
padding: 5px;
85+
}
86+
8087
.map-controls {
8188
position: absolute;
8289
left: 5px;
8390
bottom: 5px;
84-
padding: 5px;
85-
background: var(--vscode-activityBar-background);
86-
border-radius: 10px;
8791
}
8892

8993
.custom-slider {
9094
input[type='range'] {
91-
accent-color: var(--vscode-activityBarBadge-background) !important;
95+
accent-color: var(--vscode-activityBar-foreground) !important;
96+
outline: var(--vscode-activityBar-foreground) !important;
97+
}
98+
99+
::-webkit-slider-thumb {
100+
-webkit-appearance: none; /* Override default look */
101+
outline-style: solid !important;
102+
outline-width: 1px !important;
103+
outline: var(--vscode-activityBar-foreground) !important;
92104
}
93105

94106
:focus {

0 commit comments

Comments
 (0)