diff --git a/webapp/src/assets/less/variables.less b/webapp/src/assets/less/variables.less index 364b7304..8f2df722 100644 --- a/webapp/src/assets/less/variables.less +++ b/webapp/src/assets/less/variables.less @@ -160,27 +160,6 @@ @sidebar-right-left: 0px; @sidebar-right-left-xl: 60px; -/** - * Self inverting colours - * - * These invert automatically when the theme inverts. these need to be used as css variables. - * They can be used without importing uikit/src/less/uikit.theme.less fully into the - * component. - */ - -:root { - --theme-text-colour: @global-color; - .hook-inverse() { - --theme-text-colour: @inverse-global-color; - } - - --theme-primary-background: @global-primary-background; - .hook-inverse() { - --theme-primary-background: @inverse-primary-muted-color; - } - -} - /* * Navbar */ @@ -281,3 +260,23 @@ } } + + +/* + * Interactive elements + */ + +.ofm-muted-interactive-text{ + color: @global-muted-color; + + &:hover { + color: @global-color; + } +} +.hook-inverse() { + .ofm-muted-interactive-text{ + &:hover { + color: @inverse-global-color; + } + } +} diff --git a/webapp/src/components/genericComponents/progressBar.vue b/webapp/src/components/genericComponents/progressBar.vue index d3be8815..9b44be8c 100644 --- a/webapp/src/components/genericComponents/progressBar.vue +++ b/webapp/src/components/genericComponents/progressBar.vue @@ -63,7 +63,7 @@ export default { .progress .indeterminate, .progress .determinate { - background-color: var(--theme-primary-background); + background-color: @global-primary-background; } .progress .indeterminate::before { diff --git a/webapp/src/components/labThingsComponents/actionProgressBar.vue b/webapp/src/components/labThingsComponents/actionProgressBar.vue index ce14bf7b..bb2ff988 100644 --- a/webapp/src/components/labThingsComponents/actionProgressBar.vue +++ b/webapp/src/components/labThingsComponents/actionProgressBar.vue @@ -81,7 +81,7 @@ export default { .progress .indeterminate, .progress .determinate { - background-color: var(--theme-primary-background); + background-color: @global-primary-background; } .progress .indeterminate::before { diff --git a/webapp/src/components/ui/matrixDisplay.vue b/webapp/src/components/ui/matrixDisplay.vue index 0cdf0ec4..9c7bf814 100644 --- a/webapp/src/components/ui/matrixDisplay.vue +++ b/webapp/src/components/ui/matrixDisplay.vue @@ -15,7 +15,7 @@