From 41955c5f562293e316ae047e71081cc57e77b322 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 13 Sep 2022 20:40:40 +0200 Subject: [PATCH] add gruopMenu --- webapp/assets/_new/styles/tokens.scss | 1 + webapp/components/Group/GroupList.vue | 89 ++++++++----- webapp/components/Group/GroupMenu.vue | 121 ++++++++++++++++++ .../_new/generic/BaseButton/BaseButton.vue | 12 +- 4 files changed, 188 insertions(+), 35 deletions(-) create mode 100644 webapp/components/Group/GroupMenu.vue diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss index 53abd01f8..d0cc49097 100644 --- a/webapp/assets/_new/styles/tokens.scss +++ b/webapp/assets/_new/styles/tokens.scss @@ -268,6 +268,7 @@ $size-avatar-large: 114px; * @presenter Spacing */ + $size-button-large: 50px; $size-button-base: 36px; $size-button-small: 26px; diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue index cb7f33901..8d0583e5a 100644 --- a/webapp/components/Group/GroupList.vue +++ b/webapp/components/Group/GroupList.vue @@ -1,21 +1,32 @@ - diff --git a/webapp/components/Group/GroupMenu.vue b/webapp/components/Group/GroupMenu.vue new file mode 100644 index 000000000..427297485 --- /dev/null +++ b/webapp/components/Group/GroupMenu.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/webapp/components/_new/generic/BaseButton/BaseButton.vue b/webapp/components/_new/generic/BaseButton/BaseButton.vue index d87598d76..e5c7fa047 100644 --- a/webapp/components/_new/generic/BaseButton/BaseButton.vue +++ b/webapp/components/_new/generic/BaseButton/BaseButton.vue @@ -46,7 +46,7 @@ export default { type: String, default: 'regular', validator(value) { - return value.match(/(small|regular)/) + return value.match(/(small|regular|large)/) }, }, type: { @@ -66,6 +66,7 @@ export default { if (this.danger) buttonClass += ' --danger' if (this.loading) buttonClass += ' --loading' if (this.size === 'small') buttonClass += ' --small' + if (this.size === 'large') buttonClass += ' --large' if (this.filled) buttonClass += ' --filled' else if (this.ghost) buttonClass += ' --ghost' @@ -123,6 +124,15 @@ export default { } } + &.--large { + height: $size-button-large; + font-size: $font-size-large; + + &.--circle { + width: $size-button-large; + } + } + &:not(.--icon-only) > .base-icon { margin-right: $space-xx-small; }