diff --git a/frontend/src/App.vue b/frontend/src/App.vue index a46af30..ad4af7c 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -41,34 +41,4 @@ a { outline: 0.1em solid $link-hover-color; } } - -button { - padding: $button-padding; - border-radius: $button-border-radius; - border-width: $button-border-width; - border-style: $button-border-style; - - cursor: pointer; - - @each $variant, $color in $variant-colors { - &.#{$variant} { - background-color: map-get($variant-text-colors, $variant); - border-color: $color; - color: $color; - - &:hover, &:active { - background-color: $color; - border-color: $color; - color: map-get($variant-text-colors, $variant); - } - - &:focus { - background-color: $color; - border-color: $page-background-color; - color: map-get($variant-text-colors, $variant); - outline: 0.1em solid $color; - } - } - } -} diff --git a/frontend/src/components/admin/StatisticsCard.vue b/frontend/src/components/admin/StatisticsCard.vue index 98f47c7..25b93f3 100644 --- a/frontend/src/components/admin/StatisticsCard.vue +++ b/frontend/src/components/admin/StatisticsCard.vue @@ -1,11 +1,11 @@ + + + + diff --git a/frontend/src/scss/_variables.scss b/frontend/src/scss/_variables.scss index 42362d4..a18c939 100644 --- a/frontend/src/scss/_variables.scss +++ b/frontend/src/scss/_variables.scss @@ -17,11 +17,11 @@ $variant-colors: ( info: #0097c4, ); $variant-text-colors: ( - // primary: do not use, contrast too low - success: $gray-darkest, - warning: $gray-darkest, - danger: $gray-darkest, - info: $gray-darkest, + primary: $black, + success: $black, + warning: $black, + danger: $black, + info: $black, ); $variant-color-primary: map-get($variant-colors, primary); @@ -48,10 +48,17 @@ $input-border: 0.1em solid $page-background-color; $input-border-radius: 0.5em; $input-focus-outline: 0.1em solid $variant-color-info; +$button-margin: 0.3em; $button-padding: 0.25em 0.5em; $button-border-radius: $input-border-radius; -$button-border-width: 0.1em; +$button-border-width: 0.15em; $button-border-style: solid; +$button-outline-width: 0.15em; +$button-sizes: ( + small: 0.8em, + medium: 1em, + large: 1.15em, +); // Navigation $nav-bar-background-color: $gray-dark; diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts index 2ee5f15..e38bc4f 100644 --- a/frontend/src/types/index.ts +++ b/frontend/src/types/index.ts @@ -1 +1,15 @@ export * from "./shared"; + +export enum ButtonSize { + SMALL = "small", + MEDIUM = "medium", + LARGE = "large", +} + +export enum ComponentVariant { + PRIMARY = "primary", + SUCCESS = "success", + WARNING = "warning", + DANGER = "danger", + INFO = "info", +} diff --git a/frontend/src/views/AdminDashboardView.vue b/frontend/src/views/AdminDashboardView.vue index 2774a70..c8eeaef 100644 --- a/frontend/src/views/AdminDashboardView.vue +++ b/frontend/src/views/AdminDashboardView.vue @@ -1,7 +1,7 @@ - +