Skip to content

E
edx-platform
Commit 7b757035 by Brian Talbot
Options

resolving Sass issues caused by previous merge conflict resolution in branch

parent 4f32d5f3
Showing with 71 additions and 100 deletions
cms/static/sass/_assets.scss
...@@ -4,13 +4,7 @@ ...@@ -4,13 +4,7 @@
width: 260px; width: 260px;
background-color: #fff; background-color: #fff;
} }
.upload-button {
@include blue-button;
float: left;
margin-right: 20px;
padding: 8px 30px 10px;
font-size: 12px;
}
.asset-library { .asset-library {
@include clearfix; @include clearfix;
...@@ -104,69 +98,69 @@ ...@@ -104,69 +98,69 @@
} }
.upload-modal { .upload-modal {
display: none; display: none;
width: 640px !important; width: 640px !important;
margin-left: -320px !important; margin-left: -320px !important;
.modal-body { .modal-body {
height: auto !important; height: auto !important;
overflow-y: auto !important; overflow-y: auto !important;
text-align: center; text-align: center;
} }
.file-input { .file-input {
display: none; display: none;
} }
.choose-file-button { .choose-file-button {
@include blue-button; @include blue-button;
padding: 10px 82px 12px; padding: 10px 82px 12px;
font-size: 17px; font-size: 17px;
} }
.progress-bar { .progress-bar {
display: none; display: none;
width: 350px; width: 350px;
height: 50px; height: 50px;
margin: 30px auto 10px; margin: 30px auto 10px;
border: 1px solid $blue; border: 1px solid $blue;
&.loaded { &.loaded {
border-color: #66b93d; border-color: #66b93d;
.progress-fill { .progress-fill {
background: #66b93d; background: #66b93d;
} }
} }
} }
.progress-fill { .progress-fill {
width: 0%; width: 0%;
height: 50px; height: 50px;
background: $blue; background: $blue;
color: #fff; color: #fff;
line-height: 48px; line-height: 48px;
} }
h1 { h1 {
float: none; float: none;
margin: 40px 0 30px; margin: 40px 0 30px;
font-size: 34px; font-size: 34px;
font-weight: 300; font-weight: 300;
} }
.close-button { .close-button {
@include white-button; @include white-button;
position: absolute; position: absolute;
top: 0; top: 0;
right: 15px; right: 15px;
width: 29px; width: 29px;
height: 29px; height: 29px;
padding: 0 !important; padding: 0 !important;
border-radius: 17px !important; border-radius: 17px !important;
line-height: 29px; line-height: 29px;
text-align: center; text-align: center;
} }
.embeddable { .embeddable {
display: none; display: none;
...@@ -184,9 +178,9 @@ ...@@ -184,9 +178,9 @@
width: 400px; width: 400px;
} }
.copy-button { .copy-button {
@include white-button; @include white-button;
display: none; display: none;
margin-bottom: 100px; margin-bottom: 100px;
} }
} }
\ No newline at end of file
cms/static/sass/_base.scss
// ------------------------------------- // -------------------------------------
// //
// Universal // Universal
// //
// ------------------------------------- // -------------------------------------
...@@ -34,30 +34,6 @@ h1 { ...@@ -34,30 +34,6 @@ h1 {
margin: 24px 6px; margin: 24px 6px;
} }
strong {
font-weight: 700;
}
em {
font-style: italic;
}
p + p,
p + ul,
p + ol {
margin-top: 20px;
}
code {
margin: 0 2px;
padding: 0px 5px;
border-radius: 3px;
border: 1px solid #eaeaea;
font-family: Monaco, monospace;
font-size: 12px;
background-color: #f8f8f8;
}
.waiting { .waiting {
opacity: 0.1; opacity: 0.1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment