Permalink
Browse files

Merge pull request #1849 from FinalAngel/develop

Frontend Fixes
  • Loading branch information...
2 parents 4c10806 + a7017cc commit b35be2fa24347097b8849ce9d1f7f16881307f8b @digi604 digi604 committed May 21, 2013
@@ -12,6 +12,7 @@
from cms.utils import cms_static_url, get_cms_setting
from cms.utils.permissions import has_plugin_permission
from cms.plugins.utils import has_reached_plugin_limit
+from cms.templatetags.cms_admin import admin_static_url
from django.contrib.admin import ModelAdmin
from django.http import HttpResponse, Http404, HttpResponseBadRequest, HttpResponseForbidden
from django.shortcuts import render_to_response, get_object_or_404
@@ -35,7 +36,7 @@ class Media:
)]
}
js = [cms_static_url(path) for path in [
- 'js/jquery.min.js',
+ '%sjs/jquery.min.js' % admin_static_url(),
'js/csrf.js',
'js/plugins/jquery.query.js',
'js/plugins/jquery.ui.custom.js',

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -11,7 +11,7 @@
// #PLACEHOLDER
.cms_placeholder { padding:5px 5px 0.1px; @include border-radius(3px); background:$color-grey-70; }
.cms_placeholder-generic,
-.cms_plugin { display:inline-block; position:relative; }
+.cms_plugin { display:inline; position:relative; }
// .cms_plugin-active { outline:2px solid adjust-hue($color-blue, 15deg); }
//######################################################################################################################
Oops, something went wrong.

0 comments on commit b35be2f

Please sign in to comment.