Merge pull request #40 from aldryn/feature/fixes

Staticfile adaptions

.travis.yml

@@ -0,0 +1 @@
+language: python

aldryn_bootstrap3/cms_plugins.py

@@ -210,7 +210,7 @@ def icon_src(self, instance):
 plugin_pool.register_plugin(Bootstrap3ButtonCMSPlugin)
 
 
-class Bootstrap3ImageCMSPlugin(widgets.BootstrapMediaMixin, CMSPluginBase):
+class Bootstrap3ImageCMSPlugin(CMSPluginBase):
     model = models.Boostrap3ImagePlugin
     name = _("Image")
     module = _('Bootstrap3')
@@ -462,7 +462,7 @@ def render(self, context, instance, placeholder):
 ########
 
 
-class Bootstrap3RowCMSPlugin(widgets.BootstrapMediaMixin, CMSPluginBase):
+class Bootstrap3RowCMSPlugin(CMSPluginBase):
     model = models.Bootstrap3RowPlugin
     name = _('Row')
     module = _('Bootstrap3')
@@ -517,7 +517,7 @@ def save_model(self, request, obj, form, change):
         return response
 
 
-class Bootstrap3ColumnCMSPlugin(CMSPluginBase, widgets.BootstrapMediaMixin):
+class Bootstrap3ColumnCMSPlugin(CMSPluginBase):
     model = models.Bootstrap3ColumnPlugin
     name = _('Column')
     module = _('Bootstrap3')
@@ -556,7 +556,7 @@ class Bootstrap3ColumnCMSPlugin(CMSPluginBase, widgets.BootstrapMediaMixin):
 #############
 
 
-class Bootstrap3AccordionCMSPlugin(CMSPluginBase, widgets.BootstrapMediaMixin):
+class Bootstrap3AccordionCMSPlugin(CMSPluginBase):
     model = models.Bootstrap3AccordionPlugin
     name = _('Accordion')
     module = _('Bootstrap3')
@@ -587,7 +587,7 @@ def render(self, context, instance, placeholder):
         return context
 
 
-class Bootstrap3AccordionItemCMSPlugin(CMSPluginBase, widgets.BootstrapMediaMixin):
+class Bootstrap3AccordionItemCMSPlugin(CMSPluginBase):
     model = models.Bootstrap3AccordionItemPlugin
     name = _('Accordion item')
     module = _('Accordion')
@@ -628,7 +628,7 @@ def render(self, context, instance, placeholder):
 #############
 
 
-class Bootstrap3ListGroupCMSPlugin(CMSPluginBase, widgets.BootstrapMediaMixin):
+class Bootstrap3ListGroupCMSPlugin(CMSPluginBase):
     model = models.Bootstrap3ListGroupPlugin
     name = _('List Group')
     module = _('Bootstrap3')
@@ -658,7 +658,7 @@ def render(self, context, instance, placeholder):
         return context
 
 
-class Bootstrap3ListGroupItemCMSPlugin(CMSPluginBase, widgets.BootstrapMediaMixin):
+class Bootstrap3ListGroupItemCMSPlugin(CMSPluginBase):
     model = models.Bootstrap3ListGroupItemPlugin
     name = _('List Group Item')
     module = _('Bootstrap3')
@@ -704,11 +704,11 @@ def render(self, context, instance, placeholder):
 
 
 # Base Classes
-class CarouselBase(CMSPluginBase, widgets.BootstrapMediaMixin):
+class CarouselBase(CMSPluginBase):
     module = _('Bootstrap3')
 
 
-class CarouselSlideBase(CarouselBase, widgets.BootstrapMediaMixin):
+class CarouselSlideBase(CarouselBase):
     require_parent = True
     parent_classes = ['Bootstrap3CarouselCMSPlugin']
 

aldryn_bootstrap3/static/aldryn_bootstrap3/css/base.css

@@ -0,0 +1,57 @@
+@charset "utf-8";
+/*!
+ * @copyright: https://github.com/divio/django-cms
+ */
+
+/*##############################################################################
+// BASE */
+
+/* set visibility of "Advanced (Show)" button */
+.collapse {
+    visibility: visible !important;
+    display: block;
+}
+
+/*##############################################################################
+// CONTEXT WIDGET */
+/* used in aldryn_bootstrap3/widgets/context.html */
+.aldryn-bootstrap3-context {
+    margin-left: 3px;
+}
+.aldryn-bootstrap3-context label {
+    position: relative !important;
+    z-index: 1 !important;
+}
+.aldryn-bootstrap3-context label.active {
+    z-index: 10 !important;
+    outline: 3px solid #000;
+    border-radius: 0;
+}
+.aldryn-bootstrap3-context label.btn-link {
+    border-color: #ccc;
+}
+
+/*##############################################################################
+// ICON WIDGET */
+.aldryn-bootstrap3-icon select.form-control {
+    width: auto !important;
+}
+.aldryn-bootstrap3-icon .search-control {
+}
+
+.iconpicker-popover .search-control {
+    width: 100% !important;
+}
+.iconpicker-popover table tfoot tr td {
+   padding-top: 10px;
+   border-top: 0;
+   background: none;
+}
+.iconpicker-popover .page-count {
+    display: inline-block;
+    padding-top: 8px;
+}
+/* the first entry uses ".glyphicon-" to deselect any icons */
+.iconpicker-popover .glyphicon- {
+    width: 14px;
+}

aldryn_bootstrap3/static/aldryn_bootstrap3/css/bootstrap-iconpicker.min.css

@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap-iconpicker v1.7.0
+ *
+ * Copyright 2013-2015 Victor Valencia Rico.
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @recktoner.
+ */.iconpicker .caret{margin-left:10px!important}.iconpicker{min-width:60px}.iconpicker input.search-control{margin-bottom:6px;margin-top:6px}div.iconpicker.left .table-icons{margin-right:auto}div.iconpicker.center .table-icons{margin-left:auto;margin-right:auto}div.iconpicker.right .table-icons{margin-left:auto}.table-icons .btn{min-height:30px;min-width:35px;text-align:center;padding:0;margin:2px}.table-icons td{min-width:39px}.popover{max-width:inherit!important}.iconpicker-popover{z-index:1050!important}.iconpicker-popover .search-control{margin-bottom:6px;margin-top:6px}