Merge branch 'master' of github.com:ongov/ckanext-ontario_theme into …

…ai_assets

README.rst

@@ -138,17 +138,20 @@ Running the Tests
 To run the tests, make sure your ckan install is `setup for tests <https://docs.ckan.org/en/latest/contributing/test.html>`_, do::
 
     cd ckanext-ontario_theme # go to extension directory
-    nosetests --nologcapture --with-pylons=test.ini # active vertual environment that has nosetests.
+    nosetests --nologcapture --with-pylons=test.ini # run in virtual environment that has nosetests.
 
 To run the tests and produce a coverage report, first make sure you have
 coverage installed in your virtualenv (``pip install coverage``) then run::
 
     nosetests --nologcapture --with-pylons=test.ini --with-coverage --cover-package=ckanext.ontario_theme --cover-inclusive --cover-erase --cover-tests
 
-Also, add scheming and fluent to ``/usr/lib/ckan/default/src/ckan/test-core.ini``::
+Our custom config settings are in ``./test.ini``.
 
-    ckan.plugins = stats scheming_datasets fluent
-    scheming.dataset_schemas = ckanext.extrafields:ontario_theme_dataset.json
-    scheming.presets = ckanext.scheming:presets.json
-                       ckanext.fluent:presets.json
+Additional ways to run tests:
 
+    # Single Test method
+    nosetests ckanext/ontario_theme/tests/test_create_dataset.py:TestCreateDataset.test_package_create_with_invalid_update_frequency --nologcapture --with-pylons=test.ini
+    # Single Test class
+    nosetests ckanext/ontario_theme/tests/test_create_dataset.py:TestCreateDataset --nologcapture --with-pylons=test.ini
+    # Single Test module
+    nosetests ckanext/ontario_theme/tests/test_create_dataset.py --nologcapture --with-pylons=test.ini

ckanext/ontario_theme/fanstatic/external/colours.less

@@ -1,12 +1,13 @@
-@primary-colour: #0071a9;
-@primary-darker: #004466;
-@primary-darkest: #002233;
-@secondary-colour: #006B3F;
-@secondary-darker: #004d2d;
-@secondary-darkest: #00331e;
+@primary-colour: #00B2E3;
+@primary-darker: #1080A6;
+@primary-darkest: #094a60;
+@secondary-colour: #FCAF17;
+@secondary-darker: #8A600D;
+@secondary-darkest: #442f06;
 @ontario-link-colour: #06c;
-@grey: #4d4d4d;
-@background-grey: #f5f5f5;
+@grey: #666666;
+@black: #1A1A1A;
+@background-grey: #CCCCCC;
 @header-grey: #333;
 @button-grey-colour: #666;
 @button-grey-darker: #444;

ckanext/ontario_theme/fanstatic/external/colours_bk.less

@@ -0,0 +1,27 @@
+@primary-colour: #0071a9;
+@primary-darker: #004466;
+@primary-darkest: #002233;
+@secondary-colour: #006B3F;
+@secondary-darker: #004d2d;
+@secondary-darkest: #00331e;
+@ontario-link-colour: #06c;
+@grey: #4d4d4d;
+@background-grey: #f5f5f5;
+@header-grey: #333;
+@button-grey-colour: #666;
+@button-grey-darker: #444;
+@button-grey-darkest: #222;
+@ontario-link-hover-colour: #004e99;
+@ontario-link-visited-colour: #8138b3;
+
+/* =====================================================
+   Generic classes for Colby colours
+   ===================================================== */
+
+.primary-bg {
+  background-color: @primary-colour;
+}
+
+.secondary-bg {
+  background-color: @secondary-colour;
+}