Skip to content

fix(ui): put the orCAL button in the top-left corner #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MotherSphere merged 1 commit into from
Oct 12, 2026
Merged

fix(ui): put the orCAL button in the top-left corner #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/ui/common/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,22 @@ select {
padding: 0 6px;
}

/* The orCAL name holds the top-left corner; the clock and the window controls
sit together on the right. At large text sizes they go under the name. */
.status {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
gap: 8px;
}

.status-end {
display: flex;
align-items: center;
gap: 8px;
margin-left: auto;
}

.status-icons {
display: flex;
align-items: center;
Expand Down Expand Up @@ -299,7 +308,6 @@ select {

/* The program's name: the way into Preferences (design/navigation.md). */
.status-brand {
align-self: flex-start;
display: inline-flex;
align-items: center;
gap: 8px;
Expand Down
56 changes: 29 additions & 27 deletions src/ui/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,38 @@
<div class="drag-region" data-tauri-drag-region aria-hidden="true"></div>
<header class="calculator-status" data-tauri-drag-region>
<div class="status" data-tauri-drag-region>
<div class="status-time" data-tauri-drag-region aria-live="polite">--:--</div>
<div class="status-icons" role="group" data-i18n-aria-label="window_controls">
<button
class="status-icon-button glyph"
type="button"
data-action="switch-layout"
data-layout="tablet"
data-i18n-aria-label="layout_switch_tablet"
data-i18n-title="layout_switch_tablet"
>&#xf04f6;</button>
<button
class="status-icon-button glyph"
type="button"
data-action="minimize"
data-i18n-aria-label="window_minimize"
data-i18n-title="window_minimize"
>&#xf05b0;</button>
<button
class="status-icon-button glyph"
type="button"
data-action="close"
data-i18n-aria-label="window_close"
data-i18n-title="window_close"
>&#xf0156;</button>
<button class="status-brand" type="button" data-i18n-title="settings_title">
orCAL<span class="glyph" aria-hidden="true">&#xf013;</span>
</button>
<div class="status-end" data-tauri-drag-region>
<div class="status-time" data-tauri-drag-region aria-live="polite">--:--</div>
<div class="status-icons" role="group" data-i18n-aria-label="window_controls">
<button
class="status-icon-button glyph"
type="button"
data-action="switch-layout"
data-layout="tablet"
data-i18n-aria-label="layout_switch_tablet"
data-i18n-title="layout_switch_tablet"
>&#xf04f6;</button>
<button
class="status-icon-button glyph"
type="button"
data-action="minimize"
data-i18n-aria-label="window_minimize"
data-i18n-title="window_minimize"
>&#xf05b0;</button>
<button
class="status-icon-button glyph"
type="button"
data-action="close"
data-i18n-aria-label="window_close"
data-i18n-title="window_close"
>&#xf0156;</button>
</div>
</div>
</div>
<div class="status-message" role="status" aria-live="polite"></div>
<button class="status-brand" type="button" data-i18n-title="settings_title">
orCAL<span class="glyph" aria-hidden="true">&#xf013;</span>
</button>
</header>

<section class="calculator-screen" aria-live="polite" data-calculator>
Expand Down
56 changes: 29 additions & 27 deletions src/ui/tablet-mode/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,38 @@
<div class="drag-region" data-tauri-drag-region aria-hidden="true"></div>
<header class="calculator-status" data-tauri-drag-region>
<div class="status" data-tauri-drag-region>
<div class="status-time" data-tauri-drag-region aria-live="polite">--:--</div>
<div class="status-icons" role="group" data-i18n-aria-label="window_controls">
<button
class="status-icon-button glyph"
type="button"
data-action="switch-layout"
data-layout="phone"
data-i18n-aria-label="layout_switch_phone"
data-i18n-title="layout_switch_phone"
>&#xf011c;</button>
<button
class="status-icon-button glyph"
type="button"
data-action="minimize"
data-i18n-aria-label="window_minimize"
data-i18n-title="window_minimize"
>&#xf05b0;</button>
<button
class="status-icon-button glyph"
type="button"
data-action="close"
data-i18n-aria-label="window_close"
data-i18n-title="window_close"
>&#xf0156;</button>
<button class="status-brand" type="button" data-i18n-title="settings_title">
orCAL<span class="glyph" aria-hidden="true">&#xf013;</span>
</button>
<div class="status-end" data-tauri-drag-region>
<div class="status-time" data-tauri-drag-region aria-live="polite">--:--</div>
<div class="status-icons" role="group" data-i18n-aria-label="window_controls">
<button
class="status-icon-button glyph"
type="button"
data-action="switch-layout"
data-layout="phone"
data-i18n-aria-label="layout_switch_phone"
data-i18n-title="layout_switch_phone"
>&#xf011c;</button>
<button
class="status-icon-button glyph"
type="button"
data-action="minimize"
data-i18n-aria-label="window_minimize"
data-i18n-title="window_minimize"
>&#xf05b0;</button>
<button
class="status-icon-button glyph"
type="button"
data-action="close"
data-i18n-aria-label="window_close"
data-i18n-title="window_close"
>&#xf0156;</button>
</div>
</div>
</div>
<div class="status-message" role="status" aria-live="polite"></div>
<button class="status-brand" type="button" data-i18n-title="settings_title">
orCAL<span class="glyph" aria-hidden="true">&#xf013;</span>
</button>
</header>

<section class="calculator-tablet-body" data-i18n-aria-label="calculator_scientific" data-calculator>
Expand Down
Loading