Skip to content

E
edx-platform
Commit c4cebb4f by Kyle Fiedler
Options

Merge heads

parents 95a90a1a 3f09848a
Showing with 156 additions and 73 deletions
sass/application.scss
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
@import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki", "wiki/table"; @import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki", "wiki/table";
@import "help"; @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/modals", "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", "discussion/badges";
sass/discussion/_askbot-original.scss
...@@ -1652,73 +1652,73 @@ body.anon #searchbar { ...@@ -1652,73 +1652,73 @@ body.anon #searchbar {
// padding: 5px; // padding: 5px;
// margin: 0px 0 10px 0; } } // margin: 0px 0 10px 0; } }
@media screen and (-webkit-min-device-pixel-ratio:0) { // @media screen and (-webkit-min-device-pixel-ratio:0) {
textarea { // textarea {
padding-left: 3px !important; } } // padding-left: 3px !important; } }
.facebook-share.icon, .twitter-share.icon, .linkedin-share.icon, .identica-share.icon { // .facebook-share.icon, .twitter-share.icon, .linkedin-share.icon, .identica-share.icon {
background: url(../images/socialsprite.png) no-repeat; // background: url(../images/socialsprite.png) no-repeat;
display: block; // display: block;
text-indent: -100em; // text-indent: -100em;
height: 25px; // height: 25px;
width: 25px; // width: 25px;
margin-bottom: 3px; } // margin-bottom: 3px; }
.facebook-share.icon:hover, .twitter-share.icon:hover, .linkedin-share.icon:hover, .identica-share.icon:hover { // .facebook-share.icon:hover, .twitter-share.icon:hover, .linkedin-share.icon:hover, .identica-share.icon:hover {
opacity: 0.8; // opacity: 0.8;
filter: alpha(opacity = 80); } // filter: alpha(opacity = 80); }
.facebook-share.icon { // .facebook-share.icon {
background-position: -26px 0px; } // background-position: -26px 0px; }
.identica-share.icon { // .identica-share.icon {
background-position: -78px 0px; } // background-position: -78px 0px; }
.twitter-share.icon { // .twitter-share.icon {
margin-top: 10px; // margin-top: 10px;
background-position: 0px 0px; } // background-position: 0px 0px; }
.linkedin-share.icon { // .linkedin-share.icon {
background-position: -52px 0px; } // background-position: -52px 0px; }
.openid-signin, .meta, .users-page, .user-profile-edit-page { // .openid-signin, .meta, .users-page, .user-profile-edit-page {
font-size: 13px; // font-size: 13px;
line-height: 1.3; // line-height: 1.3;
color: #525252; } // color: #525252; }
.openid-signin p, .meta p, .users-page p, .user-profile-edit-page p { // .openid-signin p, .meta p, .users-page p, .user-profile-edit-page p {
font-size: 13px; // font-size: 13px;
color: #707070; // color: #707070;
line-height: 1.3; // line-height: 1.3;
font-family: arial; // font-family: arial;
color: #525252; // color: #525252;
margin-bottom: 12px; } // margin-bottom: 12px; }
.openid-signin h2, .meta h2, .users-page h2, .user-profile-edit-page h2 { // .openid-signin h2, .meta h2, .users-page h2, .user-profile-edit-page h2 {
color: #525252; // color: #525252;
padding-left: 0px; // padding-left: 0px;
font-size: 16px; } // font-size: 16px; }
.openid-signin form, .meta form, .users-page form, .user-profile-edit-page form, .user-profile-page form { // .openid-signin form, .meta form, .users-page form, .user-profile-edit-page form, .user-profile-page form {
margin-bottom: 15px; } // margin-bottom: 15px; }
.openid-signin input[type="text"], .meta input[type="text"], .users-page input[type="text"], .user-profile-edit-page input[type="text"], .user-profile-page input[type="text"], .openid-signin input[type="password"], .meta input[type="password"], .users-page input[type="password"], .user-profile-edit-page input[type="password"], .user-profile-page input[type="password"], .openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select { // .openid-signin input[type="text"], .meta input[type="text"], .users-page input[type="text"], .user-profile-edit-page input[type="text"], .user-profile-page input[type="text"], .openid-signin input[type="password"], .meta input[type="password"], .users-page input[type="password"], .user-profile-edit-page input[type="password"], .user-profile-page input[type="password"], .openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select {
border: #cce6ec 3px solid; // border: #cce6ec 3px solid;
height: 25px; // height: 25px;
padding-left: 5px; // padding-left: 5px;
width: 395px; // width: 395px;
font-size: 14px; } // font-size: 14px; }
.openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select { // .openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select {
width: 405px; // width: 405px;
height: 30px; } // height: 30px; }
.openid-signin textarea, .meta textarea, .users-page textarea, .user-profile-edit-page textarea, .user-profile-page textarea { // .openid-signin textarea, .meta textarea, .users-page textarea, .user-profile-edit-page textarea, .user-profile-page textarea {
border: #cce6ec 3px solid; // border: #cce6ec 3px solid;
padding-left: 5px; // padding-left: 5px;
padding-top: 5px; // padding-top: 5px;
width: 395px; // width: 395px;
font-size: 14px; } // font-size: 14px; }
// .openid-signin input.submit, .meta input.submit, .users-page input.submit, .user-profile-edit-page input.submit, .user-profile-page input.submit { // .openid-signin input.submit, .meta input.submit, .users-page input.submit, .user-profile-edit-page input.submit, .user-profile-page input.submit {
// background: url(../images/small-button-blue.png) repeat-x top; // background: url(../images/small-button-blue.png) repeat-x top;
...@@ -2327,14 +2327,14 @@ label.retag-error { ...@@ -2327,14 +2327,14 @@ label.retag-error {
.hilite3 { .hilite3 {
background-color: #0ff; } background-color: #0ff; }
.gold, .badge1 { // .gold, .badge1 {
color: #ffcc00; } // color: #ffcc00; }
.silver, .badge2 { // .silver, .badge2 {
color: #cccccc; } // color: #cccccc; }
.bronze, .badge3 { // .bronze, .badge3 {
color: #cc9933; } // color: #cc9933; }
.score { .score {
font-weight: 800; font-weight: 800;
......
sass/discussion/_badges.scss 0 → 100644
div.badges-intro {
margin: 20px 0;
}
div.badge-intro {
@extend .badges-intro;
.badge1, .badge2, .badge3 {
font-size: 20px;
}
}
ul.badge-list {
li.badge {
border-bottom: 1px solid #eee;
@extend .clearfix;
list-style: none;
padding: 10px 0;
&:last-child {
border-bottom: 0;
}
div.check {
float:right;
min-width:flex-grid(1,9);
text-align:right;
span {
font-size:19px;
padding-right:5px;
color:green;
}
}
div.badge-name {
float:left;
width:flex-grid(3,9);
span {
font-size: 20px;
}
}
p {
margin: 0;
float:left;
}
}
}
.gold, .badge1 {
color: #ffcc00;
}
.silver, .badge2 {
color: #cccccc;
}
.bronze, .badge3 {
color: #cc9933;
}
div.badge-desc {
> div {
margin-bottom: 20px;
span {
font-size: 18px;
@include border-radius(10px);
}
}
}
sass/discussion/_profile.scss
...@@ -29,6 +29,10 @@ body.user-profile-page { ...@@ -29,6 +29,10 @@ body.user-profile-page {
&.votes-badges { &.votes-badges {
width: flex-grid(2,9); width: flex-grid(2,9);
p {
margin-top: 15px;
}
} }
&.answer-list { &.answer-list {
......
sass/wiki/_wiki.scss
...@@ -79,16 +79,16 @@ div.wiki-wrapper { ...@@ -79,16 +79,16 @@ div.wiki-wrapper {
} }
h2.wiki-title { h2.wiki-title {
margin-top: 0; @include box-sizing(border-box);
display: inline-block;
float: left;
margin-bottom: 15px; margin-bottom: 15px;
width: flex-grid(4, 9); margin-top: 0;
padding-right: flex-gutter(9); padding-right: flex-gutter(9);
border-right: 1px dashed #ddd;
@include box-sizing(border-box);
display: table-cell;
vertical-align: top; vertical-align: top;
width: flex-grid(2.5, 9);
@media screen and (max-width:1120px) { @media screen and (max-width:900px) {
display: block; display: block;
width: auto; width: auto;
border-right: 0; border-right: 0;
...@@ -106,14 +106,19 @@ div.wiki-wrapper { ...@@ -106,14 +106,19 @@ div.wiki-wrapper {
} }
section.results { section.results {
display: table-cell; @include box-sizing(border-box);
width: flex-grid(5, 9); display: inline-block;
padding-left: flex-gutter(9); border-left: 1px dashed #ddd;
float: left;
@media screen and (max-width:1120px) { padding-left: 10px;
width: flex-grid(6.5, 9);
@media screen and (max-width:900px) {
border: 0;
display: block; display: block;
padding-left: 0;
width: 100%;
width: auto; width: auto;
padding: 0;
} }
@media print { @media print {
...@@ -128,6 +133,11 @@ div.wiki-wrapper { ...@@ -128,6 +133,11 @@ div.wiki-wrapper {
ul.article-list { ul.article-list {
margin-left: 15px; margin-left: 15px;
width: 100%;
@media screen and (max-width:900px) {
margin-left: 0px;
}
li { li {
list-style: none; list-style: none;
......
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