Merge pull request #15289 from edx/jlajoie/EDUCATOR-434

EDUCATOR-434: Unit Group Access
This commit is contained in:
Jeff LaJoie
2017-07-19 15:32:02 -04:00
committed by GitHub
50 changed files with 1334 additions and 246 deletions

View File

@@ -396,6 +396,15 @@ form {
// TODO: abstract this out into a Sass placeholder
.incontext-editor.is-editable {
.access-editor-action-wrapper {
display: inline-block;
vertical-align: middle;
max-width: 80%;
.icon.icon {
vertical-align: baseline;
}
}
.incontext-editor-value,
.incontext-editor-action-wrapper {
@extend %cont-truncated;
@@ -404,7 +413,7 @@ form {
max-width: 80%;
}
.incontext-editor-open-action {
.incontext-editor-open-action, .access-button {
@extend %ui-btn-non-blue;
@extend %t-copy-base;
padding-top: ($baseline/10);

View File

@@ -151,6 +151,9 @@
}
.modal-section-content {
.user-partition-group-checkboxes {
min-height: 95px;
}
.list-fields, .list-actions {
display: inline-block;
@@ -194,7 +197,7 @@
color: $blue-d2;
&:hover {
color: $blue-s2;
color: $blue-d4;
}
}
}
@@ -700,7 +703,7 @@
}
}
.edit-staff-lock, .edit-content-visibility {
.edit-staff-lock, .edit-content-visibility, .edit-unit-access {
margin-bottom: $baseline;
.tip {
@@ -710,7 +713,7 @@
}
// UI: staff lock section
.edit-staff-lock, .edit-settings-timed-examination {
.edit-staff-lock, .edit-settings-timed-examination, .edit-unit-access {
.checkbox-cosmetic .input-checkbox {
@extend %cont-text-sr;
@@ -777,4 +780,84 @@
}
}
}
.edit-unit-access, .edit-staff-lock {
.modal-section-content {
@include font-size(16);
.group-select-title {
font-weight: font-weight(semi-bold);
font-size: inherit;
margin-bottom: ($baseline/4);
.user-partition-select {
font-size: inherit;
}
}
.partition-group-directions {
padding-top: ($baseline/2);
}
.label {
&.deleted {
color: $red;
}
font-size: inherit;
margin-left: ($baseline/4);
}
.deleted-group-message {
display: block;
color: $red;
@include font-size(14);
}
.field {
margin-top: ($baseline/4);
}
}
}
.edit-unit-access, .edit-staff-lock {
.modal-section-content {
@include font-size(16);
.group-select-title {
font-weight: font-weight(semi-bold);
font-size: inherit;
margin-bottom: ($baseline/4);
.user-partition-select {
font-size: inherit;
}
}
.partition-group-directions {
padding-top: ($baseline/2);
}
.label {
&.deleted {
color: $red;
}
font-size: inherit;
@include margin-left($baseline/4);
}
.deleted-group-message {
display: block;
color: $red;
@include font-size(14);
}
.field {
margin-top: ($baseline/4);
}
}
}
}

View File

@@ -55,6 +55,14 @@
}
}
}
.container-access {
@include font-size(14);
line-height: 1.5;
white-space: normal;
color: #707070;
font-weight: font-weight(semi-bold);
}
}
&.has-actions {