Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12372 from edx/feature/catalog-admin

Browse Source 
Merge catalog admin into master.
This commit is contained in:
Peter Fogg
2016-05-05 10:29:13 -04:00
parent e6f3af654b 85a6954d87
commit 4a417f2832
35 changed files with 1216 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
lms/static/sass/views/_api-access.scss
View File

@@ -1,19 +1,19 @@
#api-access-wrapper {
#api-access-request-header {
h1 {
@extend %t-title4;
margin-bottom: 0;
padding: $baseline;
@include text-align(left);
}
.api-access-request-subheading {
h2 {
@extend %t-title5;
margin: $baseline;
@include text-align(left);
}
.api-tos-body {
p {
@extend %t-copy-sub1;
margin: $baseline;
}
@@ -40,64 +40,95 @@
@extend %t-copy-base;
}
.api-management-form {
.catalog-body {
display: inline-block;
width: 100%;
}
padding: 0 $baseline $baseline $baseline;
.api-form-container {
@include float(left);
width: 50%;
p {
margin: 1.5*$baseline 0;
.api-form {
.helptext {
@extend %t-copy-sub1;
display: block;
padding: 0 $baseline $baseline $baseline;
p {
margin: 1.5*$baseline 0;
.helptext {
@extend %t-copy-sub1;
display: block;
}
}
}
label {
@extend %t-copy-base;
display: block;
font-style: normal;
&.tos-checkbox-label {
display: inline-block;
}
}
input, textarea {
@extend %t-copy-base;
font-family: 'Open Sans';
font-style: normal;
width: 300px;
&[type=checkbox] {
display: inline-block;
width: initial;
@include margin-right(0.5*$baseline);
}
}
.errorlist {
padding: 0;
list-style-type: none;
li {
label {
@extend %t-copy-base;
margin: 0;
color: $red;
display: block;
font-style: normal;
}
input[type=checkbox] + label {
display: inline-block;
}
input, textarea {
@extend %t-copy-base;
font-family: 'Open Sans';
font-style: normal;
width: 300px;
&[type=checkbox] {
display: inline-block;
width: initial;
@include margin-right(0.5*$baseline);
}
&[type=submit] {
@extend %t-copy-base;
border-radius: 3px;
border: none;
background-color: $blue;
box-shadow: none;
background-image: none;
text-shadow: none;
text-transform: none;
}
}
.errorlist {
padding: 0;
list-style-type: none;
li {
@extend %t-copy-base;
margin: 0;
color: $red;
}
}
#api-access-submit, .preview-query {
@extend %t-copy-base;
border-radius: 3px;
border: none;
background-color: $blue;
box-shadow: none;
background-image: none;
text-shadow: none;
text-transform: none;
}
}
}
#api-access-submit {
@extend %t-copy-base;
border-radius: 3px;
border: none;
background-color: $blue;
box-shadow: none;
background-image: none;
text-shadow: none;
text-transform: none;
}
.preview-results {
@include float(right);
width: 50%;
}
.preview-query {
display: block;
margin-top: $baseline/2;
}
.application-info {