Skip to content

Commit 0fcbf03

Browse files
GretaDskjnldsv
authored andcommitted
Move users management to multi line
Signed-off-by: Greta Doci <gretadoci@gmail.com>
1 parent 97deaf8 commit 0fcbf03

24 files changed

+11691
-419
lines changed

apps/settings/css/settings.scss

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,6 @@ td, th {
524524
visibility: hidden;
525525
}
526526
&.password,
527-
&.displayName,
528527
&.mailAddress {
529528
min-width: 5em;
530529
max-width: 12em;
@@ -705,6 +704,7 @@ span.version {
705704
#searchresults {
706705
display: none;
707706
}
707+
708708
}
709709
#apps-list.store {
710710
.section {
@@ -1351,8 +1351,8 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
13511351

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

13771377
/* grid col width */
13781378
.name,
1379-
.displayName,
13801379
.password,
13811380
.mailAddress,
13821381
.languages,
13831382
.storageLocation,
13841383
.userBackend,
13851384
.lastLogin {
13861385
min-width: $grid-col-min-width;
1386+
display: flex;
1387+
color: var(--color-text-dark);
1388+
vertical-align: baseline;
13871389
}
13881390
.groups,
13891391
.subadmins,
13901392
.quota {
13911393
.multiselect {
13921394
min-width: $grid-col-min-width;
1395+
color: var(--color-text-dark);
1396+
vertical-align: baseline;
13931397
}
13941398
}
13951399
.obfuscated {
@@ -1399,6 +1403,10 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
13991403
.userActions {
14001404
min-width: 44px;
14011405
}
1406+
.subtitle {
1407+
color: var(--color-text-maxcontrast);
1408+
vertical-align: baseline;
1409+
}
14021410

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

14311440
#headerDisplayName,
14321441
#headerPassword,
14331442
#headerAddress,
14341443
#headerGroups,
14351444
#headerSubAdmins,
1445+
#theHeaderUserBackend,
1446+
#theHeaderLastLogin,
14361447
#headerQuota,
1448+
#theHeaderStorageLocation,
14371449
#headerLanguages {
14381450
/* Line up header text with column content for when there’s inputs */
14391451
padding-left: 7px;
1452+
text-transform: none;
1453+
color: var(--color-text-maxcontrast);
1454+
vertical-align: baseline;
14401455
}
14411456
}
14421457
&:hover {
@@ -1451,8 +1466,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
14511466
> form {
14521467
grid-row: 1;
14531468
display: inline-flex;
1454-
align-items: center;
1455-
color: var(--color-text);
1469+
color: var(--color-text-lighter);
14561470
position: relative;
14571471
> input:not(:focus):not(:active) {
14581472
border-color: transparent;
@@ -1478,7 +1492,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
14781492
}
14791493
}
14801494
&.name,
1481-
&.storageLocation {
1495+
&.userBackend {
14821496
/* better multi-line visual */
14831497
line-height: 1.3em;
14841498
max-height: 100%;
@@ -1492,16 +1506,14 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
14921506
-webkit-box-orient: vertical;
14931507
}
14941508
&.quota {
1495-
.multiselect--active + progress {
1496-
display: none;
1497-
}
1509+
height: 44px;
1510+
display: flex;
1511+
align-items: center;
1512+
justify-content: center;
14981513
progress {
1499-
position: absolute;
1500-
width: calc(100% - 4px); /* minus left and right */
1501-
left: 2px;
1502-
bottom: 2px;
1514+
width: 100%;
1515+
margin: 0 10px;
15031516
height: 3px;
1504-
z-index: 5; /* above multiselect */
15051517
}
15061518
}
15071519
.icon-confirm {
@@ -1520,16 +1532,22 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
15201532
}
15211533
}
15221534
&.userActions {
1535+
.action-item {
1536+
position: absolute;
1537+
}
15231538
#newsubmit {
15241539
width: 100%;
15251540
}
15261541
.toggleUserActions {
15271542
position: relative;
1543+
display: block;
1544+
align-items: center;
15281545
.icon-more {
15291546
width: 44px;
15301547
height: 44px;
15311548
opacity: .5;
15321549
cursor: pointer;
1550+
margin-left: 40px;
15331551
&:hover {
15341552
opacity: .7;
15351553
}

apps/settings/js/vue-1.js

Lines changed: 3282 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-1.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-2.js

Lines changed: 4210 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-2.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)