summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsun2010-12-19 19:19:56 (GMT)
committer sun2010-12-19 19:19:56 (GMT)
commite6422b284ea9307cb4ddd60f05ce6ef4e88ab642 (patch)
tree577790acbe97825ec6944ee7eb28f9606412abdc
parent80e4748a123d5d5437bfc65504fa5789450ea4c8 (diff)
#975546 by TwoD, sun: Fixed markItUp CSS loaded with wrong weight.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--editors/markitup.inc9
2 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2f51411..c77b780 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,7 @@
Wysiwyg 7.x-2.x, xxxx-xx-xx
---------------------------
+#975546 by TwoD, sun: Fixed markItUp CSS loaded with wrong weight.
#659428 by TwoD, sun: Fixed editor is attached to disabled text format widgets.
#975490 by Gábor Hojtsy: Updated for 'group' API change in drupal_add_js().
#974604 by CrookedNumber, Gábor Hojtsy: Fixed theme CSS not loaded in editors.
diff --git a/editors/markitup.inc b/editors/markitup.inc
index 1b030f8..b23a11e 100644
--- a/editors/markitup.inc
+++ b/editors/markitup.inc
@@ -97,9 +97,12 @@ function wysiwyg_markitup_themes($editor, $profile) {
* Drupal.settings.wysiwyg.configs.{editor}
*/
function wysiwyg_markitup_settings($editor, $config, $theme) {
- // Whoever is guilty for adding this horrible CSS-file-without-filepath
- // override "feature" to Drupal core... stand in the corner!
- drupal_add_css($editor['library path'] . '/markitup/skins/' . $theme . '/style.css', 'theme');
+ drupal_add_css($editor['library path'] . '/markitup/skins/' . $theme . '/style.css', array(
+ // Specify an alternate basename; otherwise, style.css would override a
+ // commonly used style.css file of the theme.
+ 'basename' => 'markitup.' . $theme . '.style.css',
+ 'group' => CSS_THEME,
+ ));
$settings = array(
'root' => base_path() . $editor['library path'] . '/markitup/',