PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Padding setting of link button & nesting structure of _AccessibleButton.scss (#8091)

Browse source
This commit is contained in:
Suguru Hirahara 2022-03-23 17:15:15 +00:00 committed by GitHub
parent 1495c23a14
commit 86691550df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 148 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/css/structures/_SpaceHierarchy.scss
View file

@ -16,7 +16,6 @@ limitations under the License.
.mx_SpaceRoomView_landing { .mx_SpaceRoomView_landing {
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {
padding: 0;
font-size: inherit; font-size: inherit;
} }

1
res/css/structures/_ToastContainer.scss
View file

@ -159,7 +159,6 @@ limitations under the License.
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {
font-size: inherit; font-size: inherit;
padding: 0;
} }
a { a {

1
res/css/structures/_UserMenu.scss
View file

@ -146,7 +146,6 @@ limitations under the License.
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {
font-weight: normal; font-weight: normal;
font-size: inherit; font-size: inherit;
padding: 0;
} }
} }
} }

1
res/css/structures/auth/_Login.scss
View file

@ -90,7 +90,6 @@ div.mx_AccessibleButton_kind_link.mx_Login_forgot {
margin: 0 auto; margin: 0 auto;
// style it as a link // style it as a link
font-size: inherit; font-size: inherit;
padding: 0;
&.mx_AccessibleButton_disabled { &.mx_AccessibleButton_disabled {
cursor: not-allowed; cursor: not-allowed;

5
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
View file

@ -54,7 +54,6 @@ limitations under the License.
font-size: $font-12px; font-size: $font-12px;
line-height: $font-15px; line-height: $font-15px;
margin-top: 8px; margin-top: 8px;
padding: 0;
} }
} }
@ -136,10 +135,6 @@ limitations under the License.
left: 0; left: 0;
} }
} }
.mx_AccessibleButton_kind_link {
padding: 0;
}
} }
} }

2
res/css/views/dialogs/_BugReportDialog.scss
View file

@ -17,7 +17,7 @@ limitations under the License.
.mx_BugReportDialog { .mx_BugReportDialog {
.mx_BugReportDialog_download { .mx_BugReportDialog_download {
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {
padding-left: 0; margin-right: 18px; // Space between "Downloading logs..."
} }
} }
} }

4
res/css/views/dialogs/_CreateSubspaceDialog.scss
View file

@ -73,9 +73,5 @@ limitations under the License.
margin-left: 16px; margin-left: 16px;
padding: 8px 36px; padding: 8px 36px;
} }
.mx_AccessibleButton_kind_link {
padding: 0;
}
} }
} }

1
res/css/views/dialogs/_FeedbackDialog.scss
View file

@ -59,7 +59,6 @@ limitations under the License.
} }
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {
padding: 0;
font-size: inherit; font-size: inherit;
} }

1
res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
View file

@ -23,7 +23,6 @@ limitations under the License.
} }
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {
padding: 0;
font-size: inherit; font-size: inherit;
line-height: inherit; line-height: inherit;
} }

5
res/css/views/dialogs/_InviteDialog.scss
View file

@ -96,6 +96,11 @@ limitations under the License.
> span { > span {
color: $primary-content; color: $primary-content;
} }
.mx_InviteDialog_section_showMore {
margin: 7px 18px;
display: inline;
}
} }
.mx_InviteDialog_section_hidden_suggestions_disclaimer { .mx_InviteDialog_section_hidden_suggestions_disclaimer {

7
res/css/views/dialogs/_SpaceSettingsDialog.scss
View file

@ -76,11 +76,12 @@ limitations under the License.
} }
.mx_AccessibleButton_hasKind { .mx_AccessibleButton_hasKind {
padding: 8px 22px; &.mx_AccessibleButton_kind_link {
margin: 7px 18px;
&.mx_SettingsTab_showAdvanced { &.mx_SettingsTab_showAdvanced {
margin: 16px 0; margin: 18px 0;
padding: 0; }
} }
} }

184
res/css/views/elements/_AccessibleButton.scss
View file

@ -16,13 +16,23 @@ limitations under the License.
.mx_AccessibleButton { .mx_AccessibleButton {
cursor: pointer; cursor: pointer;
}
.mx_AccessibleButton_disabled { &_disabled {
cursor: default; cursor: default;
&.mx_AccessibleButton_kind {
&_primary,
&_primary_outline,
&_primary_sm,
&_link,
&_link_inline,
&_link_sm {
opacity: 0.4;
}
}
} }
.mx_AccessibleButton_hasKind { &_hasKind {
padding: 7px 18px; padding: 7px 18px;
text-align: center; text-align: center;
border-radius: 8px; border-radius: 8px;
@ -31,102 +41,29 @@ limitations under the License.
justify-content: center; justify-content: center;
font-size: $font-14px; font-size: $font-14px;
border: none; // override default <button /> styles border: none; // override default <button /> styles
}
.mx_AccessibleButton_kind_primary { &.mx_AccessibleButton_kind {
color: $button-primary-fg-color; &_primary_sm,
background-color: $accent; &_danger_sm,
border: 1px solid $accent; // account for size loss of no border &_link_sm {
font-weight: 600;
}
.mx_AccessibleButton_kind_primary_outline {
color: $accent;
background-color: $button-secondary-bg-color;
border: 1px solid $accent;
font-weight: 600;
}
.mx_AccessibleButton_kind_secondary {
color: $accent;
font-weight: 600;
}
.mx_AccessibleButton_kind_primary.mx_AccessibleButton_disabled,
.mx_AccessibleButton_kind_primary_outline.mx_AccessibleButton_disabled {
opacity: 0.4;
}
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_primary_sm {
padding: 5px 12px; padding: 5px 12px;
}
&_primary_sm {
color: $button-primary-fg-color; color: $button-primary-fg-color;
background-color: $accent; background-color: $accent;
} }
.mx_AccessibleButton_kind_primary_sm.mx_AccessibleButton_disabled { &_danger_sm {
opacity: 0.4;
}
.mx_AccessibleButton_kind_danger {
color: $button-danger-fg-color; color: $button-danger-fg-color;
background-color: $alert; background-color: $alert;
} }
.mx_AccessibleButton_kind_danger_outline { &_link_sm {
color: $alert;
background-color: transparent;
border: 1px solid $alert;
}
.mx_AccessibleButton_kind_danger.mx_AccessibleButton_disabled {
color: $button-danger-disabled-fg-color;
background-color: $button-danger-disabled-bg-color;
}
.mx_AccessibleButton_kind_danger_outline.mx_AccessibleButton_disabled {
color: $button-danger-disabled-bg-color;
border-color: $button-danger-disabled-bg-color;
}
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_danger_sm {
padding: 5px 12px;
color: $button-danger-fg-color;
background-color: $alert;
}
.mx_AccessibleButton_kind_danger_sm.mx_AccessibleButton_disabled {
color: $button-danger-disabled-fg-color;
background-color: $button-danger-disabled-bg-color;
}
.mx_AccessibleButton_kind_link {
color: $accent; color: $accent;
} }
.mx_AccessibleButton_kind_link.mx_AccessibleButton_disabled { &_confirm_sm {
opacity: 0.4;
}
.mx_AccessibleButton_kind_link_inline {
color: $accent;
font-size: inherit;
padding: 0 2px;
}
.mx_AccessibleButton_kind_link_inline.mx_AccessibleButton_disabled {
opacity: 0.4;
}
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_link_sm {
padding: 5px 12px;
color: $accent;
}
.mx_AccessibleButton_kind_link_sm.mx_AccessibleButton_disabled {
opacity: 0.4;
}
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_confirm_sm {
background-color: $accent; background-color: $accent;
&::before { &::before {
@ -134,16 +71,83 @@ limitations under the License.
} }
} }
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_cancel_sm { &_cancel_sm {
background-color: $alert; background-color: $alert;
&::before { &::before {
mask-image: url('$(res)/img/feather-customised/x.svg'); mask-image: url('$(res)/img/feather-customised/x.svg');
} }
} }
}
}
.mx_AccessibleButton_kind_confirm_sm, &_kind {
.mx_AccessibleButton_kind_cancel_sm { &_primary,
&_primary_outline,
&_secondary {
font-weight: 600;
}
&_primary,
&_primary_outline {
border: 1px solid $accent;
}
&_primary {
color: $button-primary-fg-color;
background-color: $accent;
}
&_primary_outline {
color: $accent;
background-color: $button-secondary-bg-color;
}
&_secondary {
color: $accent;
}
&_danger {
color: $button-danger-fg-color;
background-color: $alert;
&.mx_AccessibleButton_disabled {
color: $button-danger-disabled-fg-color;
background-color: $button-danger-disabled-bg-color;
}
&_outline {
color: $alert;
background-color: transparent;
border: 1px solid $alert;
&.mx_AccessibleButton_disabled {
color: $button-danger-disabled-bg-color;
border-color: $button-danger-disabled-bg-color;
}
}
&_sm {
&.mx_AccessibleButton_disabled {
color: $button-danger-disabled-fg-color;
background-color: $button-danger-disabled-bg-color;
}
}
}
&_link {
color: $accent;
padding: 0;
&_inline {
color: $accent;
font-size: inherit;
padding: 0 2px;
}
}
&_confirm_sm,
&_cancel_sm {
padding: 0px; padding: 0px;
width: 16px; width: 16px;
height: 16px; height: 16px;
@ -165,3 +169,5 @@ limitations under the License.
mask-size: 80%; mask-size: 80%;
} }
} }
}
}

1
res/css/views/right_panel/_RoomSummaryCard.scss
View file

@ -235,7 +235,6 @@ limitations under the License.
} }
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {
padding: 0;
margin-top: 12px; margin-top: 12px;
margin-bottom: 12px; margin-bottom: 12px;
font-size: $font-13px; font-size: $font-13px;

1
res/css/views/rooms/_NewRoomIntro.scss
View file

@ -24,7 +24,6 @@ limitations under the License.
} }
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {
padding: 0;
font-size: inherit; font-size: inherit;
} }

1
res/css/views/rooms/_PinnedEventTile.scss
View file

@ -91,7 +91,6 @@ limitations under the License.
} }
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {
padding: 0;
margin-left: 12px; margin-left: 12px;
font-size: inherit; font-size: inherit;
line-height: inherit; line-height: inherit;

2
res/css/views/settings/_ProfileSettings.scss
View file

@ -61,8 +61,6 @@ limitations under the License.
margin-bottom: 28px; margin-bottom: 28px;
> .mx_AccessibleButton_kind_link { > .mx_AccessibleButton_kind_link {
padding-left: 0; // to align with left side
padding-right: 0;
margin-right: 10px; margin-right: 10px;
} }
} }

1
res/css/views/settings/tabs/room/_NotificationSettingsTab.scss
View file

@ -52,7 +52,6 @@ limitations under the License.
margin-right: 32px; margin-right: 32px;
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {
padding: 0;
font-size: inherit; font-size: inherit;
} }
} }

1
res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
View file

@ -34,7 +34,6 @@ limitations under the License.
} }
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {
padding: 0;
font-size: inherit; font-size: inherit;
} }
} }

4
res/css/views/spaces/_SpaceBasicSettings.scss
View file

@ -63,8 +63,7 @@ limitations under the License.
> .mx_AccessibleButton_kind_link { > .mx_AccessibleButton_kind_link {
display: inline-block; display: inline-block;
padding: 0; margin: auto 18px;
margin: auto 16px;
color: #368bd6; color: #368bd6;
} }
@ -74,7 +73,6 @@ limitations under the License.
} }
.mx_AccessibleButton_hasKind { .mx_AccessibleButton_hasKind {
padding: 8px 22px;
margin-left: auto; margin-left: auto;
display: block; display: block;
width: min-content; width: min-content;

2
res/css/views/spaces/_SpaceCreateMenu.scss
View file

@ -94,7 +94,6 @@ $spacePanelWidth: 68px;
} }
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {
padding: 0;
font-size: inherit; font-size: inherit;
} }
@ -119,7 +118,6 @@ $spacePanelWidth: 68px;
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {
color: $accent; color: $accent;
position: relative; position: relative;
padding: 0;
font-size: inherit; font-size: inherit;
line-height: inherit; line-height: inherit;
} }

2
src/components/views/dialogs/InviteDialog.tsx
View file

@ -1166,9 +1166,11 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
let showMore = null; let showMore = null;
if (hasMore) { if (hasMore) {
showMore = ( showMore = (
<div className="mx_InviteDialog_section_showMore">
<AccessibleButton onClick={showMoreFn} kind="link"> <AccessibleButton onClick={showMoreFn} kind="link">
{ _t("Show more") } { _t("Show more") }
</AccessibleButton> </AccessibleButton>
</div>
); );
} }