Merge branch 'master' of github.com:ckan/ckan into 1641-resource-crea…

…te-requires-url
ckan · Apr 28, 2014 · 0b1bb78 · 0b1bb78
2 parents 71ef11f + 76c7354
commit 0b1bb78
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/ckan/public/base/less/layout.less b/ckan/public/base/less/layout.less
@@ -109,6 +109,7 @@
     margin: 0 0 5px 0;
     font-size: 18px;
     line-height: 1.3;
+    .break-word();
   }
   .info {
     margin-top: 15px;

diff --git a/ckan/public/base/less/media.less b/ckan/public/base/less/media.less
@@ -90,6 +90,7 @@
   font-size: 18px;
   line-height: 1.3;
   margin: 5px 0;
+  .break-word();
 }
 
 // Overlay

diff --git a/ckan/public/base/less/mixins.less b/ckan/public/base/less/mixins.less
@@ -1,3 +1,16 @@
+.break-word {
+  -ms-word-break: break-all;
+  word-break: break-all;
+
+  /* Non standard for webkit */
+  word-break: break-word;
+
+  -webkit-hyphens: auto;
+  -moz-hyphens: auto;
+  -ms-hyphens: auto;
+  hyphens: auto;
+}
+
 .transform (@func) {
   -webkit-transform: @arguments;
   -moz-transform: @arguments;

diff --git a/doc/contributing/pull-requests.rst b/doc/contributing/pull-requests.rst
@@ -64,7 +64,7 @@ This section will walk you through the steps for making a pull request.
 
    - Your branch should contain new or changed tests for any new or changed
      code, and all the CKAN tests should pass on your branch, see
-     `Testing CKAN <http://docs.ckan.org/en/latest/test.html>`_.
+     :doc:`test`.
 
    - Your branch should contain new or updated documentation for any new or
      updated code, see :doc:`documentation`.

diff --git a/doc/contributing/test.rst b/doc/contributing/test.rst
@@ -71,8 +71,6 @@ option::
 
      nosetests --ckan --reset-db --with-pylons=test-core.ini ckan
 
-If you are have the ``ckan-migration`` option on the tests will reset the
-reset the database before the test run.
 
 
 .. _migrationtesting:
@@ -84,7 +82,7 @@ Migration testing
 If you're a CKAN developer or extension developer and your new code requires a
 change to CKAN's model, you'll need to write a migration script. To ensure that
 the migration script itself gets tested, you should run the tests with
-they ``--ckan-migration`` option, for example::
+the ``--ckan-migration`` option, for example::
 
      nosetests --ckan --ckan-migration --with-pylons=test-core.ini ckan ckanext