Skip to content

E
edx-platform
Commit 3ce85573 by Kyle Fiedler
Options

Merged heads

parents 0e221693 a75ba51c
Showing with 129 additions and 78 deletions
sass/application.scss
......@@ -13,4 +13,5 @@
@import "profile";
@import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki";
@import "help";
@import "discussion/askbot-original", "discussion/discussion","discussion/sidebar", "discussion/questions", "discussion/tags", "discussion/question-view" , "discussion/answers", "discussion/forms", "discussion/form-wmd-toolbar", "discussion/profile";
@import "discussion/askbot-original", "discussion/discussion","discussion/sidebar", "discussion/questions", "discussion/tags", "discussion/question-view" , "discussion/answers", "discussion/forms", "discussion/form-wmd-toolbar", "discussion/modals", "discussion/profile";
sass/discussion/_askbot-original.scss
......@@ -2111,44 +2111,44 @@ ins {
background-color: #e6f0a2; }
background-color: #e6f0a2; }
.vote-notification {
z-index: 1;
cursor: pointer;
display: none;
position: absolute;
font-family: arial;
font-size: 14px;
font-weight: normal;
color: white;
background-color: #8e0000;
text-align: center;
padding-bottom: 10px;
-webkit-box-shadow: 0px 2px 4px #370000;
-moz-box-shadow: 0px 2px 4px #370000;
box-shadow: 0px 2px 4px #370000;
border-radius: 4px;
-ms-border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-khtml-border-radius: 4px;
h3 {
background: url(../images/notification.png) repeat-x top;
padding: 10px 10px 10px 10px;
font-size: 13px;
margin-bottom: 5px;
border-top: #8e0000 1px solid;
color: #fff;
font-weight: normal;
border-top-right-radius: 4px;
border-top-left-radius: 4px;
-moz-border-radius-topright: 4px;
-moz-border-radius-topleft: 4px;
-webkit-border-top-left-radius: 4px;
-webkit-border-top-right-radius: 4px; }
a {
color: #fb7321;
text-decoration: underline;
font-weight: bold; } }
// .vote-notification {
// z-index: 1;
// cursor: pointer;
// display: none;
// position: absolute;
// font-family: arial;
// font-size: 14px;
// font-weight: normal;
// color: white;
// background-color: #8e0000;
// text-align: center;
// padding-bottom: 10px;
// -webkit-box-shadow: 0px 2px 4px #370000;
// -moz-box-shadow: 0px 2px 4px #370000;
// box-shadow: 0px 2px 4px #370000;
// border-radius: 4px;
// -ms-border-radius: 4px;
// -moz-border-radius: 4px;
// -webkit-border-radius: 4px;
// -khtml-border-radius: 4px;
// h3 {
// background: url(../images/notification.png) repeat-x top;
// padding: 10px 10px 10px 10px;
// font-size: 13px;
// margin-bottom: 5px;
// border-top: #8e0000 1px solid;
// color: #fff;
// font-weight: normal;
// border-top-right-radius: 4px;
// border-top-left-radius: 4px;
// -moz-border-radius-topright: 4px;
// -moz-border-radius-topleft: 4px;
// -webkit-border-top-left-radius: 4px;
// -webkit-border-top-right-radius: 4px; }
// a {
// color: #fb7321;
// text-decoration: underline;
// font-weight: bold; } }
// #ground {
// width: 100%;
......
sass/discussion/_modals.scss 0 → 100644
.vote-notification {
background-color: darken($mit-red, 7%);
@include border-radius(4px);
@include box-shadow(0px 2px 9px #aaa);
color: white;
cursor: pointer;
display: none;
font-size: 14px;
font-weight: normal;
padding-bottom: 10px;
position: absolute;
text-align: center;
h3 {
background: $mit-red;
padding: 10px 10px 10px 10px;
font-size: 13px;
margin-bottom: 5px;
border-bottom: darken(#8e0000, 10%) 1px solid;
@include box-shadow(0 1px 0 lighten($mit-red, 10%));
color: #fff;
font-weight: normal;
@include border-radius(4px 4px 0 0);
}
a {
color: #fb7321;
text-decoration: underline;
font-weight: bold; } }
sass/discussion/_question-view.scss
......@@ -295,4 +295,18 @@ div.question-header {
}
}
div.question-status {
background: $mit-red;
clear:both;
color: #fff;
display: block;
padding: 10px 0 10px 7.5%;
h3 {
font-weight: normal;
}
a {
color: #eee;
}
}
sass/discussion/_questions.scss
......@@ -86,7 +86,7 @@ ul.question-list, div#question-list {
padding: 10px 0;
&:hover {
background: lighten(#F6EFD4, 8%);
background: #fbfbfb;
}
div {
......@@ -131,27 +131,31 @@ ul.question-list, div#question-list {
text-align: right;
li {
@include border-radius(3px);
@include linear-gradient(#fff, #f5f5f5);
border: 1px solid #eee;
display: inline-block;
height:60px;
margin-right: 10px;
width: 60px;
&:hover {
span, div {
color: #555;
}
}
&.views {
background: lighten(#F6EFD4, 5%);
}
&.answers {
background: #F6EFD4;
}
&.votes {
background: darken(#F6EFD4, 5%);
}
span, div {
@include box-sizing(border-box);
color: darken(#F6EFD4, 60%);
color: #888;
display: block;
text-align: center;
}
......
sass/discussion/_tags.scss
ul.tags {
list-style: none;
display: inline;
li, a {
position: relative;
}
li {
@include border-radius(4px);
background: #eee;
@include border-radius(4px);
@include box-shadow(1px 1px 0px #bbb);
color: #555;
display: inline-block;
font-size: 12px;
margin-bottom: 5px;
margin-left: 15px;
padding: 3px 10px 5px 5px;
margin-bottom: 5px;
&:before {
border-color:transparent #eee transparent transparent;
......@@ -20,15 +23,15 @@ ul.tags {
border-width:12px 12px 12px 0;
content:"";
height:0;
left:-11px;
left:-10px;
position:absolute;
top:0;
width:0;
}
span.delete-icon, div.delete-icon {
@include border-radius(0 4px 4px 0);
background: #555;
@include border-radius(0 4px 4px 0);
clear: none;
color: #eee;
cursor: pointer;
......@@ -53,11 +56,12 @@ ul.tags {
}
span.tag-number {
@include border-radius(3px);
background: #555;
font-size: 10px;
margin: 0 3px;
padding: 2px 5px;
color: #eee;
opacity: 0.5;
display: none;
// @include border-radius(3px);
// background: #555;
// font-size: 10px;
// margin: 0 3px;
// padding: 2px 5px;
// color: #eee;
// opacity: 0.5;
}
sass/layout/_leanmodal.scss
......@@ -10,24 +10,24 @@
}
div.leanModal_box {
background: #fff;
border: none;
@include border-radius(3px);
@include box-shadow(0 0 6px #000);
@include box-sizing(border-box);
display: none;
border: none;
background: #fff;
padding: lh(2);
a.modal_close {
color: #aaa;
display: block;
font-style: normal;
height: 14px;
position: absolute;
top: 12px;
right: 12px;
display: block;
top: 12px;
width: 14px;
height: 14px;
z-index: 2;
color: #aaa;
font-style: normal;
&:hover{
text-decoration: none;
......@@ -36,11 +36,11 @@ div.leanModal_box {
}
h1 {
border-bottom: 1px solid #eee;
font-size: 24px;
margin-bottom: lh();
margin-top: 0;
padding-bottom: lh();
border-bottom: 1px solid #eee;
margin-bottom: lh();
text-align: left;
}
......@@ -67,16 +67,16 @@ div.leanModal_box {
&:hover {
div.tip {
display: block;
line-height: lh();
position: absolute;
background: #333;
color: #fff;
width: 500px;
display: block;
font-size: 16px;
line-height: lh();
margin: 0 0 0 -10px;
padding: 10px;
position: absolute;
-webkit-font-smoothing: antialiased;
font-size: 16px;
width: 500px;
}
}
}
......@@ -88,16 +88,16 @@ div.leanModal_box {
div#enroll_error, div#login_error, div#pwd_error {
$error-color: #333;
-webkit-font-smoothing: antialiased;
background-color: $error-color;
border: darken($error-color, 20%);
color: #fff;
text-shadow: 0 1px 0 darken($error-color, 10%);
font-family: "Open sans";
font-weight: bold;
letter-spacing: 1px;
margin: (-(lh())) (-(lh())) lh();
padding: lh(.5);
text-shadow: 0 1px 0 darken($error-color, 10%);
-webkit-font-smoothing: antialiased;
&:empty {
padding: 0;
......@@ -112,11 +112,11 @@ div.leanModal_box {
margin-bottom: lh(.5);
&.terms, &.remember {
float: none;
width: auto;
border-top: 1px solid #eee;
clear: both;
float: none;
padding-top: lh();
border-top: 1px solid #eee;
width: auto;
}
&.honor-code {
......@@ -143,11 +143,11 @@ div.leanModal_box {
margin: lh(.5) 0 lh() lh();
li {
list-style: disc outside none;
margin-bottom: lh(.5);
color: #666;
font-size: 14px;
float: none;
font-size: 14px;
list-style: disc outside none;
margin-bottom: lh(.5);
}
}
}
......
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