mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Ian 2014-11-18 12:29:03 +01:00
commit 7423eb63f1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/NEWS
View File

@ -3,6 +3,11 @@
Version 2.0-beta4/5/6 / RC? ()
------------------------------------------------------------------------
* New personal preference to choose CKEditor toolbar presets.
Presets can be overwritte through a
templates/xxx/admin/ckeditor_custom_config.js if needed.
See htmlarea/ckeditor_s9y_config.js for details.
* Proof of concept templates "default-php" and "default-xml" have
been moved to Siber...Spartacus. They would need adapting to
Serendipity 2.0 (simple methods like getConfigDir() et al),

2
templates/2k11/admin/style.css
View File

@ -931,7 +931,7 @@ input[type=checkbox],
}
#media_filter_path .form_select {
margin: 0 0 0 2em;
margin: 0 0 0 .125em;
}
#serendipity_category .inputs .form_radio,