diff --git a/src/assets/styles/bootstrap/_variables.scss b/src/assets/styles/bootstrap/_variables.scss index 245cb056..4298f5a2 100644 --- a/src/assets/styles/bootstrap/_variables.scss +++ b/src/assets/styles/bootstrap/_variables.scss @@ -74,6 +74,10 @@ $primary: #1E7295 !default; $secondary: #185D79 !default; $tertiary: #2DABC2 !default; $quaternary: #2B91A7 !default; +$mirage: #131e25 !default; +$aztec: #0d171d !default; +$cello-light: #21516e !default; +$cello-dark: #1e465e !default; $success: $green !default; $info: $cyan !default; @@ -86,8 +90,20 @@ $light-dark: $gray-800 !default; // scss-docs-end theme-color-variables +$bg-tertiary-split-background: repeating-linear-gradient($tertiary, $tertiary 50%, $quaternary 50%, $quaternary 100%) !default; +$bg-mirage-split-background: repeating-linear-gradient($mirage, $mirage 50%, $aztec 50%, $aztec 100%) !default; +$bg-cello-split-background: repeating-linear-gradient($cello-light, $cello-light 50%, $cello-dark 50%, $cello-dark 100%) !default; + .bg-tertiary-split { - background: repeating-linear-gradient($tertiary, $tertiary 50%, $quaternary 50%, $quaternary 100%); + background: $bg-tertiary-split-background; +} + +.bg-mirage-split { + background: $bg-mirage-split-background; +} + +.bg-cello-split { + background: $bg-cello-split-background; } // scss-docs-start theme-colors-map diff --git a/src/views/room/widgets/avatar-info/views/own-avatar/AvatarInfoWidgetOwnAvatarView.tsx b/src/views/room/widgets/avatar-info/views/own-avatar/AvatarInfoWidgetOwnAvatarView.tsx index 43be5dbb..b722a725 100644 --- a/src/views/room/widgets/avatar-info/views/own-avatar/AvatarInfoWidgetOwnAvatarView.tsx +++ b/src/views/room/widgets/avatar-info/views/own-avatar/AvatarInfoWidgetOwnAvatarView.tsx @@ -110,7 +110,7 @@ export const AvatarInfoWidgetOwnAvatarView: FC { userData.name } - + { (mode === MODE_NORMAL) && <> processAction('decorate') }> @@ -193,6 +193,63 @@ export const AvatarInfoWidgetOwnAvatarView: FC } + { (mode === MODE_SIGNS) && + <> + processAction('sign_1') }> + 1 + + processAction('sign_2') }> + 2 + + processAction('sign_3') }> + 3 + + processAction('sign_4') }> + 4 + + processAction('sign_5') }> + 5 + + processAction('sign_6') }> + 6 + + processAction('sign_7') }> + 7 + + processAction('sign_8') }> + 8 + + processAction('sign_9') }> + 9 + + processAction('sign_10') }> + 10 + + processAction('sign_0') }> + 0 + + processAction('sign_15') }> + + + processAction('sign_12') }> + + + processAction('sign_14') }> + + + processAction('sign_17') }> + + + processAction('sign_16') }> + + + processAction('sign_13') }> + + + processAction('sign_11') }> + + + } ); diff --git a/src/views/room/widgets/context-menu/ContextMenu.scss b/src/views/room/widgets/context-menu/ContextMenu.scss index 50e9f149..8f1fded7 100644 --- a/src/views/room/widgets/context-menu/ContextMenu.scss +++ b/src/views/room/widgets/context-menu/ContextMenu.scss @@ -1,6 +1,51 @@ .nitro-context-menu { - - @import './views/header/ContextMenuHeaderView'; - @import './views/list/ContextMenuListView'; - @import './views/list-item/ContextMenuListItemView'; + width: 150px; + max-width: 150px; + padding: 2px; + background-color: #1c323f; + border: 2px solid rgba($white, 0.5); + border-radius: $border-radius; + font-size: $font-size-sm; + + &:after { + content: ""; + position: absolute; + bottom: -8px; + left: 0; + right: 0; + margin: auto; + height: 10px; + width: 10px; + transform: rotate(45deg); + border-color: transparent rgba($white, 0.5) rgba($white, 0.5) transparent; + border-style: solid; + border-width: 6px; + } + + .menu-header { + background-color: #3d5f6e; + color: $white; + height: 25px; + max-height: 25px; + } + + .menu-list { + margin: 0; + + .menu-list-item-container { + margin-top: 2px; + + .menu-list-item { + height: 24px; + max-height: 24px; + padding: 3px; + background: $bg-mirage-split-background; + cursor: pointer; + + &:hover { + background: $bg-cello-split-background; + } + } + } + } } diff --git a/src/views/room/widgets/context-menu/ContextMenuView.tsx b/src/views/room/widgets/context-menu/ContextMenuView.tsx index 9d886462..7dd3463e 100644 --- a/src/views/room/widgets/context-menu/ContextMenuView.tsx +++ b/src/views/room/widgets/context-menu/ContextMenuView.tsx @@ -8,7 +8,7 @@ const fadeLength = 75; export const ContextMenuView: FC = props => { const { objectId = -1, category = -1, fades = false, close = null, children = null } = props; - const [ pos, setPos ] = useState<{ x: number, y: number }>({ x: -1, y: -1}); + const [ pos, setPos ] = useState<{ x: number, y: number }>({ x: null, y: null }); const [ opacity, setOpacity ] = useState(1); const [ isFading, setIsFading ] = useState(false); const [ fadeTime, setFadeTime ] = useState(0); @@ -73,7 +73,7 @@ export const ContextMenuView: FC = props => }, [ fades ]); return ( -
-1 ? 'visible' : 'invisible') } style={ { left: pos.x, top: pos.y, opacity: opacity } }> +
{ children }
); diff --git a/src/views/room/widgets/context-menu/views/header/ContextMenuHeaderView.scss b/src/views/room/widgets/context-menu/views/header/ContextMenuHeaderView.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/src/views/room/widgets/context-menu/views/header/ContextMenuHeaderView.tsx b/src/views/room/widgets/context-menu/views/header/ContextMenuHeaderView.tsx index e7a73dad..e8991af2 100644 --- a/src/views/room/widgets/context-menu/views/header/ContextMenuHeaderView.tsx +++ b/src/views/room/widgets/context-menu/views/header/ContextMenuHeaderView.tsx @@ -6,7 +6,7 @@ export const ContextMenuHeaderView: FC = props => const { children = null } = props; return ( -
+
{ children }
); diff --git a/src/views/room/widgets/context-menu/views/list-item/ContextMenuListItemView.scss b/src/views/room/widgets/context-menu/views/list-item/ContextMenuListItemView.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/src/views/room/widgets/context-menu/views/list-item/ContextMenuListItemView.tsx b/src/views/room/widgets/context-menu/views/list-item/ContextMenuListItemView.tsx index 1bc955a6..6220e916 100644 --- a/src/views/room/widgets/context-menu/views/list-item/ContextMenuListItemView.tsx +++ b/src/views/room/widgets/context-menu/views/list-item/ContextMenuListItemView.tsx @@ -6,8 +6,10 @@ export const ContextMenuListItemView: FC = props = const { onClick = null, children = null } = props; return ( -
- { children } +
+
+ { children } +
) } diff --git a/src/views/room/widgets/context-menu/views/list/ContextMenuListView.scss b/src/views/room/widgets/context-menu/views/list/ContextMenuListView.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/src/views/room/widgets/context-menu/views/list/ContextMenuListView.tsx b/src/views/room/widgets/context-menu/views/list/ContextMenuListView.tsx index 7046bf5f..d90c8f6d 100644 --- a/src/views/room/widgets/context-menu/views/list/ContextMenuListView.tsx +++ b/src/views/room/widgets/context-menu/views/list/ContextMenuListView.tsx @@ -3,10 +3,10 @@ import { ContextMenuListViewProps } from './ContextMenuListView.types'; export const ContextMenuListView: FC = props => { - const { children = null } = props; + const { columns = 1, children = null } = props; return ( -
+
{ children }
); diff --git a/src/views/room/widgets/context-menu/views/list/ContextMenuListView.types.ts b/src/views/room/widgets/context-menu/views/list/ContextMenuListView.types.ts index 185d9e71..6a62d64b 100644 --- a/src/views/room/widgets/context-menu/views/list/ContextMenuListView.types.ts +++ b/src/views/room/widgets/context-menu/views/list/ContextMenuListView.types.ts @@ -1,4 +1,4 @@ export interface ContextMenuListViewProps { - + columns?: number; }