Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

6927: updated button for NewGroupConversation #6949

Merged
merged 2 commits into from
Mar 7, 2022
Merged

6927: updated button for NewGroupConversation #6949

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87969f4
6927: updated button for NewGroupConversation
nikola-gladovic Mar 1, 2022
76b5161
6927: fixed buttons for new group conversation
nikola-gladovic Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/assets/buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@

@import 'variables';

.button-vue--vue-default {
nikola-gladovic marked this conversation as resolved.
Show resolved Hide resolved
background-color: var(--color-background-dark);
color: var(--color-main-text);
}

.nc-button {
width: $clickable-area;
height: $clickable-area;
Expand Down
38 changes: 23 additions & 15 deletions src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@

<template>
<div class="wrapper">
<button slot="trigger"
<Button slot="trigger"
v-tooltip.bottom="t('spreed', 'Create a new group conversation')"
type="default"
nikola-gladovic marked this conversation as resolved.
Show resolved Hide resolved
class="toggle"
icon=""
:aria-label="t('spreed', 'Create a new group conversation')"
@click="showModal">
<Plus decorative
title=""
:size="20" />
</button>
</Button>
<!-- New group form -->
<Modal v-if="modal"
:container="container"
Expand Down Expand Up @@ -77,35 +78,40 @@
placement are rendered depending on the current page -->
<div class="navigation">
<!-- First page -->
<button v-if="page===0 && isPublic"
class="navigation__button navigation__button-left "
<Button v-if="page===0 && isPublic"
class="navigation__button navigation__button-left"
nikola-gladovic marked this conversation as resolved.
Show resolved Hide resolved
:disabled="disabled"
type="default"
nikola-gladovic marked this conversation as resolved.
Show resolved Hide resolved
@click="handleCreateConversation">
{{ t('spreed', 'Create conversation') }}
</button>
<button v-if="page===0"
class="navigation__button navigation__button-right primary"
</Button>
<Button v-if="page===0"
class="navigation__button navigation__button-right"
type="primary"
:disabled="disabled"
@click="handleSetConversationName">
{{ t('spreed', 'Add participants') }}
</button>
</Button>
<!-- Second page -->
<button v-if="page===1"
<Button v-if="page===1"
class="navigation__button navigation__button-left"
type="default"
@click="handleClickBack">
{{ t('spreed', 'Back') }}
</button>
<button v-if="page===1"
</Button>
<Button v-if="page===1"
class="navigation__button navigation__button-right primary"
type="primary"
@click="handleCreateConversation">
{{ t('spreed', 'Create conversation') }}
</button>
</Button>
<!-- Third page -->
<button v-if="page===2 && (error || isPublic)"
<Button v-if="page===2 && (error || isPublic)"
type="primary"
class="navigation__button navigation__button-right primary"
@click="closeModal">
{{ t('spreed', 'Close') }}
</button>
</Button>
</div>
</div>
</modal>
Expand All @@ -121,6 +127,7 @@ import SetContacts from './SetContacts/SetContacts'
import SetConversationName from './SetConversationName/SetConversationName'
import SetConversationType from './SetConversationType/SetConversationType'
import Confirmation from './Confirmation/Confirmation'
import Button from '@nextcloud/vue/dist/Components/Button'
import { addParticipant } from '../../../services/participantsService'
import {
createPublicConversation,
Expand Down Expand Up @@ -148,6 +155,7 @@ export default {
SetContacts,
SetConversationName,
SetConversationType,
Button,
Confirmation,
PasswordProtect,
ListableSettings,
Expand Down Expand Up @@ -363,7 +371,7 @@ export default {
</script>

<style lang="scss" scoped>

@import '../../../assets/buttons';
.toggle {
height: 44px;
width: 44px;
Expand Down