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

Merge pull request #5886 from artoartnik/develop

Browse source 
Fix unconventional image asset inclusion in css asset
This commit is contained in:
Jonne Haß 2015-04-25 17:39:59 +02:00
commit cfa4567d26
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -2,6 +2,7 @@
## Refactor ## Refactor
* Use Bootstrap modal for new aspect pane [#5850](https://github.com/diaspora/diaspora/pull/5850) * Use Bootstrap modal for new aspect pane [#5850](https://github.com/diaspora/diaspora/pull/5850)
* Use asset helper instead of .css.erb [#5886](https://github.com/diaspora/diaspora/pull/5886)
## Bug fixes ## Bug fixes
* Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846) * Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)

2
app/assets/stylesheets/vendor/autoSuggest.css.erb → app/assets/stylesheets/vendor/autoSuggest.css vendored
View file

@ -13,7 +13,7 @@ ul.as-selections {
} }
ul.as-selections.loading { ul.as-selections.loading {
background: url('<%= image_path("ajax-loader.gif") %>') right center no-repeat; background: asset_path("ajax-loader.gif") right center no-repeat;
} }
ul.as-selections li { ul.as-selections li {