Skip to content

style: move flat styles to nested SCSS BEM #12556

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

Open
ChristophWurst wants to merge 3 commits into
base: main
Choose a base branch
from
Open

style: move flat styles to nested SCSS BEM #12556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5e82af
style: move flat styles to nested SCSS BEM
ChristophWurst Mar 12, 2026
a5fc121
fixup! style: move flat styles to nested SCSS BEM
ChristophWurst Mar 16, 2026
2ec0558
fixup! style: move flat styles to nested SCSS BEM
ChristophWurst Mar 16, 2026
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
60 changes: 31 additions & 29 deletions src/components/AccountForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
<h3>{{ t('mail', 'SMTP Settings') }}</h3>
<NcInputField
id="man-smtp-host"
ref="smtpHost"

Check warning on line 150 in src/components/AccountForm.vue

View workflow job for this annotation

GitHub Actions / NPM lint 

'smtpHost' is defined as ref, but never used
v-model="manualConfig.smtpHost"
:label="t('mail', 'SMTP Host')"
type="text"
Expand Down Expand Up @@ -771,7 +771,7 @@
}
</style>

<style scoped>
<style lang="scss" scoped>
h4 {
text-align: start;
}
Expand All @@ -793,34 +793,36 @@
opacity: 0.5;
}

.account-form__label--required:after {
content:" *";
}

.account-form__heading--required:after {
content:" *";
}

.account-form__submit-buttons {
display: flex;
justify-content: center;
margin-top: var(--default-grid-baseline);
}

.account-form__submit-button {
display: flex;
align-items: center;
}

.account-form--feedback {
color: var(--color-text-maxcontrast);
margin-top: var(--default-grid-baseline);
text-align: center;
}

.account-form--error {
text-align: start;
font-size: 14px;
.account-form {
&__label--required:after {
content:" *";
}

&__heading--required:after {
content:" *";
}

&__submit-buttons {
display: flex;
justify-content: center;
margin-top: var(--default-grid-baseline);
}

&__submit-button {
display: flex;
align-items: center;
}

&--feedback {
color: var(--color-text-maxcontrast);
margin-top: var(--default-grid-baseline);
text-align: center;
}

&--error {
text-align: start;
font-size: 14px;
}
Comment on lines +796 to +825
Copy link
Copy Markdown
Member Author

@ChristophWurst ChristophWurst Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add lang="scss"

Copy link
Copy Markdown
Member Author

@ChristophWurst ChristophWurst Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot add lang="scss"

}

#account-form {
Expand Down
92 changes: 47 additions & 45 deletions src/components/Composer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1710,6 +1710,40 @@ export default {
.composer-actions {
position: sticky;
background: linear-gradient(rgba(255, 255, 255, 0), var(--color-main-background-translucent) 50%);

&-right {
display: flex;
align-items: center;
flex-direction: row;
justify-content: space-between;
bottom: var(--default-grid-baseline);
}

&--primary-actions {
display: flex;
flex-direction: row;
padding-inline-start: calc(var(--default-grid-baseline) * 2);
align-items: center;

.button {
padding: 2px;
}
}

&--secondary-actions {
display: flex;
flex-direction: row;
padding: 12px;
gap: 5px;

.button {
flex-shrink: 0;
}
}

&-draft-status {
padding-inline-start: 10px;
}
}

.composer-fields {
Expand Down Expand Up @@ -1740,7 +1774,7 @@ export default {
border-radius: 0;
}

.composer-fields--custom {
&--custom {
display: flex;
align-items: flex-start;
justify-content: space-between;
Expand Down Expand Up @@ -1890,55 +1924,23 @@ export default {
margin-top: 0 !important;
}

.composer-actions-right {
display: flex;
align-items: center;
flex-direction: row;
justify-content: space-between;
bottom: var(--default-grid-baseline);
}

.composer-actions--primary-actions {
display: flex;
flex-direction: row;
padding-inline-start: calc(var(--default-grid-baseline) * 2);
align-items: center;
}

.composer-actions--secondary-actions {
display: flex;
flex-direction: row;
padding: 12px;
gap: 5px;
}

.composer-actions--primary-actions .button {
padding: 2px;
}

.composer-actions--secondary-actions .button{
flex-shrink: 0;
}

.composer-actions-draft-status {
padding-inline-start: 10px;
}

:deep(.vs__selected-options .vs__dropdown-toggle .vs--multiple ){
width: 100%;
}

@media only screen and (max-width: 580px) {
.composer-actions-right {
align-items: end;
flex-direction: column-reverse;
}
.composer-actions-draft-status {
text-align: end;
padding-inline-end: 15px;
}
.composer-actions--primary-actions {
padding-inline-end: 5px;
.composer-actions {
&-right {
align-items: end;
flex-direction: column-reverse;
}
&-draft-status {
text-align: end;
padding-inline-end: 15px;
}
&--primary-actions {
padding-inline-end: 5px;
}
}
}

Expand Down
111 changes: 57 additions & 54 deletions src/components/Envelope.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ export default {
}
}
}
&--compact-wrapper {
display: flex;
align-items: center;
}
}
&__preview-text {
color: var(--color-text-maxcontrast);
Expand All @@ -1502,11 +1506,39 @@ export default {
display: inline;
}
}

&__recipient-row {
display: inline-flex;
align-items: center;
min-width: 0;
}

&__recipient-text {
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

&--compact.envelope--one-line {
.favorite-icon-style,
.icon-important {
display: none;
}
}
}

.list-item__wrapper--active {
div, :deep(.list-item-content__inner__details__details) {
color: var(--color-primary-element-text) !important;
.list-item {
&__wrapper {
&--active {
div, :deep(.list-item-content__inner__details__details) {
color: var(--color-primary-element-text) !important;
}
}

&:deep() {
list-style: none;
}
}
}

Expand Down Expand Up @@ -1583,35 +1615,31 @@ export default {
}
}

.tag-group__label {
margin: 0 7px;
z-index: 2;
font-size: calc(var(--default-font-size) * 0.8);
font-weight: bold;
padding-inline: 2px;
white-space: nowrap;
}

.tag-group__bg {
position: absolute;
width: 100%;
height: 100%;
top: 0;
inset-inline-start: 0;
opacity: 15%;
}

.tag-group {
display: inline-block;
border-radius: var(--border-radius-pill);
position: relative;
margin-inline-end: 1px;
overflow: hidden;
text-overflow: ellipsis;
}

.list-item__wrapper:deep() {
list-style: none;
&__label {
margin: 0 7px;
z-index: 2;
font-size: calc(var(--default-font-size) * 0.8);
font-weight: bold;
padding-inline: 2px;
white-space: nowrap;
}

&__bg {
position: absolute;
width: 100%;
height: 100%;
top: 0;
inset-inline-start: 0;
opacity: 15%;
}
}

.icon-important.app-content-list-item-star:deep() {
Expand Down Expand Up @@ -1743,17 +1771,12 @@ export default {
text-overflow: ellipsis;
white-space: nowrap;
}
}

.list-item--compact .envelope__subtitle {
display: flex;
align-items: center;
padding-inline-start: 0;
}

.envelope__subtitle--compact-wrapper {
display: flex;
align-items: center;
.envelope__subtitle {
display: flex;
align-items: center;
padding-inline-start: 0;
}
}

.compact-subject-icons {
Expand All @@ -1764,28 +1787,8 @@ export default {
margin-inline-end: 4px;
}

.envelope__recipient-row {
display: inline-flex;
align-items: center;
min-width: 0;
}

.recipient-icon {
flex: 0 0 auto;
margin-inline-end: 6px;
}

.envelope__recipient-text {
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.envelope--compact.envelope--one-line {
.favorite-icon-style,
.icon-important {
display: none;
}
}
</style>
Loading
Loading