Merge branch 'master' of https://github.com/theonion/bulbs-component-…

…clickventure

README.md

@@ -28,42 +28,57 @@ install which should match the ```<version>``` used in ```requirements.txt```:
 
 ### Implementation
 1. Create a clickventure package in the site's app directory.
-2. Add ```"bulbs_component_clickventure"``` to ```INSTALLED_APPS``` in Django's settings file.
-3. If you're using the public templates and scripts that come with this package by
-default, also include ```"bulbs_component_clickventure_public"``` in ```INSTALLED_APPS```. Follow [Implementing Public](#Implementing-public) below to finish this implementation.
-4. If you're using the cms templates and scripts that come with this package by
+1. Add ```"bulbs_component_clickventure"``` to ```INSTALLED_APPS``` in Django's settings file.
+1. If you're using the cms templates and scripts that come with this package by
 default, also include ```"bulbs_component_clickventure_cms"``` in ```INSTALLED_APPS```. Follow [Implementing CMS](#Implementing-cms) below to finish this implementation.
-5. Add a ```models.py``` that implements ```bulbs_component_clickventure.models.ClickventureMixin```.
-6. Create a migration for your app with Django migrations as you would any other app.
-
-#### Implementing Public
-To use the public templates, simply create a detail page with the following template
-logic included:
-```html
-{% include "clickventure/partials/clickventure.html" with content=<content-variable> share_partial_template="<share-template-path>" %}
-```
+1. Add a ```models.py``` that implements ```bulbs_component_clickventure.models.ClickventureMixin```.
+1. Create a migration for your app with Django migrations as you would any other app.
+
+#### Implementing Public Resources
+To use the public templates, scripts, and styles:
 
-Where ```<share-template-path>``` is the path to a share template, and
-```<content-variable>``` is the name of the variable containing the content's data.
-Note: you can use the ```{% with %}``` Django template tag to customize variables in
-the share template.
+1. Include ```"bulbs_component_clickventure_public"``` in ```INSTALLED_APPS``` in
+Django's settings file.
 
-#### Implementing CMS
-To use the CMS templates, create a CMS page with the following html:
-```html
-<clickventure-edit article="content"></clickventure-edit>
+1. Create a detail page with the following template logic included:
+  ```html
+  {% include "clickventure/partials/clickventure.html" with content=<content-variable> share_partial_template="<share-template-path>" %}
+  ```
+  Where ```<share-template-path>``` is the path to a share template, and
+  ```<content-variable>``` is the name of the variable containing the content's data.
+  Note: you can use the ```{% with %}``` Django template tag to customize variables in
+  the share template.
+
+##### Overriding Public Styles
+If overriding styles with a ```clickventure-variable-overrides.less``` file, the
+following line must be added to the pipeline so ```lessc``` can correctly compile
+styles:
+```python
+PIPELINE_LESS_ARGUMENTS = "--include-path={}".format(STATIC_ROOT)
 ```
 
-Where ```content``` is an angular scope variable containing the content's data.
+Then, add ```clickventure-variable-overrides.less``` to your app's ```static/styles``` folder.
+
+#### Implementing CMS Resources
+To use the CMS templates, scripts, and styles:
+
+1. Include ```"bulbs_component_clickventure_cms"``` in ```INSTALLED_APPS``` in
+Django's settings file.
+
+1. Create a CMS page with the following html:
+  ```html
+  <clickventure-edit article="content"></clickventure-edit>
+  ```
+  Where ```content``` is an angular scope variable containing the content's data.
 
-Finally, add ```bulbs.clickventure``` as a dependency for your CMS's Angular app.
+1. Add ```bulbs.clickventure``` as a dependency for your CMS's Angular app.
 
 
 ## django-bulbs-cms Package
 ```compat-builds/django-bulbs-cms``` should not be edited directly. This app exists only until
 CMS files are completely migrated out of django. To make changes to this package,
 edit files located in ```src/bulbs-cms``` then run ```grunt build_bulbs_cms_for_django```
-to rebuild ``compat-builds/django-bulbs-cms``` with your changes.
+to rebuild ```compat-builds/django-bulbs-cms``` with your changes.
 
 Commit your changes and the rebuilt package, then reinstall the app on whatever
 project(s) require the changes.

compat-builds/django-bulbs-cms/static/cms/clickventure/clickventure-edit-node.less

@@ -1,12 +1,4 @@
 clickventure-edit-node {
-  .node-text.form-control {
-    height: auto;
-  }
-
-  .editor, .editorPlaceholder {
-    padding: 0;
-  }
-
   .panel .panel-heading {
     padding: 6px 7px 6px 10px;
   }

compat-builds/django-bulbs-cms/static/cms/clickventure/clickventure-edit.less

@@ -11,5 +11,13 @@ clickventure-edit {
     .active button {
       color: white;
     }
+
+    .node-text {
+      height: auto;
+    }
+
+    .editor, .editorPlaceholder {
+      padding: 0;
+    }
   }
 }

compat-builds/django-bulbs-cms/templates/cms/partials/clickventure/clickventure-edit-link.html

@@ -1,7 +1,8 @@
 <div class="clickventure-link">
-  <div class="form-control form-group cv-link-extend">
+  <div class="form-control form-group node-text">
     <onion-editor
         ng-model="link.body"
+        role="singleline"
         formatting="bold,italic,strike"
         placeholder="Body">
     </onion-editor>

compat-builds/django-bulbs-cms/templates/cms/partials/clickventure/clickventure-edit-node.html

@@ -110,7 +110,7 @@ <h3>Inbound links</h3>
     <div ng-repeat="node in inboundNodes">
       <a
           ng-bind="node.title"
-          ng-click="selectNode({node:node})">  
+          ng-click="selectNode({node:node})">
       </a>
     </div>
   </div>

src/bulbs-cms/clickventure-edit/clickventure-edit-link/clickventure-edit-link.html

@@ -1,7 +1,8 @@
 <div class="clickventure-link">
-  <div class="form-control form-group cv-link-extend">
+  <div class="form-control form-group node-text">
     <onion-editor
         ng-model="link.body"
+        role="singleline"
         formatting="bold,italic,strike"
         placeholder="Body">
     </onion-editor>

src/bulbs-cms/clickventure-edit/clickventure-edit-node/clickventure-edit-node.html

@@ -110,7 +110,7 @@ <h3>Inbound links</h3>
     <div ng-repeat="node in inboundNodes">
       <a
           ng-bind="node.title"
-          ng-click="selectNode({node:node})">  
+          ng-click="selectNode({node:node})">
       </a>
     </div>
   </div>

src/bulbs-cms/clickventure-edit/clickventure-edit-node/clickventure-edit-node.less

@@ -1,12 +1,4 @@
 clickventure-edit-node {
-  .node-text.form-control {
-    height: auto;
-  }
-
-  .editor, .editorPlaceholder {
-    padding: 0;
-  }
-
   .panel .panel-heading {
     padding: 6px 7px 6px 10px;
   }

src/bulbs-cms/clickventure-edit/clickventure-edit.less

@@ -11,5 +11,13 @@ clickventure-edit {
     .active button {
       color: white;
     }
+
+    .node-text {
+      height: auto;
+    }
+
+    .editor, .editorPlaceholder {
+      padding: 0;
+    }
   }
 }