From 3d645d2c00e339652eb91b60d3c38f7c44b44c0d Mon Sep 17 00:00:00 2001 From: Victor Klomp Date: Tue, 12 Dec 2023 17:57:25 +0100 Subject: [PATCH 01/11] Added theme basic and remove severity="danger" --- .../AddContainerDialogComponent.vue | 4 +- src/components/ChangeApiKeyComponent.vue | 2 +- src/components/ChangeInfoComponent.vue | 1 - src/components/ChangePasswordComponent.vue | 1 - src/components/ChangePinComponent.vue | 2 +- src/components/ProductCreateComponent.vue | 2 +- src/components/TermsOfServiceModal.vue | 2 +- src/components/TopupModalComponent.vue | 2 +- src/main.ts | 2 +- src/styles/primevue-base/_colors.scss | 18 + src/styles/primevue-base/_common.scss | 75 ++ src/styles/primevue-base/_components.scss | 103 ++ src/styles/primevue-base/_mixins.scss | 250 +++++ .../components/button/_button.scss | 564 +++++++++++ .../components/button/_speeddial.scss | 97 ++ .../components/button/_splitbutton.scss | 390 ++++++++ .../components/data/_carousel.scss | 37 + .../components/data/_datatable.scss | 342 +++++++ .../components/data/_dataview.scss | 47 + .../components/data/_filter.scss | 138 +++ .../components/data/_orderlist.scss | 70 ++ .../components/data/_organizationchart.scss | 50 + .../components/data/_paginator.scss | 92 ++ .../components/data/_picklist.scss | 70 ++ .../components/data/_timeline.scss | 38 + .../primevue-base/components/data/_tree.scss | 90 ++ .../components/data/_treetable.scss | 251 +++++ .../components/file/_fileupload.scss | 82 ++ .../components/input/_autocomplete.scss | 114 +++ .../components/input/_calendar.scss | 251 +++++ .../components/input/_cascadeselect.scss | 106 +++ .../components/input/_checkbox.scss | 86 ++ .../components/input/_chips.scss | 53 ++ .../components/input/_colorpicker.scss | 18 + .../components/input/_dropdown.scss | 147 +++ .../components/input/_editor.scss | 122 +++ .../components/input/_inputgroup.scss | 74 ++ .../components/input/_inputnumber.scss | 5 + .../components/input/_inputswitch.scss | 62 ++ .../components/input/_inputtext.scss | 100 ++ .../components/input/_listbox.scss | 89 ++ .../components/input/_multiselect.scss | 166 ++++ .../components/input/_password.scss | 33 + .../components/input/_radiobutton.scss | 78 ++ .../components/input/_rating.scss | 60 ++ .../components/input/_selectbutton.scss | 50 + .../components/input/_slider.scss | 49 + .../components/input/_togglebutton.scss | 52 + .../components/input/_treeselect.scss | 91 ++ .../components/menu/_breadcrumb.scss | 42 + .../components/menu/_contextmenu.scss | 39 + .../primevue-base/components/menu/_dock.scss | 95 ++ .../components/menu/_megamenu.scss | 55 ++ .../primevue-base/components/menu/_menu.scss | 33 + .../components/menu/_menubar.scss | 141 +++ .../components/menu/_panelmenu.scss | 153 +++ .../primevue-base/components/menu/_steps.scss | 56 ++ .../components/menu/_tabmenu.scss | 49 + .../components/menu/_tieredmenu.scss | 43 + .../components/messages/_inlinemessage.scss | 64 ++ .../components/messages/_message.scss | 100 ++ .../components/messages/_toast.scss | 100 ++ .../components/misc/_avatar.scss | 30 + .../primevue-base/components/misc/_badge.scss | 48 + .../components/misc/_blockui.scss | 0 .../primevue-base/components/misc/_chip.scss | 39 + .../components/misc/_inplace.scss | 17 + .../components/misc/_progressbar.scss | 17 + .../components/misc/_progressspinner.scss | 49 + .../components/misc/_scrolltop.scss | 25 + .../components/misc/_skeleton.scss | 8 + .../primevue-base/components/misc/_tag.scss | 40 + .../components/misc/_terminal.scss | 12 + .../components/multimedia/_galleria.scss | 151 +++ .../components/multimedia/_image.scss | 54 ++ .../components/overlay/_confirmpopup.scss | 72 ++ .../components/overlay/_dialog.scss | 64 ++ .../components/overlay/_overlaypanel.scss | 64 ++ .../components/overlay/_sidebar.scss | 23 + .../components/overlay/_tooltip.scss | 33 + .../components/panel/_accordion.scss | 118 +++ .../primevue-base/components/panel/_card.scss | 30 + .../components/panel/_divider.scss | 31 + .../components/panel/_fieldset.scss | 51 + .../components/panel/_panel.scss | 47 + .../components/panel/_scrollpanel.scss | 11 + .../components/panel/_splitter.scss | 24 + .../components/panel/_tabview.scss | 66 ++ .../components/panel/_toolbar.scss | 11 + src/styles/themes/_extensions.scss | 1 + src/styles/themes/_fonts.scss | 3 + src/styles/themes/_variables.scss | 10 + src/styles/themes/_vendor_extensions.scss | 16 + .../themes/sudosos-dark/_variables_dark.scss | 889 ++++++++++++++++++ src/styles/themes/sudosos-dark/theme.scss | 6 + .../sudosos-light/_variables_light.scss | 889 ++++++++++++++++++ src/styles/themes/sudosos-light/theme.scss | 6 + src/views/LoginView.vue | 2 +- src/views/PasswordResetView.vue | 4 +- src/views/PointOfSale/POSInfoView.vue | 1 - src/views/ProductsContainersView.vue | 2 +- src/views/SingleUserView.vue | 2 +- src/views/TermsOfServiceView.vue | 1 - src/views/UserOverView.vue | 7 +- 104 files changed, 8551 insertions(+), 21 deletions(-) create mode 100644 src/styles/primevue-base/_colors.scss create mode 100644 src/styles/primevue-base/_common.scss create mode 100644 src/styles/primevue-base/_components.scss create mode 100644 src/styles/primevue-base/_mixins.scss create mode 100644 src/styles/primevue-base/components/button/_button.scss create mode 100644 src/styles/primevue-base/components/button/_speeddial.scss create mode 100644 src/styles/primevue-base/components/button/_splitbutton.scss create mode 100644 src/styles/primevue-base/components/data/_carousel.scss create mode 100644 src/styles/primevue-base/components/data/_datatable.scss create mode 100644 src/styles/primevue-base/components/data/_dataview.scss create mode 100644 src/styles/primevue-base/components/data/_filter.scss create mode 100644 src/styles/primevue-base/components/data/_orderlist.scss create mode 100644 src/styles/primevue-base/components/data/_organizationchart.scss create mode 100644 src/styles/primevue-base/components/data/_paginator.scss create mode 100644 src/styles/primevue-base/components/data/_picklist.scss create mode 100644 src/styles/primevue-base/components/data/_timeline.scss create mode 100644 src/styles/primevue-base/components/data/_tree.scss create mode 100644 src/styles/primevue-base/components/data/_treetable.scss create mode 100644 src/styles/primevue-base/components/file/_fileupload.scss create mode 100644 src/styles/primevue-base/components/input/_autocomplete.scss create mode 100644 src/styles/primevue-base/components/input/_calendar.scss create mode 100644 src/styles/primevue-base/components/input/_cascadeselect.scss create mode 100644 src/styles/primevue-base/components/input/_checkbox.scss create mode 100644 src/styles/primevue-base/components/input/_chips.scss create mode 100644 src/styles/primevue-base/components/input/_colorpicker.scss create mode 100644 src/styles/primevue-base/components/input/_dropdown.scss create mode 100644 src/styles/primevue-base/components/input/_editor.scss create mode 100644 src/styles/primevue-base/components/input/_inputgroup.scss create mode 100644 src/styles/primevue-base/components/input/_inputnumber.scss create mode 100644 src/styles/primevue-base/components/input/_inputswitch.scss create mode 100644 src/styles/primevue-base/components/input/_inputtext.scss create mode 100644 src/styles/primevue-base/components/input/_listbox.scss create mode 100644 src/styles/primevue-base/components/input/_multiselect.scss create mode 100644 src/styles/primevue-base/components/input/_password.scss create mode 100644 src/styles/primevue-base/components/input/_radiobutton.scss create mode 100644 src/styles/primevue-base/components/input/_rating.scss create mode 100644 src/styles/primevue-base/components/input/_selectbutton.scss create mode 100644 src/styles/primevue-base/components/input/_slider.scss create mode 100644 src/styles/primevue-base/components/input/_togglebutton.scss create mode 100644 src/styles/primevue-base/components/input/_treeselect.scss create mode 100644 src/styles/primevue-base/components/menu/_breadcrumb.scss create mode 100644 src/styles/primevue-base/components/menu/_contextmenu.scss create mode 100644 src/styles/primevue-base/components/menu/_dock.scss create mode 100644 src/styles/primevue-base/components/menu/_megamenu.scss create mode 100644 src/styles/primevue-base/components/menu/_menu.scss create mode 100644 src/styles/primevue-base/components/menu/_menubar.scss create mode 100644 src/styles/primevue-base/components/menu/_panelmenu.scss create mode 100644 src/styles/primevue-base/components/menu/_steps.scss create mode 100644 src/styles/primevue-base/components/menu/_tabmenu.scss create mode 100644 src/styles/primevue-base/components/menu/_tieredmenu.scss create mode 100644 src/styles/primevue-base/components/messages/_inlinemessage.scss create mode 100644 src/styles/primevue-base/components/messages/_message.scss create mode 100644 src/styles/primevue-base/components/messages/_toast.scss create mode 100644 src/styles/primevue-base/components/misc/_avatar.scss create mode 100644 src/styles/primevue-base/components/misc/_badge.scss create mode 100644 src/styles/primevue-base/components/misc/_blockui.scss create mode 100644 src/styles/primevue-base/components/misc/_chip.scss create mode 100644 src/styles/primevue-base/components/misc/_inplace.scss create mode 100644 src/styles/primevue-base/components/misc/_progressbar.scss create mode 100644 src/styles/primevue-base/components/misc/_progressspinner.scss create mode 100644 src/styles/primevue-base/components/misc/_scrolltop.scss create mode 100644 src/styles/primevue-base/components/misc/_skeleton.scss create mode 100644 src/styles/primevue-base/components/misc/_tag.scss create mode 100644 src/styles/primevue-base/components/misc/_terminal.scss create mode 100644 src/styles/primevue-base/components/multimedia/_galleria.scss create mode 100644 src/styles/primevue-base/components/multimedia/_image.scss create mode 100644 src/styles/primevue-base/components/overlay/_confirmpopup.scss create mode 100644 src/styles/primevue-base/components/overlay/_dialog.scss create mode 100644 src/styles/primevue-base/components/overlay/_overlaypanel.scss create mode 100644 src/styles/primevue-base/components/overlay/_sidebar.scss create mode 100644 src/styles/primevue-base/components/overlay/_tooltip.scss create mode 100644 src/styles/primevue-base/components/panel/_accordion.scss create mode 100644 src/styles/primevue-base/components/panel/_card.scss create mode 100644 src/styles/primevue-base/components/panel/_divider.scss create mode 100644 src/styles/primevue-base/components/panel/_fieldset.scss create mode 100644 src/styles/primevue-base/components/panel/_panel.scss create mode 100644 src/styles/primevue-base/components/panel/_scrollpanel.scss create mode 100644 src/styles/primevue-base/components/panel/_splitter.scss create mode 100644 src/styles/primevue-base/components/panel/_tabview.scss create mode 100644 src/styles/primevue-base/components/panel/_toolbar.scss create mode 100644 src/styles/themes/_extensions.scss create mode 100644 src/styles/themes/_fonts.scss create mode 100644 src/styles/themes/_variables.scss create mode 100644 src/styles/themes/_vendor_extensions.scss create mode 100644 src/styles/themes/sudosos-dark/_variables_dark.scss create mode 100644 src/styles/themes/sudosos-dark/theme.scss create mode 100644 src/styles/themes/sudosos-light/_variables_light.scss create mode 100644 src/styles/themes/sudosos-light/theme.scss diff --git a/src/components/AddContainerDialogComponent.vue b/src/components/AddContainerDialogComponent.vue index 6f7e8075..00f06ef3 100644 --- a/src/components/AddContainerDialogComponent.vue +++ b/src/components/AddContainerDialogComponent.vue @@ -48,8 +48,8 @@ {{ errors.isPublic }}
- - + +
diff --git a/src/components/ChangeApiKeyComponent.vue b/src/components/ChangeApiKeyComponent.vue index 0de72ea4..1babecaa 100644 --- a/src/components/ChangeApiKeyComponent.vue +++ b/src/components/ChangeApiKeyComponent.vue @@ -5,7 +5,7 @@

{{apiKeyMessage || ' '}}

-
diff --git a/src/components/ChangeInfoComponent.vue b/src/components/ChangeInfoComponent.vue index 2b199849..ef5bcae4 100644 --- a/src/components/ChangeInfoComponent.vue +++ b/src/components/ChangeInfoComponent.vue @@ -19,7 +19,6 @@
-
diff --git a/src/components/ProductCreateComponent.vue b/src/components/ProductCreateComponent.vue index 8c5edd4e..ec119d08 100644 --- a/src/components/ProductCreateComponent.vue +++ b/src/components/ProductCreateComponent.vue @@ -52,7 +52,7 @@ {{ errors.owner }}
- +
diff --git a/src/components/TermsOfServiceModal.vue b/src/components/TermsOfServiceModal.vue index ea101f59..24d84856 100644 --- a/src/components/TermsOfServiceModal.vue +++ b/src/components/TermsOfServiceModal.vue @@ -15,7 +15,7 @@
diff --git a/src/components/TopupModalComponent.vue b/src/components/TopupModalComponent.vue index 3201bc22..5c3761ec 100644 --- a/src/components/TopupModalComponent.vue +++ b/src/components/TopupModalComponent.vue @@ -9,7 +9,7 @@ diff --git a/src/main.ts b/src/main.ts index 843d0fbd..a0dc2716 100644 --- a/src/main.ts +++ b/src/main.ts @@ -10,7 +10,7 @@ import App from './App.vue'; import router from './router'; import PrimeVue from 'primevue/config'; import Button from "primevue/button"; -import "primevue/resources/themes/bootstrap4-light-blue/theme.css"; +import "./styles/themes/sudosos-light/theme.scss"; import InputText from "primevue/inputtext"; import Menubar from "primevue/menubar"; import Panel from "primevue/panel"; diff --git a/src/styles/primevue-base/_colors.scss b/src/styles/primevue-base/_colors.scss new file mode 100644 index 00000000..de705905 --- /dev/null +++ b/src/styles/primevue-base/_colors.scss @@ -0,0 +1,18 @@ +:root { + @if variable-exists(colors) { + @each $name, $color in $colors { + @for $i from 0 through 5 { + @if ($i == 0) { + --#{$name}-50:#{tint($color, (5 - $i) * 19%)}; + } + @else { + --#{$name}-#{$i * 100}:#{tint($color, (5 - $i) * 19%)}; + } + } + + @for $i from 1 through 4 { + --#{$name}-#{($i + 5) * 100}:#{shade($color, $i * 15%)}; + } + } + } +} \ No newline at end of file diff --git a/src/styles/primevue-base/_common.scss b/src/styles/primevue-base/_common.scss new file mode 100644 index 00000000..7723961d --- /dev/null +++ b/src/styles/primevue-base/_common.scss @@ -0,0 +1,75 @@ +* { + box-sizing: border-box; +} + +.p-component { + font-family: var(--font-family); + font-feature-settings: var(--font-feature-settings, normal); + font-size: $fontSize; + font-weight: $fontWeight; +} + +.p-component-overlay { + background-color: $maskBg; + transition-duration: $transitionDuration; +} + +.p-disabled, .p-component:disabled { + opacity: $disabledOpacity; +} + +.p-error { + color: $errorColor; +} + +.p-text-secondary { + color: $textSecondaryColor; +} + +.pi { + font-size: $primeIconFontSize; +} + +.p-icon { + width: $primeIconFontSize; + height: $primeIconFontSize; +} + +.p-link { + font-family: var(--font-family); + font-feature-settings: var(--font-feature-settings, normal); + font-size: $fontSize; + border-radius: $borderRadius; + + &:focus-visible { + @include focused(); + } +} + +.p-component-overlay-enter { + animation: p-component-overlay-enter-animation 150ms forwards; +} + +.p-component-overlay-leave { + animation: p-component-overlay-leave-animation 150ms forwards; +} + +.p-component-overlay { + @keyframes p-component-overlay-enter-animation { + from { + background-color: transparent; + } + to { + background-color: var(--maskbg); + } + } + + @keyframes p-component-overlay-leave-animation { + from { + background-color: var(--maskbg); + } + to { + background-color: transparent; + } + } +} diff --git a/src/styles/primevue-base/_components.scss b/src/styles/primevue-base/_components.scss new file mode 100644 index 00000000..cc76ab94 --- /dev/null +++ b/src/styles/primevue-base/_components.scss @@ -0,0 +1,103 @@ +@import '_mixins'; +@import '_colors'; + +@import './components/input/_editor'; + +@layer primevue { + @import '_common'; + + //Input + @import './components/input/_autocomplete'; + @import './components/input/_calendar'; + @import './components/input/_cascadeselect'; + @import './components/input/_checkbox'; + @import './components/input/_chips'; + @import './components/input/_colorpicker'; + @import './components/input/_dropdown'; + @import './components/input/_inputgroup'; + @import './components/input/_inputnumber'; + @import './components/input/_inputswitch'; + @import './components/input/_inputtext'; + @import './components/input/_listbox'; + @import './components/input/_multiselect'; + @import './components/input/_password'; + @import './components/input/_radiobutton'; + @import './components/input/_rating'; + @import './components/input/_selectbutton'; + @import './components/input/_slider'; + @import './components/input/_treeselect'; + @import './components/input/_togglebutton'; + + //Button + @import './components/button/_button'; + @import './components/button/_speeddial'; + @import './components/button/_splitbutton'; + + //Data + @import './components/data/_carousel'; + @import './components/data/_datatable'; + @import './components/data/_dataview'; + @import './components/data/_filter'; + @import './components/data/_orderlist'; + @import './components/data/_organizationchart'; + @import './components/data/_paginator'; + @import './components/data/_picklist'; + @import './components/data/_timeline'; + @import './components/data/_tree'; + @import './components/data/_treetable'; + + //Panel + @import './components/panel/_accordion'; + @import './components/panel/_card'; + @import './components/panel/_fieldset'; + @import './components/panel/_divider'; + @import './components/panel/_panel'; + @import './components/panel/_scrollpanel'; + @import './components/panel/_splitter'; + @import './components/panel/_tabview'; + @import './components/panel/_toolbar'; + + //Overlay + @import './components/overlay/_confirmpopup'; + @import './components/overlay/_dialog'; + @import './components/overlay/_overlaypanel'; + @import './components/overlay/_sidebar'; + @import './components/overlay/_tooltip'; + + //File + @import './components/file/_fileupload'; + + //Menu + @import './components/menu/_breadcrumb'; + @import './components/menu/_contextmenu'; + @import './components/menu/_dock'; + @import './components/menu/_megamenu'; + @import './components/menu/_menu'; + @import './components/menu/_menubar'; + @import './components/menu/_panelmenu'; + @import './components/menu/_steps'; + @import './components/menu/_tabmenu'; + @import './components/menu/_tieredmenu'; + + //Messages + @import './components/messages/_inlinemessage'; + @import './components/messages/_message'; + @import 'components/messages/toast'; + + //MultiMedia + @import './components/multimedia/_galleria'; + @import './components/multimedia/_image'; + + //Misc + @import './components/misc/_avatar'; + @import './components/misc/_badge'; + @import './components/misc/_blockui'; + @import './components/misc/_chip'; + @import './components/misc/_inplace'; + @import './components/misc/_progressbar'; + @import './components/misc/_progressspinner'; + @import './components/misc/_scrolltop'; + @import './components/misc/_skeleton'; + @import './components/misc/_tag'; + @import './components/misc/_terminal'; +} \ No newline at end of file diff --git a/src/styles/primevue-base/_mixins.scss b/src/styles/primevue-base/_mixins.scss new file mode 100644 index 00000000..d09daa87 --- /dev/null +++ b/src/styles/primevue-base/_mixins.scss @@ -0,0 +1,250 @@ +@mixin icon-override($icon) { + &:before { + content: $icon; + } +} + +@mixin focused() { + outline: $focusOutline; + outline-offset: $focusOutlineOffset; + box-shadow: $focusShadow; +} + +@mixin focused-inset() { + outline: $focusOutline; + outline-offset: $focusOutlineOffset; + box-shadow: inset $focusShadow; +} + +@mixin focused-input() { + @include focused(); + border-color: $inputFocusBorderColor; +} + +@mixin focused-listitem() { + outline: $focusOutline; + outline-offset: $focusOutlineOffset; + box-shadow: $inputListItemFocusShadow; +} + +@mixin invalid-input() { + border-color: $inputErrorBorderColor; +} + +@mixin menuitem { + > .p-menuitem-content { + color: $menuitemTextColor; + transition: $listItemTransition; + border-radius: $menuitemBorderRadius; + + .p-menuitem-link { + color: $menuitemTextColor; + padding: $menuitemPadding; + user-select: none; + + .p-menuitem-text { + color: $menuitemTextColor; + } + + .p-menuitem-icon { + color: $menuitemIconColor; + margin-right: $inlineSpacing; + } + + .p-submenu-icon { + color: $menuitemIconColor; + } + } + } + + &.p-highlight { + > .p-menuitem-content { + color: $menuitemTextActiveColor; + background: $menuitemActiveBg; + + .p-menuitem-link { + .p-menuitem-text { + color: $menuitemTextActiveColor; + } + + .p-menuitem-icon, .p-submenu-icon { + color: $menuitemIconActiveColor; + } + } + } + + &.p-focus { + > .p-menuitem-content { + background: $menuitemActiveFocusBg; + } + } + } + + &:not(.p-highlight):not(.p-disabled) { + &.p-focus { + > .p-menuitem-content { + color: $menuitemTextFocusColor; + background: $menuitemFocusBg; + + .p-menuitem-link { + .p-menuitem-text { + color: $menuitemTextFocusColor; + } + + .p-menuitem-icon, .p-submenu-icon { + color: $menuitemIconFocusColor; + } + } + } + } + + > .p-menuitem-content { + &:hover { + color: $menuitemTextHoverColor; + background: $menuitemHoverBg; + + .p-menuitem-link { + .p-menuitem-text { + color: $menuitemTextHoverColor; + } + + .p-menuitem-icon, .p-submenu-icon { + color: $menuitemIconHoverColor; + } + } + } + } + } +} + +@mixin horizontal-rootmenuitem { + > .p-menuitem-content { + color: $horizontalMenuRootMenuitemTextColor; + transition: $listItemTransition; + border-radius: $horizontalMenuRootMenuitemBorderRadius; + + .p-menuitem-link { + padding: $horizontalMenuRootMenuitemPadding; + user-select: none; + + .p-menuitem-text { + color: $horizontalMenuRootMenuitemTextColor; + } + + .p-menuitem-icon { + color: $horizontalMenuRootMenuitemIconColor; + margin-right: $inlineSpacing; + } + + .p-submenu-icon { + color: $horizontalMenuRootMenuitemIconColor; + margin-left: $inlineSpacing; + } + } + } + + &:not(.p-highlight):not(.p-disabled) { + > .p-menuitem-content { + &:hover { + color: $horizontalMenuRootMenuitemTextHoverColor; + background: $horizontalMenuRootMenuitemHoverBg; + + .p-menuitem-link { + .p-menuitem-text { + color: $horizontalMenuRootMenuitemTextHoverColor; + } + + .p-menuitem-icon, .p-submenu-icon { + color: $horizontalMenuRootMenuitemIconHoverColor; + } + } + } + } + } +} + +@mixin placeholder { + ::-webkit-input-placeholder { + @content + } + :-moz-placeholder { + @content + } + ::-moz-placeholder { + @content + } + :-ms-input-placeholder { + @content + } +} + +@mixin scaledPadding($val, $scale) { + padding: nth($val, 1) * $scale nth($val, 2) * $scale; +} + +@mixin scaledFontSize($val, $scale) { + font-size: $val * $scale; +} + +@mixin nested-submenu-indents($val, $index, $length) { + .p-submenu-list { + .p-menuitem { + .p-menuitem-content { + .p-menuitem-link { + padding-left: $val * ($index + 1); + } + + } + @if $index < $length { + @include nested-submenu-indents($val, $index + 2, $length); + } + } + } +} + +@mixin action-icon($enabled: true) { + width: $actionIconWidth; + height: $actionIconHeight; + color: $actionIconColor; + border: $actionIconBorder; + background: $actionIconBg; + border-radius: $actionIconBorderRadius; + transition: $actionIconTransition; + + @if $enabled { + &:enabled:hover { + @include action-icon-hover(); + } + } @else { + &:hover { + @include action-icon-hover(); + } + } + + &:focus-visible { + @include focused(); + } +} + +@mixin action-icon-hover() { + color: $actionIconHoverColor; + border-color: $actionIconHoverBorderColor; + background: $actionIconHoverBg; +} + +@mixin button-states { + //
diff --git a/src/views/PasswordResetView.vue b/src/views/PasswordResetView.vue index fa2183c2..21a1ca24 100644 --- a/src/views/PasswordResetView.vue +++ b/src/views/PasswordResetView.vue @@ -21,7 +21,7 @@ {{ emailForm.errors.value.email }} - +
{{ $t('login.Back to login') }}
diff --git a/src/views/SingleUserView.vue b/src/views/SingleUserView.vue index dcb88cb7..989928dc 100644 --- a/src/views/SingleUserView.vue +++ b/src/views/SingleUserView.vue @@ -27,7 +27,7 @@ {{ errors.userType }} - + diff --git a/src/views/TermsOfServiceView.vue b/src/views/TermsOfServiceView.vue index 96c1e98f..9e5eeec0 100644 --- a/src/views/TermsOfServiceView.vue +++ b/src/views/TermsOfServiceView.vue @@ -22,7 +22,6 @@ diff --git a/src/views/UserOverView.vue b/src/views/UserOverView.vue index d6285aeb..fb7899ae 100644 --- a/src/views/UserOverView.vue +++ b/src/views/UserOverView.vue @@ -23,7 +23,7 @@ - +
@@ -48,7 +48,6 @@ - + + From 8ca1d52157a9ea5c1c0f10af682a525373845ade Mon Sep 17 00:00:00 2001 From: Samuel Date: Tue, 12 Dec 2023 19:51:10 +0100 Subject: [PATCH 02/11] Fixed HomeView.vue en App.vue to use primeflex --- src/App.vue | 6 ------ src/assets/base.css | 1 + src/styles/BasePage.css | 5 +---- src/views/HomeView.vue | 13 ++----------- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/App.vue b/src/App.vue index efb4020b..10f0e3b1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,9 +8,3 @@ import Toast from "primevue/toast"; - - diff --git a/src/assets/base.css b/src/assets/base.css index 9fe6b2db..2eeec9c8 100644 --- a/src/assets/base.css +++ b/src/assets/base.css @@ -60,6 +60,7 @@ body { min-height: 100vh; + margin: 0; color: var(--color-text); background: var(--color-background); transition: color 0.5s, background-color 0.5s; diff --git a/src/styles/BasePage.css b/src/styles/BasePage.css index a4d06666..dec155fe 100644 --- a/src/styles/BasePage.css +++ b/src/styles/BasePage.css @@ -17,13 +17,10 @@ } .page-container { - margin-top: 4rem; - margin-left: auto; - margin-right: auto; width: 100%; padding-left: 15px; padding-right: 15px; - margin-bottom: 80px; + margin: 4rem auto 80px; } @media (min-width: 992px) { diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 652145a5..8cfcc608 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -1,10 +1,9 @@