sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088

Browse Source 
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx
This commit is contained in:
Michael Telatynski
2021-09-06 11:41:09 +01:00
parent 8e7ef39db7 e7cfa4816e
commit a688e5b8b3
318 changed files with 7386 additions and 4032 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/css/views/settings/_LayoutSwitcher.scss
+1 -1
View File
@@ -21,7 +21,7 @@ limitations under the License.
flex-direction: row;
gap: 24px;
color: $primary-fg-color;
color: $primary-content;
> .mx_LayoutSwitcher_RadioButton {
flex-grow: 0;
res/css/views/settings/_Notifications.scss
+2 -2
View File
@@ -15,7 +15,7 @@ limitations under the License.
*/
.mx_UserNotifSettings {
color: $primary-fg-color; // override from default settings page styles
color: $primary-content; // override from default settings page styles
.mx_UserNotifSettings_pushRulesTable {
width: calc(100% + 12px); // +12px to line up center of 'Noisy' column with toggle switches
@@ -34,7 +34,7 @@ limitations under the License.
}
tr > th:nth-child(n + 2) {
color: $secondary-fg-color;
color: $secondary-content;
font-size: $font-12px;
vertical-align: middle;
width: 66px;
res/css/views/settings/tabs/_SettingsTab.scss
+4 -4
View File
@@ -25,7 +25,7 @@ limitations under the License.
.mx_SettingsTab_heading {
font-size: $font-20px;
font-weight: 600;
color: $primary-fg-color;
color: $primary-content;
margin-bottom: 10px;
}
@@ -37,7 +37,7 @@ limitations under the License.
font-size: $font-16px;
display: block;
font-weight: 600;
color: $primary-fg-color;
color: $primary-content;
margin-bottom: 10px;
margin-top: 12px;
}
@@ -72,7 +72,7 @@ limitations under the License.
vertical-align: middle;
display: inline-block;
font-size: $font-14px;
color: $primary-fg-color;
color: $primary-content;
max-width: calc(100% - $font-48px); // Force word wrap instead of colliding with the switch
box-sizing: border-box;
padding-right: 10px;
@@ -82,7 +82,7 @@ limitations under the License.
margin-top: 4px;
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
}
.mx_SettingsTab_section .mx_SettingsFlag .mx_ToggleSwitch {
res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
+4 -4
View File
@@ -22,7 +22,7 @@ limitations under the License.
.mx_SecurityRoomSettingsTab_spacesWithAccess {
> h4 {
color: $secondary-fg-color;
color: $secondary-content;
font-weight: $font-semi-bold;
font-size: $font-12px;
line-height: $font-15px;
@@ -33,7 +33,7 @@ limitations under the License.
font-weight: 500;
font-size: $font-14px;
line-height: 32px; // matches height of avatar for v-align
color: $secondary-fg-color;
color: $secondary-content;
display: inline-block;
img.mx_RoomAvatar_isSpaceRoom,
@@ -89,7 +89,7 @@ limitations under the License.
font-weight: $font-semi-bold;
font-size: $font-15px;
line-height: $font-24px;
color: $primary-fg-color;
color: $primary-content;
display: block;
}
}
@@ -100,7 +100,7 @@ limitations under the License.
margin-bottom: 16px;
font-size: $font-15px;
line-height: $font-24px;
color: $secondary-fg-color;
color: $secondary-content;
& + .mx_RadioButton {
border-top: 1px solid $menu-border-color;
res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
+3 -3
View File
@@ -24,7 +24,7 @@ limitations under the License.
}
.mx_AppearanceUserSettingsTab_fontScaling {
color: $primary-fg-color;
color: $primary-content;
}
.mx_AppearanceUserSettingsTab_fontSlider {
@@ -81,7 +81,7 @@ limitations under the License.
.mx_AppearanceUserSettingsTab_themeSection {
$radio-bg-color: $input-darker-bg-color;
color: $primary-fg-color;
color: $primary-content;
> .mx_ThemeSelectors {
display: flex;
@@ -156,7 +156,7 @@ limitations under the License.
}
.mx_AppearanceUserSettingsTab_Advanced {
color: $primary-fg-color;
color: $primary-content;
> * {
margin-bottom: 16px;
res/css/views/settings/tabs/user/_HelpUserSettingsTab.scss
+1
View File
@@ -36,6 +36,7 @@ limitations under the License.
margin-top: 10px;
padding: 10px;
width: max-content;
max-width: 100%;
.mx_HelpUserSettingsTab_copyButton {
flex-shrink: 0;
res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
+1 -1
View File
@@ -41,7 +41,7 @@ limitations under the License.
font-weight: $font-semi-bold;
font-size: $font-15px;
line-height: $font-18px;
color: $primary-fg-color;
color: $primary-content;
margin: 16px 0;
.mx_BaseAvatar {