From 625f9b40015895f65abf4510a47d066e16753464 Mon Sep 17 00:00:00 2001 From: Joe Knapper Date: Tue, 20 May 2025 12:59:49 +0100 Subject: [PATCH] Ttile case in all buttons and properties, larger settings headers --- webapp/src/assets/less/theme.less | 7 ++++++- webapp/src/components/appContent.vue | 10 +++++----- .../aboutComponents/devTools.vue | 6 ------ .../aboutComponents/statusPane.vue | 6 +++--- .../paneBackgroundDetect.vue | 8 ++++---- .../settingsComponents/CSMSettings.vue | 4 ++-- .../CSMCalibrationSettings.vue | 4 ++-- .../settingsComponents/cameraSettings.vue | 10 +++++----- .../cameraCalibrationSettings.vue | 10 +++++----- .../settingsComponents/streamSettings.vue | 4 ++-- .../tabContentComponents/settingsContent.vue | 9 ++++----- .../tabContentComponents/slideScanContent.vue | 14 +++++++------- 12 files changed, 45 insertions(+), 47 deletions(-) diff --git a/webapp/src/assets/less/theme.less b/webapp/src/assets/less/theme.less index a2a1dfcf..a8c6e80f 100644 --- a/webapp/src/assets/less/theme.less +++ b/webapp/src/assets/less/theme.less @@ -80,7 +80,11 @@ // Nav // -@nav-header-font-size: 12px; +@nav-header-font-size: 16px; +.uk-nav-header{ + text-transform:none; +} + // // Subnav @@ -358,6 +362,7 @@ a:hover { padding: 0 8px; border-color: @global-border; margin-bottom: 2px; + text-transform:none !important; } .uk-button-default { diff --git a/webapp/src/components/appContent.vue b/webapp/src/components/appContent.vue index 2662eebc..fcbf7296 100644 --- a/webapp/src/components/appContent.vue +++ b/webapp/src/components/appContent.vue @@ -205,27 +205,27 @@ export default { topTabs: function() { let tabs = [ { - id: "view", + id: "View", icon: "visibility", component: viewContent }, { - id: "navigate", + id: "Navigate", icon: "gamepad", component: navigateContent }, { - id: "background detect", + id: "Background Detect", icon: "background_replace", component: backgroundDetectContent }, { - id: "slide scan", + id: "Slide Scan", icon: "settings_overscan", component: slideScanContent }, { - id: "scan list", + id: "Scan List", icon: "photo_library", component: ScanListContent } diff --git a/webapp/src/components/tabContentComponents/aboutComponents/devTools.vue b/webapp/src/components/tabContentComponents/aboutComponents/devTools.vue index 0bcc9cb5..0c17a105 100644 --- a/webapp/src/components/tabContentComponents/aboutComponents/devTools.vue +++ b/webapp/src/components/tabContentComponents/aboutComponents/devTools.vue @@ -25,12 +25,6 @@ Apply -
- - -
diff --git a/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue b/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue index dc34291f..e3ca4f35 100644 --- a/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue +++ b/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue @@ -3,12 +3,12 @@
- Microscope hostname: + Microscope Hostname:
{{ $store.state.microscopeHostname }}
- API origin: + API Origin:
{{ $store.state.origin }}
@@ -24,7 +24,7 @@
- Server version:
+ Server Version:
TODO
diff --git a/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue b/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue index 11c4cc64..8d6c8bac 100644 --- a/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue +++ b/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue @@ -19,14 +19,14 @@
-

Camera/stage mapping

+

Camera to Stage Mapping

- Camera/stage mapping allows the stage to move relative to the camera + Camera-stage mapping allows the stage to move relative to the camera view. This enables functions like click-to-move, and more precise tile scans.

diff --git a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue index 5c9d02c4..8c892057 100644 --- a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue +++ b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue @@ -11,7 +11,7 @@ " thing="camera_stage_mapping" action="calibrate_xy" - :submit-label="'Auto-Calibrate using camera'" + :submit-label="'Auto-Calibrate Using Camera'" :modal-progress="true" @response="onRecalibrateResponse" @error="modalError" @@ -24,7 +24,7 @@ class="uk-button uk-button-default uk-width-1-1" @click="getCalibrationData()" > - Download calibration data + Download Calibration Data
diff --git a/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue index 2ad51115..69f3f837 100644 --- a/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue +++ b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue @@ -13,19 +13,19 @@ Pi Camera Settings
Image Quality
@@ -32,7 +32,7 @@ :requires-confirmation="false" thing="camera" action="calibrate_white_balance" - :submit-label="'Auto white balance'" + :submit-label="'Auto White Balance'" @response="onRecalibrateResponse" @error="modalError" /> @@ -47,7 +47,7 @@ " thing="camera" action="calibrate_lens_shading" - :submit-label="'Auto flat field correction'" + :submit-label="'Auto Flat Field Correction'" @response="onRecalibrateResponse" @error="modalError" /> @@ -63,7 +63,7 @@ :requires-confirmation="false" thing="camera" action="flat_lens_shading" - :submit-label="'Disable flat field correction'" + :submit-label="'Disable Flat Field Correction'" @response="onRecalibrateResponse" @error="modalError" /> @@ -78,7 +78,7 @@ :requires-confirmation="false" thing="camera" action="reset_lens_shading" - :submit-label="'Reset flat field correction'" + :submit-label="'Reset Flat Field Correction'" @response="onRecalibrateResponse" @error="modalError" /> diff --git a/webapp/src/components/tabContentComponents/settingsComponents/streamSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/streamSettings.vue index c85ff7d9..b6013c11 100644 --- a/webapp/src/components/tabContentComponents/settingsComponents/streamSettings.vue +++ b/webapp/src/components/tabContentComponents/settingsComponents/streamSettings.vue @@ -1,10 +1,10 @@