nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6130 from svbergerem/fix-autocomplete

Browse source 
Fix autocomplete
This commit is contained in:
Jonne Haß 2015-06-22 00:47:34 +02:00
commit a663925197
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

@ -34,7 +34,7 @@ bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local
* Replace jquery.autoresize with autosize [#6104](https://github.com/diaspora/diaspora/pull/6104) * Replace jquery.autoresize with autosize [#6104](https://github.com/diaspora/diaspora/pull/6104)
* Improve mobile conversation design [#6087](https://github.com/diaspora/diaspora/pull/6087) * Improve mobile conversation design [#6087](https://github.com/diaspora/diaspora/pull/6087)
* Replace remaining faceboxes with Bootstrap modals [#6106](https://github.com/diaspora/diaspora/pull/6106) * Replace remaining faceboxes with Bootstrap modals [#6106](https://github.com/diaspora/diaspora/pull/6106)
* Rewrite header using Bootstrap 3 [#6109](https://github.com/diaspora/diaspora/pull/6109) * Rewrite header using Bootstrap 3 [#6109](https://github.com/diaspora/diaspora/pull/6109) [#6130](https://github.com/diaspora/diaspora/pull/6130)
## Bug fixes ## Bug fixes
* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852) * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

8
app/assets/stylesheets/autocomplete.scss
View file

@ -19,6 +19,7 @@
} }
.ac_results li { .ac_results li {
color: white;
margin: 0px; margin: 0px;
padding: 2px 5px { padding: 2px 5px {
left: 50px; left: 50px;
@ -47,16 +48,15 @@
} }
.ac_odd { .ac_odd {
background-color: #fafafa; background-color: $navbar-inverse-bg;
} }
.ac_even { .ac_even {
background-color: #fff; background-color: darken($navbar-inverse-bg, 3%);
} }
.ac_over { .ac_over {
background-color: #3F8FBA; background-color: $brand-primary;
color: white;
} }
.ac_results { .ac_results {

2
vendor/assets/javascripts/jquery.autocomplete-custom.js vendored
View file

@ -571,7 +571,7 @@ $.Autocompleter.Select = function (options, input, select, config) {
element = $("<div/>") element = $("<div/>")
.hide() .hide()
.addClass(options.resultsClass) .addClass(options.resultsClass)
.css("position", "absolute") .css("position", "fixed")
.appendTo(document.body); .appendTo(document.body);
list = $("<ul/>").appendTo(element).mouseover( function(event) { list = $("<ul/>").appendTo(element).mouseover( function(event) {