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

Responsive BetaCard on Labs #8154

Merged
merged 5 commits into from
Mar 28, 2022
Merged

Responsive BetaCard on Labs #8154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6a5c8d
Responsive BetaCard on Labs
luixxiul Mar 24, 2022
36ea18a
Wrap buttons
luixxiul Mar 25, 2022
ae846db
Remove margin setting that has not been effective
luixxiul Mar 25, 2022
856b7ae
Wrap img element and remove redundant margin from disclaimer
luixxiul Mar 25, 2022
f7a0f74
Place feedback button top and right
luixxiul Mar 25, 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
56 changes: 37 additions & 19 deletions res/css/views/beta/_BetaCard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,56 +23,74 @@ limitations under the License.

.mx_BetaCard_columns {
display: flex;
flex-flow: wrap;
gap: 20px;
justify-content: center;

.mx_BetaCard_columns_description {
flex: 1;

> div {
.mx_BetaCard_title {
font-weight: $font-semi-bold;
font-size: $font-18px;
line-height: $font-22px;
color: $primary-content;
margin: 4px 0 14px;

.mx_BetaCard_betaPill {
margin-left: 12px;
}
display: flex;
align-items: center;
column-gap: 12px;
}

.mx_BetaCard_caption {
font-size: $font-15px;
line-height: $font-20px;
color: $secondary-content;
margin-bottom: 20px;
}

.mx_BetaCard_buttons .mx_AccessibleButton {
display: block;
margin: 12px 0;
padding: 7px 40px;
width: auto;
.mx_BetaCard_buttons {
display: flex;
flex-wrap: wrap-reverse;
gap: 12px;
margin: 20px auto;

.mx_AccessibleButton {
padding: 7px 40px;
width: auto;
flex: 1;
white-space: nowrap; // text might overflow

&:nth-child(1) {
order: 2; // Place feedback button top and right
}
}
}

.mx_BetaCard_disclaimer {
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-content;
margin-top: 20px;

> h4 {
margin: 0;
margin: 12px 0 0;
}

> p {
margin-top: 0;
margin: 0;
}
}
}

> img {
margin: auto 0 auto 20px;
width: 300px;
object-fit: contain;
height: 100%;
border-radius: 4px;
.mx_BetaCard_columns_image_wrapper {
margin: auto 0;

.mx_BetaCard_columns_image {
width: 100%;
max-width: 300px;
object-fit: contain;
height: 100%;
border-radius: 4px;
}
}
}

Expand Down
10 changes: 6 additions & 4 deletions src/components/views/beta/BetaCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ const BetaCard = ({ title: titleOverride, featureId }: IProps) => {

return <div className="mx_BetaCard">
<div className="mx_BetaCard_columns">
<div>
<div className="mx_BetaCard_columns_description">
<h3 className="mx_BetaCard_title">
{ titleOverride || _t(title) }
<span>{ titleOverride || _t(title) }</span>
<BetaPill />
</h3>
<span className="mx_BetaCard_caption">{ caption() }</span>
<div className="mx_BetaCard_caption">{ caption() }</div>
<div className="mx_BetaCard_buttons">
{ feedbackButton }
<AccessibleButton
Expand All @@ -132,7 +132,9 @@ const BetaCard = ({ title: titleOverride, featureId }: IProps) => {
{ disclaimer(value) }
</div> }
</div>
<img src={image} alt="" />
<div className="mx_BetaCard_columns_image_wrapper">
<img className="mx_BetaCard_columns_image" src={image} alt="" />
</div>
</div>
{ extraSettings && value && <div className="mx_BetaCard_relatedSettings">
{ extraSettings.map(key => (
Expand Down