Commit 0342a650 by Bridger Maxwell

Merged in bug fix and Reda's changes

parents 3ce85573 4838ab1b
...@@ -26,7 +26,7 @@ div.answer-controls { ...@@ -26,7 +26,7 @@ div.answer-controls {
&:before { &:before {
content: '|'; content: '|';
color: darken(#F6EFD4, 10%); color: #ccc;
font-size: 16px; font-size: 16px;
} }
} }
...@@ -131,11 +131,11 @@ div.answer-actions { ...@@ -131,11 +131,11 @@ div.answer-actions {
text-decoration: none; text-decoration: none;
&.question-delete { &.question-delete {
color: $mit-red; // color: $mit-red;
} }
&.question-edit, &.permant-link { &.question-edit, &.permant-link {
color: darken(#F6EFD4, 45%);; // color: darken(#F6EFD4, 45%);;
} }
} }
......
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
} }
.action-link { .action-link {
a { a {
color: darken(#F6EFD4, 50%); color: $mit-red;
&:hover { &:hover {
text-decoration: none; text-decoration: none;
color: darken(#F6EFD4, 70%); color: darken($mit-red, 20%);
} }
} }
} }
...@@ -62,14 +62,50 @@ body.askbot { ...@@ -62,14 +62,50 @@ body.askbot {
margin-bottom: 70px; margin-bottom: 70px;
} }
// span, a {
// text-decoration: none;
// color: #888;
// font-weight: bold;
// }
} }
} }
} }
} }
} }
// Autocomplete
.acInput {
width: 200px;
}
.acResults {
background-color: #fff;
border: 1px solid #ababab;
overflow: hidden;
padding: 0px;
@include box-shadow(0 2px 2px #bbb);
ul {
list-style-position: outside;
list-style: none;
margin: 0;
padding: 0;
width: 100%;
}
li {
cursor: pointer;
display: block;
font: menu;
margin: 0px;
overflow: hidden;
padding: 5px 10px;
text-align: left;
border-top: 1px solid #eee;
width: 100%;
}
}
.acLoading {
background : url('../images/indicator.gif') right center no-repeat;
}
.acSelect {
background-color: $mit-red;
color: #fff;
}
...@@ -72,7 +72,7 @@ div.question-header { ...@@ -72,7 +72,7 @@ div.question-header {
width: flex-grid(4,8); width: flex-grid(4,8);
a { a {
color: darken(#F6EFD4, 50%); // color: darken(#F6EFD4, 50%);
&.question-delete { &.question-delete {
color: $mit-red; color: $mit-red;
...@@ -80,7 +80,7 @@ div.question-header { ...@@ -80,7 +80,7 @@ div.question-header {
} }
span.sep { span.sep {
color: darken(#F6EFD4, 10%); color: #ccc;
} }
} }
} }
...@@ -275,7 +275,7 @@ div.question-header { ...@@ -275,7 +275,7 @@ div.question-header {
} }
.counter { .counter {
color: #888; color: #888;
display: block; display: none;
float: right; float: right;
margin-top: 5px; margin-top: 5px;
text-align: right; text-align: right;
......
...@@ -3,6 +3,7 @@ div.question-list-header { ...@@ -3,6 +3,7 @@ div.question-list-header {
margin-bottom: 15px; margin-bottom: 15px;
overflow: hidden; overflow: hidden;
width: flex-grid(9,9); width: flex-grid(9,9);
@extend h1.top-header;
section.question-list-meta { section.question-list-meta {
display: block; display: block;
...@@ -14,6 +15,9 @@ div.question-list-header { ...@@ -14,6 +15,9 @@ div.question-list-header {
float: left; float: left;
} }
h1 {
margin: 0;
}
span.label { span.label {
color: #555; color: #555;
} }
...@@ -43,7 +47,7 @@ div.question-list-header { ...@@ -43,7 +47,7 @@ div.question-list-header {
&:before { &:before {
content: '|'; content: '|';
color: darken(#F6EFD4, 10%); color: #ccc;
font-size: 16px; font-size: 16px;
} }
} }
...@@ -54,8 +58,7 @@ div.question-list-header { ...@@ -54,8 +58,7 @@ div.question-list-header {
section.question-tags-list { section.question-tags-list {
display: block; display: block;
min-height: 26px; min-height: 26px;
overflow: hidden; padding-top:15px;
padding-top:5px;
width: 100%; width: 100%;
div { div {
...@@ -65,6 +68,7 @@ div.question-list-header { ...@@ -65,6 +68,7 @@ div.question-list-header {
div.back { div.back {
margin-right: 10px; margin-right: 10px;
margin-top: 4px;
a { a {
color: #555; color: #555;
...@@ -74,6 +78,14 @@ div.question-list-header { ...@@ -74,6 +78,14 @@ div.question-list-header {
div.tags-list { div.tags-list {
} }
ul.tags li {
background: #fff;
&:before {
border-color: transparent #fff transparent transparent;
}
}
} }
} }
...@@ -81,12 +93,26 @@ ul.question-list, div#question-list { ...@@ -81,12 +93,26 @@ ul.question-list, div#question-list {
width: flex-grid(9,9); width: flex-grid(9,9);
li.single-question { li.single-question {
border-top: 1px solid #eee; border-bottom: 1px solid #eee;
list-style: none; list-style: none;
padding: 10px 0; padding: 10px 3%;
margin-left: -3%;
width: 100%;
&:hover { &:hover {
background: #fbfbfb; background: #F3F3F3;
ul.tags li {
background: #fff;
&:before {
border-color: transparent #fff transparent transparent;
}
}
}
&:first-child {
border-top: 0;
} }
div { div {
...@@ -132,7 +158,7 @@ ul.question-list, div#question-list { ...@@ -132,7 +158,7 @@ ul.question-list, div#question-list {
li { li {
@include linear-gradient(#fff, #f5f5f5); @include linear-gradient(#fff, #f5f5f5);
border: 1px solid #eee; border: 1px solid #ddd;
display: inline-block; display: inline-block;
height:60px; height:60px;
margin-right: 10px; margin-right: 10px;
...@@ -180,8 +206,7 @@ ul.question-list, div#question-list { ...@@ -180,8 +206,7 @@ ul.question-list, div#question-list {
} }
div.post-own-question { div.post-own-question {
border-top: 1px solid #efefef; padding: 11px;
padding: 10px;
a { a {
font-weight: bold; font-weight: bold;
......
...@@ -9,7 +9,7 @@ ul.tags { ...@@ -9,7 +9,7 @@ ul.tags {
li { li {
background: #eee; background: #eee;
@include border-radius(4px); @include border-radius(4px);
@include box-shadow(1px 1px 0px #bbb); @include box-shadow(0px 1px 0px #ccc);
color: #555; color: #555;
display: inline-block; display: inline-block;
font-size: 12px; font-size: 12px;
...@@ -39,7 +39,7 @@ ul.tags { ...@@ -39,7 +39,7 @@ ul.tags {
float: none; float: none;
left: 10px; left: 10px;
opacity: 0.5; opacity: 0.5;
padding: 3px 6px; padding: 4px 6px;
position: relative; position: relative;
top: 1px; top: 1px;
......
...@@ -19,6 +19,11 @@ ${ wiki_article.title } ...@@ -19,6 +19,11 @@ ${ wiki_article.title }
return "You have made changes to the article that have not been saved yet."; return "You have made changes to the article that have not been saved yet.";
} }
}; };
$("#submit_edit").click(function() {
$("#id_contents").data('initial_contents', $("#id_contents").val());
});
}); });
</script> </script>
</%block> </%block>
......
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