From 2be705ca014853cceb9f17936069c78ced8a2432 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Mon, 20 Feb 2012 21:59:26 -0500 Subject: [PATCH 1/3] Fixed bug where wiki warned users even as they saved their changes. --HG-- branch : bridger-dev --- simplewiki_edit.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/simplewiki_edit.html b/simplewiki_edit.html index e0bffd5f31..54fe13fe24 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -19,6 +19,11 @@ ${ wiki_article.title } 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()); + }); + }); From 76f98a17c86a0b6b327d327616e600bb83c40d2f Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Tue, 21 Feb 2012 10:59:42 -0500 Subject: [PATCH 2/3] Added autocomplete styles and removed commenting limit in Askbot --HG-- branch : bridger-dev --- sass/discussion/_discussion.scss | 48 ++++++++++++++++++++++++++--- sass/discussion/_question-view.scss | 2 +- sass/discussion/_tags.scss | 2 +- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/sass/discussion/_discussion.scss b/sass/discussion/_discussion.scss index bba34d7ff3..651699f2f5 100644 --- a/sass/discussion/_discussion.scss +++ b/sass/discussion/_discussion.scss @@ -62,14 +62,52 @@ body.askbot { 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; +} + diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index e51df7733a..bbda9527dd 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -275,7 +275,7 @@ div.question-header { } .counter { color: #888; - display: block; + display: none; float: right; margin-top: 5px; text-align: right; diff --git a/sass/discussion/_tags.scss b/sass/discussion/_tags.scss index 4bc440a29a..317cbe025c 100644 --- a/sass/discussion/_tags.scss +++ b/sass/discussion/_tags.scss @@ -39,7 +39,7 @@ ul.tags { float: none; left: 10px; opacity: 0.5; - padding: 3px 6px; + padding: 4px 6px; position: relative; top: 1px; From 4838ab1ba8ca905b3222519b3350f4765e701658 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Tue, 21 Feb 2012 14:54:30 -0500 Subject: [PATCH 3/3] Changed visual style of titles and filters --HG-- branch : bridger-dev --- sass/discussion/_answers.scss | 6 ++-- sass/discussion/_discussion.scss | 6 ++-- sass/discussion/_question-view.scss | 4 +-- sass/discussion/_questions.scss | 43 +++++++++++++++++++++++------ sass/discussion/_tags.scss | 2 +- 5 files changed, 42 insertions(+), 19 deletions(-) diff --git a/sass/discussion/_answers.scss b/sass/discussion/_answers.scss index 55bda8bcec..747ffc29ae 100644 --- a/sass/discussion/_answers.scss +++ b/sass/discussion/_answers.scss @@ -26,7 +26,7 @@ div.answer-controls { &:before { content: '|'; - color: darken(#F6EFD4, 10%); + color: #ccc; font-size: 16px; } } @@ -131,11 +131,11 @@ div.answer-actions { text-decoration: none; &.question-delete { - color: $mit-red; + // color: $mit-red; } &.question-edit, &.permant-link { - color: darken(#F6EFD4, 45%);; + // color: darken(#F6EFD4, 45%);; } } diff --git a/sass/discussion/_discussion.scss b/sass/discussion/_discussion.scss index 651699f2f5..3de284476e 100644 --- a/sass/discussion/_discussion.scss +++ b/sass/discussion/_discussion.scss @@ -20,11 +20,11 @@ } .action-link { a { - color: darken(#F6EFD4, 50%); + color: $mit-red; &:hover { text-decoration: none; - color: darken(#F6EFD4, 70%); + color: darken($mit-red, 20%); } } } @@ -70,7 +70,6 @@ body.askbot { } // Autocomplete - .acInput { width: 200px; } @@ -110,4 +109,3 @@ body.askbot { background-color: $mit-red; color: #fff; } - diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index bbda9527dd..c83dd9f7ca 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -72,7 +72,7 @@ div.question-header { width: flex-grid(4,8); a { - color: darken(#F6EFD4, 50%); + // color: darken(#F6EFD4, 50%); &.question-delete { color: $mit-red; @@ -80,7 +80,7 @@ div.question-header { } span.sep { - color: darken(#F6EFD4, 10%); + color: #ccc; } } } diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index 7fc57d7015..1a35eef69f 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -3,6 +3,7 @@ div.question-list-header { margin-bottom: 15px; overflow: hidden; width: flex-grid(9,9); + @extend h1.top-header; section.question-list-meta { display: block; @@ -14,6 +15,9 @@ div.question-list-header { float: left; } + h1 { + margin: 0; + } span.label { color: #555; } @@ -43,7 +47,7 @@ div.question-list-header { &:before { content: '|'; - color: darken(#F6EFD4, 10%); + color: #ccc; font-size: 16px; } } @@ -54,8 +58,7 @@ div.question-list-header { section.question-tags-list { display: block; min-height: 26px; - overflow: hidden; - padding-top:5px; + padding-top:15px; width: 100%; div { @@ -65,6 +68,7 @@ div.question-list-header { div.back { margin-right: 10px; + margin-top: 4px; a { color: #555; @@ -74,6 +78,14 @@ div.question-list-header { 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 { width: flex-grid(9,9); li.single-question { - border-top: 1px solid #eee; + border-bottom: 1px solid #eee; list-style: none; - padding: 10px 0; + padding: 10px 3%; + margin-left: -3%; + width: 100%; &:hover { - background: #fbfbfb; + background: #F3F3F3; + + ul.tags li { + background: #fff; + + &:before { + border-color: transparent #fff transparent transparent; + } + } + } + + &:first-child { + border-top: 0; } div { @@ -132,7 +158,7 @@ ul.question-list, div#question-list { li { @include linear-gradient(#fff, #f5f5f5); - border: 1px solid #eee; + border: 1px solid #ddd; display: inline-block; height:60px; margin-right: 10px; @@ -180,8 +206,7 @@ ul.question-list, div#question-list { } div.post-own-question { - border-top: 1px solid #efefef; - padding: 10px; + padding: 11px; a { font-weight: bold; diff --git a/sass/discussion/_tags.scss b/sass/discussion/_tags.scss index 317cbe025c..d8ea2e6c09 100644 --- a/sass/discussion/_tags.scss +++ b/sass/discussion/_tags.scss @@ -9,7 +9,7 @@ ul.tags { li { background: #eee; @include border-radius(4px); - @include box-shadow(1px 1px 0px #bbb); + @include box-shadow(0px 1px 0px #ccc); color: #555; display: inline-block; font-size: 12px;