Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make member device info buttons fluid and stackable with flexbox #4776

Merged
merged 2 commits into from
Aug 10, 2017
Merged

Make member device info buttons fluid and stackable with flexbox #4776

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68dd47a
Make member device info buttons fluid and stackable with flexbox
shvchk Aug 10, 2017
a72fc80
Remove width 100% from device info buttons wrapper
shvchk Aug 10, 2017
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
16 changes: 8 additions & 8 deletions src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberDeviceInfo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ limitations under the License.
padding: 10px 0px;
}

.mx_MemberDeviceInfo.mx_DeviceVerifyButtons {
padding: 6px 0;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}

.mx_MemberDeviceInfo_textButton {
color: $accent-fg-color;
Expand All @@ -26,12 +32,11 @@ limitations under the License.
text-align: center;
padding-left: 1em;
padding-right: 1em;
width: 95px;
border: 0px;
font-size: 14px;

cursor: pointer;
display: inline;
margin: 2px;
flex: 1;
}

.mx_MemberDeviceInfo_deviceId {
Expand All @@ -44,11 +49,6 @@ limitations under the License.
border-bottom: 1px solid rgba(0,0,0,0.1);
}

.mx_MemberDeviceInfo_blacklist,
.mx_MemberDeviceInfo_unblacklist {
float: right;
}

/* "Unblacklist" is too long for a regular button: make it wider and
reduce the padding. */
.mx_EncryptedEventDialog .mx_MemberDeviceInfo_blacklist,
Expand Down