GYU: Account Notification Settings (#11008)
* Implement new notification settings UI * Sort new keywords at the front * Make ts-strict happier * Make ts-strict happier * chore: fixed lint issues * update beta card * Fix issue with the user settings test * chore: fixed lint issues * Add tests for notification settings * chore: fixed lint issues * fix: spurious text failures * improve tests further * make ts-strict happier * improve tests further * Reduce uncovered conditions * Correct snapshot * even more test coverage * Fix an issue with inverted rules * Update res/css/views/settings/tabs/_SettingsIndent.pcss Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com> * Fix license headers * Improve i18n * make linters happier * Improve beta labels * improve i18n * chore: fixed lint issues * fix: more lint issues * Update snapshots to match changed text * Update text as requested * Remove labs image * Update snapshots * Correct an issue with one of the tests * fix: keyword reconcilation code * Determine mute status more accurately * Address review comments * Prevent duplicate updates * Fix missing license header * slight change to avoid ts-strict complaining * fix test issue caused by previous merge --------- Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Janne Mareike Koschinski
GitHub
parent
95283d21bb
commit
f62fe2626c
25 changed files with 3797 additions and 33 deletions
|
|
@ -321,6 +321,8 @@
|
|||
@import "./views/settings/_JoinRuleSettings.pcss";
|
||||
@import "./views/settings/_KeyboardShortcut.pcss";
|
||||
@import "./views/settings/_LayoutSwitcher.pcss";
|
||||
@import "./views/settings/_NotificationPusherSettings.pcss";
|
||||
@import "./views/settings/_NotificationSettings2.pcss";
|
||||
@import "./views/settings/_Notifications.pcss";
|
||||
@import "./views/settings/_PhoneNumbers.pcss";
|
||||
@import "./views/settings/_ProfileSettings.pcss";
|
||||
|
|
@ -331,6 +333,8 @@
|
|||
@import "./views/settings/_SpellCheckLanguages.pcss";
|
||||
@import "./views/settings/_ThemeChoicePanel.pcss";
|
||||
@import "./views/settings/_UpdateCheckButton.pcss";
|
||||
@import "./views/settings/tabs/_SettingsBanner.pcss";
|
||||
@import "./views/settings/tabs/_SettingsIndent.pcss";
|
||||
@import "./views/settings/tabs/_SettingsSection.pcss";
|
||||
@import "./views/settings/tabs/_SettingsTab.pcss";
|
||||
@import "./views/settings/tabs/room/_NotificationSettingsTab.pcss";
|
||||
|
|
|
|||
26
res/css/views/settings/_NotificationPusherSettings.pcss
Normal file
26
res/css/views/settings/_NotificationPusherSettings.pcss
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
Copyright 2023 The Matrix.org Foundation C.I.C.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
.mx_NotificationPusherSettings {
|
||||
.mx_NotificationPusherSettings_description {
|
||||
color: $primary-content;
|
||||
}
|
||||
|
||||
.mx_NotificationPusherSettings_detail {
|
||||
margin-top: -4px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
}
|
||||
85
res/css/views/settings/_NotificationSettings2.pcss
Normal file
85
res/css/views/settings/_NotificationSettings2.pcss
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
/*
|
||||
Copyright 2023 The Matrix.org Foundation C.I.C.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
.mx_NotificationSettings2 {
|
||||
.mx_SettingsSection_subSections {
|
||||
color: $primary-content;
|
||||
gap: 32px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.mx_SettingsSubsection_description {
|
||||
margin-bottom: 20px;
|
||||
|
||||
.mx_SettingsSubsection_text {
|
||||
font-size: 1.2rem;
|
||||
|
||||
.mx_NotificationBadge {
|
||||
vertical-align: baseline;
|
||||
display: inline-flex;
|
||||
margin: 0 2px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.mx_SettingsSubsection_content {
|
||||
margin-top: 12px;
|
||||
grid-gap: 12px;
|
||||
justify-items: stretch;
|
||||
justify-content: stretch;
|
||||
}
|
||||
|
||||
.mx_SettingsBanner {
|
||||
margin-bottom: 32px;
|
||||
}
|
||||
|
||||
.mx_NotificationSettings2_flags {
|
||||
grid-gap: 4px;
|
||||
}
|
||||
|
||||
.mx_StyledRadioButton_content {
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.mx_TagComposer {
|
||||
margin-top: 16px;
|
||||
|
||||
&.mx_TagComposer_disabled {
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.mx_TagComposer_tags {
|
||||
margin-top: 16px;
|
||||
gap: 8px;
|
||||
|
||||
.mx_Tag {
|
||||
border-radius: 18px;
|
||||
line-height: 2.4rem;
|
||||
padding: 6px 12px;
|
||||
background: $panel-actions;
|
||||
margin: 0;
|
||||
|
||||
.mx_Tag_delete {
|
||||
background: $tertiary-content;
|
||||
color: #fff;
|
||||
align-self: initial;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
35
res/css/views/settings/tabs/_SettingsBanner.pcss
Normal file
35
res/css/views/settings/tabs/_SettingsBanner.pcss
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
/*
|
||||
Copyright 2023 The Matrix.org Foundation C.I.C.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
.mx_SettingsBanner {
|
||||
background: $system;
|
||||
line-height: 2.25rem;
|
||||
border-radius: 8px;
|
||||
padding: 12px 16px;
|
||||
gap: 12px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
|
||||
.mx_SettingsBanner_content {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.mx_AccessibleButton {
|
||||
align-self: initial;
|
||||
white-space: nowrap;
|
||||
}
|
||||
}
|
||||
22
res/css/views/settings/tabs/_SettingsIndent.pcss
Normal file
22
res/css/views/settings/tabs/_SettingsIndent.pcss
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
/*
|
||||
Copyright 2023 The Matrix.org Foundation C.I.C.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
.mx_SettingsIndent {
|
||||
padding-left: 16px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 12px;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue