diff options
author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2013-05-15 09:47:38 -0600 |
---|---|---|
committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2013-05-15 09:47:38 -0600 |
commit | 367412143dbe4132709b5eaa34edab27e204295f (patch) | |
tree | 4e4e3f24104dfff141141bf7c1c6376c07b5c2f3 | |
parent | 8f04fb32fcf53cdba74b254ad5b11aba22faa289 (diff) | |
parent | 68883de9a3f294d3dfa7e59e6a8765c341d710a5 (diff) | |
download | askbot-367412143dbe4132709b5eaa34edab27e204295f.tar.gz askbot-367412143dbe4132709b5eaa34edab27e204295f.tar.bz2 askbot-367412143dbe4132709b5eaa34edab27e204295f.zip |
Merge branch 'master' of github.com:ASKBOT/askbot-devel
-rw-r--r-- | askbot/media/js/live_search.js | 4 | ||||
-rw-r--r-- | askbot/media/style/style.css | 22 | ||||
-rw-r--r-- | askbot/media/style/style.less | 25 |
3 files changed, 20 insertions, 31 deletions
diff --git a/askbot/media/js/live_search.js b/askbot/media/js/live_search.js index 1aebb6ce..b812070c 100644 --- a/askbot/media/js/live_search.js +++ b/askbot/media/js/live_search.js @@ -409,7 +409,7 @@ FullTextSearch.prototype.runTagSearch = function() { url: url, dataType: 'json', success: function(data, text_status, xhr){ - me.renderFullTextResult(data, text_status, xhr); + me.renderFullTextSearchResult(data, text_status, xhr); $('#ab-tag-search').val(''); }, }); @@ -445,7 +445,7 @@ FullTextSearch.prototype.activateTagSearchInput = function() { matchInside: true, maxCacheLength: 100, maxItemsToShow: 20, - onItemSelect: function(){ this.runTagSearch(); }, + onItemSelect: function(){ me.runTagSearch(); }, delay: 10 }); ac.decorate($('#ab-tag-search')); diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css index b448aa46..695b33b4 100644 --- a/askbot/media/style/style.css +++ b/askbot/media/style/style.css @@ -63,6 +63,13 @@ textarea:focus, input:focus { outline: none; } +input[type="text"], +input[type="password"], +select, +textarea, +#askFormBar .questionTitleInput { + border: #cce6ec 3px solid; +} iframe { border: none; } @@ -438,7 +445,6 @@ body.user-messages { } .validate-email-page #validation-code { padding-left: 5px; - border: #cce6ec 3px solid; height: 25px; font-size: 14px; width: 200px; @@ -1622,7 +1628,6 @@ ul#related-tags li { line-height: 36px; margin: 0; padding-left: 5px; - border: #cce6ec 3px solid; width: 100%; /*719px;*/ @@ -1690,7 +1695,6 @@ ul#related-tags li { .ask-page #id_tags, .edit-question-page #id_tags { box-sizing: border-box; - border: #cce6ec 3px solid; height: 31px; padding-left: 5px; font-size: 14px; @@ -1709,7 +1713,6 @@ ul#related-tags li { .question-page #id_post_author_email, .edit-question-page #id_post_author_email, .edit-answer-page #id_post_author_email { - border: #cce6ec 3px solid; height: 25px; line-height: 25px; padding-left: 5px; @@ -1762,7 +1765,6 @@ ul#related-tags li { } #id_user, #id_user_author { - border: #cce6ec 3px solid; height: 25px; padding-left: 5px; width: 395px; @@ -1789,7 +1791,6 @@ ul#related-tags li { } #id_user, #id_user_author { - border: #cce6ec 3px solid; height: 25px; padding-left: 5px; width: 395px; @@ -1819,7 +1820,6 @@ ul#related-tags li { margin-right: 7px; } .folded-editor { - border: #cce6ec 3px solid; height: 100px; outline: none; width: 100%; @@ -2010,7 +2010,6 @@ ul#related-tags li { height: 36px; margin: 0px; padding: 0px 0 0 5px; - border: #cce6ec 3px solid; width: 100%; margin-bottom: 10px; box-sizing: border-box; @@ -2020,7 +2019,6 @@ ul#related-tags li { .edit-question-page #id_summary, #fmedit #id_summary, .wmd-preview #id_summary { - border: #cce6ec 3px solid; height: 25px; padding-left: 5px; width: 395px; @@ -2372,7 +2370,6 @@ ul#related-tags li { } .question-page .comments textarea { box-sizing: border-box; - border: #cce6ec 3px solid; color: #666; font-family: Arial; font-size: 13px; @@ -2659,7 +2656,7 @@ ul#related-tags li { } .box.vote-buttons { display: block; - width: 100%; + width: 100% !important; } .question-img-upvote, .question-img-downvote, @@ -2774,7 +2771,6 @@ ul#related-tags li { .users-page select, .user-profile-edit-page select, .user-profile-page select { - border: #cce6ec 3px solid; height: 25px; line-height: 25px; padding-left: 5px; @@ -2794,7 +2790,6 @@ ul#related-tags li { .users-page textarea, .user-profile-edit-page textarea, .user-profile-page textarea { - border: #cce6ec 3px solid; padding-left: 5px; padding-top: 5px; width: 395px; @@ -2878,7 +2873,6 @@ ul#related-tags li { height: 20px; margin: 0px; padding: 0px 0 0 5px; - border: #cce6ec 3px solid; width: 200px; } .openid-input { diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less index 20e0c4a1..a9c4f8fa 100644 --- a/askbot/media/style/style.less +++ b/askbot/media/style/style.less @@ -52,6 +52,14 @@ textarea:focus, input:focus{ outline: none; } +input[type="text"], +input[type="password"], +select, +textarea, +#askFormBar .questionTitleInput { + border: #cce6ec 3px solid; +} + iframe { border: none; } @@ -481,7 +489,6 @@ body.user-messages { } #validation-code { padding-left:5px; - border:#cce6ec 3px solid; height:25px; font-size: 14px; width: 200px; @@ -1724,7 +1731,6 @@ ul#related-tags li { line-height: 36px; margin: 0; padding-left: 5px; - border:#cce6ec 3px solid; width: 100%;/*719px;*/ box-sizing: border-box; -moz-box-sizing: border-box; @@ -1791,7 +1797,6 @@ ul#related-tags li { #id_tags { box-sizing: border-box; - border: #cce6ec 3px solid; height: 31px; padding-left: 5px; font-size: 14px; @@ -1809,7 +1814,6 @@ ul#related-tags li { .edit-answer-page { #id_post_author_username, #id_post_author_email { - border: #cce6ec 3px solid; height: 25px; line-height: 25px; padding-left: 5px; @@ -1860,7 +1864,6 @@ ul#related-tags li { #id_user, #id_user_author { - border:#cce6ec 3px solid; height:25px; padding-left:5px; width:395px; @@ -1891,7 +1894,6 @@ ul#related-tags li { #id_user, #id_user_author { - border:#cce6ec 3px solid; height:25px; padding-left:5px; width:395px; @@ -1924,7 +1926,6 @@ ul#related-tags li { } .folded-editor { - border:#cce6ec 3px solid; height: 100px; outline: none; width: 100%; @@ -1950,7 +1951,7 @@ ul#related-tags li { } .wmd-container { - border:#cce6ec 3px solid; + border: #cce6ec 3px solid; textarea { border: none; } @@ -2127,7 +2128,6 @@ ul#related-tags li { height: 36px; margin: 0px; padding: 0px 0 0 5px; - border:#cce6ec 3px solid; width: 100%; margin-bottom:10px; box-sizing: border-box; @@ -2135,7 +2135,6 @@ ul#related-tags li { -webkit-box-sizing: border-box; } #id_summary{ - border:#cce6ec 3px solid; height:25px; padding-left:5px; width:395px; @@ -2490,7 +2489,6 @@ ul#related-tags li { textarea { box-sizing: border-box; - border: #cce6ec 3px solid; color: #666; font-family: @body-font; font-size: 13px; @@ -2804,7 +2802,7 @@ ul#related-tags li { .box.vote-buttons { display: block; - width: 100%; + width: 100% !important; } .question-img-upvote, .question-img-downvote, @@ -2904,7 +2902,6 @@ ul#related-tags li { input[type="text"], input[type="password"], select{ - border:#cce6ec 3px solid; height:25px; line-height: 25px; padding-left:5px; @@ -2916,7 +2913,6 @@ ul#related-tags li { height:30px; } textarea{ - border:#cce6ec 3px solid; padding-left:5px; padding-top:5px; width:395px; @@ -2980,7 +2976,6 @@ ul#related-tags li { height: 20px; margin: 0px; padding: 0px 0 0 5px; - border:#cce6ec 3px solid; width:200px; } } |