Skip to content

Commit d42ce66

Browse files
committed
ui and test fix
1 parent 4e617a8 commit d42ce66

20 files changed

Lines changed: 1690 additions & 1598 deletions

src/PrompterOne.Shared/Contracts/UiTestIds.Editor.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public static class Editor
3939
public const string FindBar = "editor-find-bar";
4040
public const string FindClose = "editor-find-close";
4141
public const string FindInput = "editor-find-input";
42+
public const string FindInputShell = "editor-find-input-shell";
4243
public const string FindNext = "editor-find-next";
4344
public const string FindPrevious = "editor-find-previous";
4445
public const string FindResult = "editor-find-result";

src/PrompterOne.Shared/Editor/Components/EditorFindBar.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@namespace PrompterOne.Shared.Components.Editor
22

33
<div class="ed-find-bar" data-test="@UiTestIds.Editor.FindBar">
4-
<label class="ed-find-input-shell">
4+
<label class="ed-find-input-shell" data-test="@UiTestIds.Editor.FindInputShell">
55
<UiIcon Kind="UiIconKind.Search" Size="14" />
66
<input class="ed-find-input"
77
type="text"
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
.ed-find-bar{display:flex;align-items:center;gap:12px;padding:10px 18px;border-bottom:1px solid var(--gold-08);background:linear-gradient(180deg, rgba(13,18,28,.92), rgba(10,14,24,.94));}
2+
.ed-find-input-shell{display:flex;align-items:center;gap:8px;min-width:240px;flex:1 1 260px;padding:0 12px;min-height:38px;border:1px solid rgba(223,187,124,.14);border-radius:12px;background:rgba(255,255,255,.03);color:var(--text-3);}
3+
.ed-find-input{width:100%;border:none;outline:none;background:transparent;color:var(--text-1);font:inherit;}
4+
.ed-find-input::placeholder{color:var(--text-4);}
5+
.ed-find-result{min-width:72px;font-size:12px;font-weight:600;color:var(--text-3);text-align:center;}
6+
.ed-find-actions{display:flex;align-items:center;gap:8px;margin-left:auto;}
7+
.ed-find-nav,.ed-find-close{font:inherit;cursor:pointer;min-height:36px;padding:0 12px;border:1px solid rgba(223,187,124,.14);border-radius:10px;background:rgba(255,255,255,.03);color:var(--text-2);}
8+
.ed-find-nav:hover,.ed-find-nav:focus-visible,.ed-find-close:hover,.ed-find-close:focus-visible{background:rgba(212,176,112,.08);color:var(--text-1);}
9+
.ed-find-nav:disabled{cursor:default;opacity:.42;}
10+
11+
html[data-theme="light"] .ed-find-bar,
12+
html.theme-light .ed-find-bar,
13+
body.theme-light .ed-find-bar {
14+
background: rgba(255, 255, 255, .94);
15+
border-bottom-color: rgba(107, 90, 72, .08);
16+
}
17+
18+
html[data-theme="light"] .ed-find-input-shell,
19+
html[data-theme="light"] .ed-find-nav,
20+
html[data-theme="light"] .ed-find-close,
21+
html.theme-light .ed-find-input-shell,
22+
html.theme-light .ed-find-nav,
23+
html.theme-light .ed-find-close,
24+
body.theme-light .ed-find-input-shell,
25+
body.theme-light .ed-find-nav,
26+
body.theme-light .ed-find-close {
27+
border-color: rgba(139, 115, 85, .12);
28+
background: rgba(107, 90, 72, .03);
29+
color: #5C4D3D;
30+
}
31+
32+
html[data-theme="light"] .ed-find-input,
33+
html.theme-light .ed-find-input,
34+
body.theme-light .ed-find-input {
35+
color: #2C2418;
36+
}

src/PrompterOne.Shared/Editor/Components/EditorSourcePanel.razor.css

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@
55
.ed-find-toggle,.ed-find-nav,.ed-find-close{font:inherit;cursor:pointer;}
66
.ed-find-toggle{display:inline-flex;align-items:center;gap:8px;min-height:32px;padding:0 12px;border:1px solid rgba(223,187,124,.14);border-radius:10px;background:rgba(255,255,255,.03);color:var(--text-2);}
77
.ed-find-toggle:hover,.ed-find-toggle:focus-visible{background:rgba(212,176,112,.08);color:var(--text-1);}
8-
.ed-find-bar{display:flex;align-items:center;gap:12px;padding:10px 18px;border-bottom:1px solid var(--gold-08);background:linear-gradient(180deg, rgba(13,18,28,.92), rgba(10,14,24,.94));}
9-
.ed-find-input-shell{display:flex;align-items:center;gap:8px;min-width:240px;flex:1 1 260px;padding:0 12px;min-height:38px;border:1px solid rgba(223,187,124,.14);border-radius:12px;background:rgba(255,255,255,.03);color:var(--text-3);}
10-
.ed-find-input{width:100%;border:none;outline:none;background:transparent;color:var(--text-1);font:inherit;}
11-
.ed-find-input::placeholder{color:var(--text-4);}
12-
.ed-find-result{min-width:72px;font-size:12px;font-weight:600;color:var(--text-3);text-align:center;}
13-
.ed-find-actions{display:flex;align-items:center;gap:8px;margin-left:auto;}
14-
.ed-find-nav,.ed-find-close{min-height:36px;padding:0 12px;border:1px solid rgba(223,187,124,.14);border-radius:10px;background:rgba(255,255,255,.03);color:var(--text-2);}
15-
.ed-find-nav:hover,.ed-find-nav:focus-visible,.ed-find-close:hover,.ed-find-close:focus-visible{background:rgba(212,176,112,.08);color:var(--text-1);}
16-
.ed-find-nav:disabled{cursor:default;opacity:.42;}
178
.tb-section{display:flex;flex:0 0 auto;flex-direction:column;align-items:center;padding:2px 8px;position:relative;}
189
.tb-label{font-size:10px;font-weight:600;letter-spacing:.6px;text-transform:uppercase;color:var(--text-3);margin-top:3px;white-space:nowrap;}
1910
.tb-row{display:flex;align-items:center;gap:2px;flex:1;}
@@ -184,36 +175,15 @@ body.theme-light .ed-toolbar {
184175
border-bottom-color: rgba(107, 90, 72, .1);
185176
}
186177

187-
html[data-theme="light"] .ed-find-bar,
188-
html.theme-light .ed-find-bar,
189-
body.theme-light .ed-find-bar {
190-
background: rgba(255, 255, 255, .94);
191-
border-bottom-color: rgba(107, 90, 72, .08);
192-
}
193-
194178
html[data-theme="light"] .ed-find-toggle,
195-
html[data-theme="light"] .ed-find-input-shell,
196-
html[data-theme="light"] .ed-find-nav,
197-
html[data-theme="light"] .ed-find-close,
198179
html.theme-light .ed-find-toggle,
199-
html.theme-light .ed-find-input-shell,
200-
html.theme-light .ed-find-nav,
201-
html.theme-light .ed-find-close,
202180
body.theme-light .ed-find-toggle,
203-
body.theme-light .ed-find-input-shell,
204-
body.theme-light .ed-find-nav,
205-
body.theme-light .ed-find-close {
181+
body.theme-light .ed-find-toggle {
206182
border-color: rgba(139, 115, 85, .12);
207183
background: rgba(107, 90, 72, .03);
208184
color: #5C4D3D;
209185
}
210186

211-
html[data-theme="light"] .ed-find-input,
212-
html.theme-light .ed-find-input,
213-
body.theme-light .ed-find-input {
214-
color: #2C2418;
215-
}
216-
217187
html[data-theme="light"] .tb-label,
218188
html.theme-light .tb-label,
219189
body.theme-light .tb-label {

src/PrompterOne.Shared/Teleprompter/Pages/TeleprompterPage.razor

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,37 @@
2323
CountdownCssClass="@BuildCountdownCssClass()" CountdownLabel="@BuildCountdownLabel()"
2424
OnBack="NavigateBackToEditorAsync" />
2525

26-
<TeleprompterReaderMirrorToggles FullscreenButtonCssClass="@BuildReaderFullscreenButtonCssClass()" FullscreenTitle="@ReaderFullscreenTitle"
27-
IsFullscreenActive="@_isReaderFullscreenActive" IsMirrorHorizontal="@_isReaderMirrorHorizontal"
28-
IsMirrorVertical="@_isReaderMirrorVertical" IsPortraitOrientation="@(_readerTextOrientation == ReaderTextOrientation.Portrait)"
29-
MirrorHorizontalButtonCssClass="@BuildReaderMirrorButtonCssClass(_isReaderMirrorHorizontal)" MirrorHorizontalLabel="@ReaderMirrorHorizontalLabel"
30-
MirrorHorizontalTitle="@ReaderMirrorHorizontalTitle" MirrorVerticalButtonCssClass="@BuildReaderMirrorButtonCssClass(_isReaderMirrorVertical)"
31-
MirrorVerticalLabel="@ReaderMirrorVerticalLabel" MirrorVerticalTitle="@ReaderMirrorVerticalTitle"
32-
OnToggleFullscreen="ToggleReaderFullscreenAsync" OnToggleMirrorHorizontal="ToggleReaderMirrorHorizontalAsync"
33-
OnToggleMirrorVertical="ToggleReaderMirrorVerticalAsync" OnToggleOrientation="ToggleReaderOrientationAsync"
34-
OrientationButtonCssClass="@BuildReaderOrientationButtonCssClass()" OrientationTitle="@ReaderOrientationTitle"
35-
TooltipCssClassFactory="BuildRailTooltipCssClass" TooltipDomIdFactory="BuildRailTooltipDomId"
36-
TooltipFocusIn="HandleRailTooltipFocusIn" TooltipFocusOut="HandleRailTooltipFocusOut"
37-
TooltipKeyDown="HandleRailTooltipKeyDown" TooltipPointerDown="HandleRailTooltipPointerDown"
38-
TooltipPointerEnter="HandleRailTooltipPointerEnter" TooltipPointerLeave="HandleRailTooltipPointerLeave"
39-
TooltipTestIdFactory="BuildRailTooltipTestId" />
40-
<TeleprompterReaderAlignmentControls AlignmentCenterButtonCssClass="@BuildReaderAlignmentButtonCssClass(ReaderTextAlignment.Center)"
41-
AlignmentJustifyButtonCssClass="@BuildReaderAlignmentButtonCssClass(ReaderTextAlignment.Justify)"
42-
AlignmentLeftButtonCssClass="@BuildReaderAlignmentButtonCssClass(ReaderTextAlignment.Left)"
43-
AlignmentRightButtonCssClass="@BuildReaderAlignmentButtonCssClass(ReaderTextAlignment.Right)"
44-
AlignCenterTitle="@ReaderTextAlignCenterTitle" AlignJustifyTitle="@ReaderTextAlignJustifyTitle"
45-
AlignLeftTitle="@ReaderTextAlignLeftTitle" AlignRightTitle="@ReaderTextAlignRightTitle"
46-
IsCenterAlignment="@(_readerTextAlignment == ReaderTextAlignment.Center)" IsJustifyAlignment="@(_readerTextAlignment == ReaderTextAlignment.Justify)"
47-
IsLeftAlignment="@(_readerTextAlignment == ReaderTextAlignment.Left)" IsRightAlignment="@(_readerTextAlignment == ReaderTextAlignment.Right)"
48-
OnSetCenterAlignment="@(() => SetReaderTextAlignmentAsync(ReaderTextAlignment.Center))" OnSetJustifyAlignment="@(() => SetReaderTextAlignmentAsync(ReaderTextAlignment.Justify))"
49-
OnSetLeftAlignment="@(() => SetReaderTextAlignmentAsync(ReaderTextAlignment.Left))" OnSetRightAlignment="@(() => SetReaderTextAlignmentAsync(ReaderTextAlignment.Right))"
26+
<div class="rd-left-rail">
27+
<TeleprompterReaderMirrorToggles FullscreenButtonCssClass="@BuildReaderFullscreenButtonCssClass()" FullscreenTitle="@ReaderFullscreenTitle"
28+
IsFullscreenActive="@_isReaderFullscreenActive" IsMirrorHorizontal="@_isReaderMirrorHorizontal"
29+
IsMirrorVertical="@_isReaderMirrorVertical" IsPortraitOrientation="@(_readerTextOrientation == ReaderTextOrientation.Portrait)"
30+
MirrorHorizontalButtonCssClass="@BuildReaderMirrorButtonCssClass(_isReaderMirrorHorizontal)" MirrorHorizontalLabel="@ReaderMirrorHorizontalLabel"
31+
MirrorHorizontalTitle="@ReaderMirrorHorizontalTitle" MirrorVerticalButtonCssClass="@BuildReaderMirrorButtonCssClass(_isReaderMirrorVertical)"
32+
MirrorVerticalLabel="@ReaderMirrorVerticalLabel" MirrorVerticalTitle="@ReaderMirrorVerticalTitle"
33+
OnToggleFullscreen="ToggleReaderFullscreenAsync" OnToggleMirrorHorizontal="ToggleReaderMirrorHorizontalAsync"
34+
OnToggleMirrorVertical="ToggleReaderMirrorVerticalAsync" OnToggleOrientation="ToggleReaderOrientationAsync"
35+
OrientationButtonCssClass="@BuildReaderOrientationButtonCssClass()" OrientationTitle="@ReaderOrientationTitle"
5036
TooltipCssClassFactory="BuildRailTooltipCssClass" TooltipDomIdFactory="BuildRailTooltipDomId"
5137
TooltipFocusIn="HandleRailTooltipFocusIn" TooltipFocusOut="HandleRailTooltipFocusOut"
5238
TooltipKeyDown="HandleRailTooltipKeyDown" TooltipPointerDown="HandleRailTooltipPointerDown"
5339
TooltipPointerEnter="HandleRailTooltipPointerEnter" TooltipPointerLeave="HandleRailTooltipPointerLeave"
5440
TooltipTestIdFactory="BuildRailTooltipTestId" />
41+
<TeleprompterReaderAlignmentControls AlignmentCenterButtonCssClass="@BuildReaderAlignmentButtonCssClass(ReaderTextAlignment.Center)"
42+
AlignmentJustifyButtonCssClass="@BuildReaderAlignmentButtonCssClass(ReaderTextAlignment.Justify)"
43+
AlignmentLeftButtonCssClass="@BuildReaderAlignmentButtonCssClass(ReaderTextAlignment.Left)"
44+
AlignmentRightButtonCssClass="@BuildReaderAlignmentButtonCssClass(ReaderTextAlignment.Right)"
45+
AlignCenterTitle="@ReaderTextAlignCenterTitle" AlignJustifyTitle="@ReaderTextAlignJustifyTitle"
46+
AlignLeftTitle="@ReaderTextAlignLeftTitle" AlignRightTitle="@ReaderTextAlignRightTitle"
47+
IsCenterAlignment="@(_readerTextAlignment == ReaderTextAlignment.Center)" IsJustifyAlignment="@(_readerTextAlignment == ReaderTextAlignment.Justify)"
48+
IsLeftAlignment="@(_readerTextAlignment == ReaderTextAlignment.Left)" IsRightAlignment="@(_readerTextAlignment == ReaderTextAlignment.Right)"
49+
OnSetCenterAlignment="@(() => SetReaderTextAlignmentAsync(ReaderTextAlignment.Center))" OnSetJustifyAlignment="@(() => SetReaderTextAlignmentAsync(ReaderTextAlignment.Justify))"
50+
OnSetLeftAlignment="@(() => SetReaderTextAlignmentAsync(ReaderTextAlignment.Left))" OnSetRightAlignment="@(() => SetReaderTextAlignmentAsync(ReaderTextAlignment.Right))"
51+
TooltipCssClassFactory="BuildRailTooltipCssClass" TooltipDomIdFactory="BuildRailTooltipDomId"
52+
TooltipFocusIn="HandleRailTooltipFocusIn" TooltipFocusOut="HandleRailTooltipFocusOut"
53+
TooltipKeyDown="HandleRailTooltipKeyDown" TooltipPointerDown="HandleRailTooltipPointerDown"
54+
TooltipPointerEnter="HandleRailTooltipPointerEnter" TooltipPointerLeave="HandleRailTooltipPointerLeave"
55+
TooltipTestIdFactory="BuildRailTooltipTestId" />
56+
</div>
5557
<TeleprompterReaderSliders FontMax="@ReaderMaxFontSize" FontMin="@ReaderMinFontSize" FontTitle="@ReaderFontSliderTitle"
5658
FontValue="@_readerFontSize" FocalMax="@ReaderMaxFocalPointPercent" FocalMin="@ReaderMinFocalPointPercent"
5759
FocalTitle="@ReaderFocalSliderTitle" FocalValue="@_readerFocalPointPercent" OnFontInput="HandleReaderFontSizeInputAsync"

0 commit comments

Comments
 (0)