diff --git a/doc/changelogs/20110704.txt b/doc/changelogs/20110704.txt index d66aced6..35ee8a20 100644 --- a/doc/changelogs/20110704.txt +++ b/doc/changelogs/20110704.txt @@ -25,5 +25,5 @@ Here is a pretty exhaustive list of what the BIG MERGE includes: - slight modifications on forms: separator between fields, text shadow, error message redesigned, ...etc - quick link to edit directly a model from the submenu - new sites picker (if the multi_sites mode is enabled and correctly set up) -- the robots.txt can be edited directly from the back-office (site settings). +- the robots.txt can be edited directly from the back-office (site settings) (ticket #57) - a lot of internal refactoring as well as a ton of bug corrections \ No newline at end of file diff --git a/public/stylesheets/admin/inline_editor.css b/public/stylesheets/admin/inline_editor.css index f3aef040..cb31e5ec 100644 --- a/public/stylesheets/admin/inline_editor.css +++ b/public/stylesheets/admin/inline_editor.css @@ -1,3 +1,5 @@ +#page-toolbar * { margin: 0; padding: 0; } + #page-toolbar { position: fixed; top: 0px;