Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Add default properties to link buttons and remove redundant settings #8151

Merged
merged 10 commits into from
Apr 5, 2022
Merged

Add default properties to link buttons and remove redundant settings #8151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2bdecc9
Add font-size: inherit to link button
luixxiul Mar 23, 2022
45a6510
Add line-height: inherit to link button
luixxiul Mar 24, 2022
aee226f
Add font-weight: normal to link button
luixxiul Mar 25, 2022
1742f01
Dedupe _link and _link_inline
luixxiul Mar 25, 2022
3352084
Set inline to "link_inline"
luixxiul Mar 25, 2022
d81a45e
Merge branch 'develop' into AccessibleButton
luixxiul Mar 28, 2022
923de95
Merge branch 'develop' into AccessibleButton
luixxiul Mar 28, 2022
866c477
Merge branch 'develop' into AccessibleButton
luixxiul Mar 30, 2022
4e2a03e
Merge branch 'develop' into AccessibleButton
luixxiul Apr 1, 2022
e288668
Merge branch 'develop' into AccessibleButton
luixxiul Apr 1, 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
4 changes: 0 additions & 4 deletions res/css/structures/_ToastContainer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,6 @@ limitations under the License.
margin: 4px 0 11px 0;
font-size: $font-12px;

.mx_AccessibleButton_kind_link {
font-size: inherit;
}

a {
text-decoration: none;
}
Expand Down
5 changes: 0 additions & 5 deletions res/css/structures/_UserMenu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,6 @@ limitations under the License.
margin-top: 8px;
}
}

.mx_AccessibleButton_kind_link {
font-weight: normal;
font-size: inherit;
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

guest

}
}

Expand Down
3 changes: 1 addition & 2 deletions res/css/structures/auth/_Login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,12 @@ limitations under the License.
div.mx_AccessibleButton_kind_link.mx_Login_forgot {
display: block;
margin: 0 auto;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

These will be able to be removed by creating a wrapper and setting kind="link_inline" in favor of link.

// style it as a link
font-size: inherit;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

login


&.mx_AccessibleButton_disabled {
cursor: not-allowed;
}
}

.mx_Login_spinner {
display: flex;
justify-content: center;
Expand Down
4 changes: 0 additions & 4 deletions res/css/views/dialogs/_FeedbackDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@ limitations under the License.
line-height: $font-15px;
}

.mx_AccessibleButton_kind_link {
font-size: inherit;
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

feedback

a, .mx_AccessibleButton_kind_link {
color: $accent;
text-decoration: underline;
Expand Down
5 changes: 0 additions & 5 deletions res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,4 @@ limitations under the License.
line-height: $font-20px;
margin-bottom: 24px;
}

.mx_AccessibleButton_kind_link {
font-size: inherit;
line-height: inherit;
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

generic

}
1 change: 1 addition & 0 deletions res/css/views/dialogs/_SpaceSettingsDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ limitations under the License.

.mx_AccessibleButton_hasKind {
&.mx_AccessibleButton_kind_link {
font-size: $font-14px;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

after2

margin: 7px 18px;

&.mx_SettingsTab_showAdvanced {
Expand Down
1 change: 0 additions & 1 deletion res/css/views/dialogs/_SpotlightDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ limitations under the License.
.mx_SpotlightDialog_recentSearches > h4 > .mx_AccessibleButton_kind_link {
padding: 0;
float: right;
font-weight: normal;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

spot

font-size: $font-12px;
line-height: $font-15px;
color: $secondary-content;
Expand Down
12 changes: 9 additions & 3 deletions res/css/views/elements/_AccessibleButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,20 @@ limitations under the License.
}
}

&.mx_AccessibleButton_kind_link {
&.mx_AccessibleButton_kind_link,
&.mx_AccessibleButton_kind_link_inline {
color: $accent;
font-size: inherit;
font-weight: normal;
line-height: inherit;
}

&.mx_AccessibleButton_kind_link {
padding: 0;
}

&.mx_AccessibleButton_kind_link_inline {
color: $accent;
font-size: inherit;
display: inline;
padding: 0 2px;
}

Expand Down
4 changes: 0 additions & 4 deletions res/css/views/rooms/_NewRoomIntro.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ limitations under the License.
}
}

.mx_AccessibleButton_kind_link {
font-size: inherit;
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

newroom

.mx_NewRoomIntro_buttons {
margin-top: 28px;
display: flex;
Expand Down
2 changes: 0 additions & 2 deletions res/css/views/rooms/_PinnedEventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ limitations under the License.

.mx_AccessibleButton_kind_link {
margin-left: 12px;
font-size: inherit;
line-height: inherit;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

pinned

}
}

Expand Down
1 change: 1 addition & 0 deletions res/css/views/settings/_ProfileSettings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ limitations under the License.
margin-bottom: 28px;

> .mx_AccessibleButton_kind_link {
font-size: $font-14px;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

profile

margin-right: 10px;
}
}
4 changes: 0 additions & 4 deletions res/css/views/settings/tabs/room/_NotificationSettingsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ limitations under the License.
font-size: $font-12px;
line-height: $font-15px;
margin-right: 32px;

.mx_AccessibleButton_kind_link {
font-size: inherit;
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

notification

}
}

Expand Down
4 changes: 0 additions & 4 deletions res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,5 @@ limitations under the License.
margin-top: 20px;
}
}

.mx_AccessibleButton_kind_link {
font-size: inherit;
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

preference

}
}
1 change: 1 addition & 0 deletions res/css/views/spaces/_SpaceBasicSettings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ limitations under the License.
display: inline-block;
margin: auto 18px;
color: #368bd6;
font-size: $font-14px; // See _SpaceSettingsDialog.scss
Copy link
Contributor Author

Choose a reason for hiding this comment

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

after5

}

> .mx_SpaceBasicSettings_avatar_remove {
Expand Down
6 changes: 0 additions & 6 deletions res/css/views/spaces/_SpaceCreateMenu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@ $spacePanelWidth: 68px;
width: min-content;
}

.mx_AccessibleButton_kind_link {
font-size: inherit;
}

.mx_AccessibleButton_disabled {
cursor: not-allowed;
}
Expand All @@ -118,7 +114,5 @@ $spacePanelWidth: 68px;
.mx_AccessibleButton_kind_link {
color: $accent;
position: relative;
font-size: inherit;
line-height: inherit;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

after

}
}