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

fix(style): apply NcDialog header styles to NcModal headers #13031

Merged
merged 1 commit into from
Aug 19, 2024
Merged

fix(style): apply NcDialog header styles to NcModal headers #13031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,8 +786,15 @@ body .modal-wrapper * {
box-sizing: border-box;
}

.modal-wrapper h2 {
margin-top: 0;
/* FIXME: Align styles of NcModal header with NcDialog header. Remove if all are migrated */
.modal-wrapper h2.nc-dialog-alike-header {
font-size: 21px;
text-align: center;
height: fit-content;
min-height: var(--default-clickable-area);
line-height: var(--default-clickable-area);
overflow-wrap: break-word;
margin-block: 0 12px;
}
</style>

Expand Down
7 changes: 3 additions & 4 deletions src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
v-on="$listeners">
<div class="breakout-rooms-editor"
:class="{'breakout-rooms-editor__participants-step': isEditingParticipants}">
<h2 :id="dialogHeaderId">
<h2 :id="dialogHeaderId" class="nc-dialog-alike-header">
{{ modalTitle }}
</h2>
<template v-if="!isEditingParticipants">
Expand Down Expand Up @@ -171,9 +171,8 @@ export default {
flex-direction: column;
padding: 20px;
justify-content: flex-start;
align-items: flex-start;

&__number-input{
&__number-input {
display: block;
margin-bottom: calc(var(--default-grid-baseline)*4);
}
Expand All @@ -191,11 +190,11 @@ export default {

&__participants-step {
height: 100%;

}

&__main {
height: 100%;
align-self: flex-start;
}

&__buttons {
Expand Down
2 changes: 1 addition & 1 deletion src/components/GuestWelcomeWindow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="modal__content">
<div class="conversation-information">
<ConversationIcon :item="conversation" hide-user-status />
<h2 :id="dialogHeaderId">
<h2 :id="dialogHeaderId" class="nc-dialog-alike-header">
{{ conversationDisplayName }}
</h2>
</div>
Expand Down
6 changes: 1 addition & 5 deletions src/components/MediaSettings/MediaSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
:label-id="dialogHeaderId"
@close="closeModal">
<div class="media-settings">
<h2 :id="dialogHeaderId" class="media-settings__title">
<h2 :id="dialogHeaderId" class="media-settings__title nc-dialog-alike-header">
{{ t('spreed', 'Media settings') }}
</h2>
<!-- Preview -->
Expand Down Expand Up @@ -682,10 +682,6 @@ export default {
padding: calc(var(--default-grid-baseline) * 5);
padding-bottom: 0;

&__title {
text-align: center;
}

&__preview {
position: relative;
margin: 0 auto calc(var(--default-grid-baseline) * 4);
Expand Down
6 changes: 3 additions & 3 deletions src/components/NewConversationDialog/NewConversationDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
:container="container"
:label-id="dialogHeaderPrepId"
@close="closeModal">
<h2 :id="dialogHeaderPrepId" class="new-group-conversation__header">
<h2 :id="dialogHeaderPrepId" class="new-group-conversation__header nc-dialog-alike-header">
{{ t('spreed', 'Create a new group conversation') }}
</h2>

Expand Down Expand Up @@ -381,8 +381,8 @@ export default {
.new-group-conversation {
&__header {
flex-shrink: 0;
margin: 0;
padding: 10px 20px;
padding-top: calc(3 * var(--default-grid-baseline));
padding-inline: var(--default-clickable-area);
}

&__main {
Expand Down
2 changes: 1 addition & 1 deletion src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
:label-id="dialogHeaderId"
@close="closeParticipantsEditor">
<div class="breakout-rooms-actions__editor">
<h2 :id="dialogHeaderId">
<h2 :id="dialogHeaderId" class="nc-dialog-alike-header">
{{ manageBreakoutRoomsTitle }}
</h2>
<BreakoutRoomsParticipantsEditor :token="mainToken"
Expand Down
Loading