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.

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

Move users management to multi line #17239

Merged
merged 1 commit into from
Dec 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 33 additions & 15 deletions apps/settings/css/settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,6 @@ td, th {
visibility: hidden;
}
&.password,
&.displayName,
&.mailAddress {
min-width: 5em;
max-width: 12em;
Expand Down Expand Up @@ -705,6 +704,7 @@ span.version {
#searchresults {
display: none;
}

}
#apps-list.store {
.section {
Expand Down Expand Up @@ -1351,8 +1351,8 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {

/* USERS LIST -------------------------------------------------------------- */
#body-settings {
$grid-row-height: 46px;
$grid-col-min-width: 120px;
$grid-row-height: 60px;
$grid-col-min-width: 150px;
#app-content.user-list-grid {
display: grid;
grid-auto-columns: 1fr;
Expand All @@ -1376,20 +1376,24 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {

/* grid col width */
.name,
.displayName,
.password,
.mailAddress,
.languages,
.storageLocation,
.userBackend,
.lastLogin {
min-width: $grid-col-min-width;
display: flex;
color: var(--color-text-dark);
vertical-align: baseline;
}
.groups,
.subadmins,
.quota {
.multiselect {
min-width: $grid-col-min-width;
color: var(--color-text-dark);
vertical-align: baseline;
}
}
.obfuscated {
Expand All @@ -1399,6 +1403,10 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
.userActions {
min-width: 44px;
}
.subtitle {
color: var(--color-text-maxcontrast);
vertical-align: baseline;
}

/* various */
&#grid-header,
Expand Down Expand Up @@ -1427,16 +1435,23 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
&#grid-header {
color: var(--color-text-maxcontrast);
z-index: 60; /* above new-user */
border-bottom-width: thin;

#headerDisplayName,
#headerPassword,
#headerAddress,
#headerGroups,
#headerSubAdmins,
#theHeaderUserBackend,
#theHeaderLastLogin,
#headerQuota,
#theHeaderStorageLocation,
#headerLanguages {
/* Line up header text with column content for when there’s inputs */
padding-left: 7px;
text-transform: none;
color: var(--color-text-maxcontrast);
vertical-align: baseline;
}
}
&:hover {
Expand All @@ -1451,8 +1466,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
> form {
grid-row: 1;
display: inline-flex;
align-items: center;
color: var(--color-text);
color: var(--color-text-lighter);
position: relative;
> input:not(:focus):not(:active) {
border-color: transparent;
Expand All @@ -1478,7 +1492,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
}
}
&.name,
&.storageLocation {
&.userBackend {
/* better multi-line visual */
line-height: 1.3em;
max-height: 100%;
Expand All @@ -1492,16 +1506,14 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
-webkit-box-orient: vertical;
}
&.quota {
.multiselect--active + progress {
display: none;
}
height: 44px;
display: flex;
align-items: center;
justify-content: center;
progress {
position: absolute;
width: calc(100% - 4px); /* minus left and right */
left: 2px;
bottom: 2px;
width: 100%;
margin: 0 10px;
height: 3px;
z-index: 5; /* above multiselect */
}
}
.icon-confirm {
Expand All @@ -1520,16 +1532,22 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
}
}
&.userActions {
.action-item {
position: absolute;
}
#newsubmit {
width: 100%;
}
.toggleUserActions {
position: relative;
display: block;
align-items: center;
.icon-more {
width: 44px;
height: 44px;
opacity: .5;
cursor: pointer;
margin-left: 40px;
&:hover {
opacity: .7;
}
Expand Down
3,282 changes: 3,282 additions & 0 deletions apps/settings/js/vue-1.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/settings/js/vue-1.js.map

Large diffs are not rendered by default.

4,210 changes: 4,210 additions & 0 deletions apps/settings/js/vue-2.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/settings/js/vue-2.js.map

Large diffs are not rendered by default.