No longer include richtext block css fix

As of Wagtail 2.10, the rich-text class is not added to richtext divs so this
extra css is unecessary.

.gitignore

@@ -1,5 +1,4 @@
 wagtail_nhsuk_frontend.egg-info
-wagtailnhsukfrontend/static/wagtailnhsukfrontend/css/wagtail-nhsuk-frontend.min.css
 testapp/db.sqlite3
 testapp/media/images
 __pycache__

README.md

@@ -61,18 +61,22 @@ See the [component documentation](./docs/components/) for a list of components y
 
 Include the CSS in your base template
 ```html
-  <link rel="stylesheet" type="text/css" href="{% static 'wagtailnhsukfrontend/css/wagtail-nhsuk-frontend.min.css' %}">
+  <link rel="stylesheet" type="text/css" href="{% static 'wagtailnhsukfrontend/css/nhsuk.min.css' %}">
 ```
 
 Include the Javascript in your base template
 ```html
-  <script type="text/javascript" src="{% static 'wagtailnhsukfrontend/js/nhsuk-4.1.0.min.js' %}" defer></script>
+  <script type="text/javascript" src="{% static 'wagtailnhsukfrontend/js/nhsuk.min.js' %}" defer></script>
 ```
 ## Upgrading
 
 If you are upgrading from v0 to v1, see the [changelog](./CHANGELOG.md).
 
-## Contributing 
+This CSS and JS is taken directly from the [nhsuk-frontend library](https://github.com/nhsuk/nhsuk-frontend/releases/tag/v5.1.0) and provided in this package for convenience.
+
+If you have a more complicated frontend build such as compiling your own custom styles, you might want to [install from npm](https://github.com/nhsuk/nhsuk-frontend/blob/master/docs/installation/installing-with-npm.md) instead.
+
+## Contributing
 
 See the [contributing documentation](./docs/contributing.md) to run the application locally and contribute changes.
 

docs/contributing.md

@@ -27,19 +27,13 @@ Whilst in the `wagtail-nhsuk-frontend` directory:
 pipenv shell
 ```
 
-### 3. Build the application CSS
-
-```
-python3 setup.py build
-```
-
-### 4. Install dependencies
+### 3. Install dependencies
 
 ```
 pipenv install -e .[testing,linting]
 ```
 
-### 5. Run database migrations for the test app
+### 4. Run database migrations for the test app
 ```
 cd testapp
 ```
@@ -48,13 +42,13 @@ cd testapp
 python3 manage.py migrate
 ```
 
-### 6. Create Wagtail admin user
+### 5. Create Wagtail admin user
 
 ```
 python3 manage.py createsuperuser
 ```
 
-### 7. Start a local server 
+### 6. Start a local server
 
 ```
 python3 manage.py runserver 8080

setup.py

@@ -1,4 +1,3 @@
-from distutils.command.build import build
 from setuptools import setup, find_packages
 
 with open("README.md", "r") as fh:
@@ -21,27 +20,7 @@
 ]
 
 
-class CompileCSSCommand(build):
-    """Combine CSS from the frontend library with our wagtail-specific fixes"""
-
-    def run(self):
-        filepath_base = 'wagtailnhsukfrontend/static/wagtailnhsukfrontend/css/'
-        filenames = [
-            'nhsuk-5.1.0.min.css',
-            'fixes.css',
-        ]
-
-        with open(filepath_base + 'wagtail-nhsuk-frontend.min.css', 'w') as outfile:
-            for fname in filenames:
-                with open(filepath_base + fname) as infile:
-                    for line in infile:
-                        outfile.write(line)
-
-
 setup(
-    cmdclass={
-        'build': CompileCSSCommand,
-    },
     name="wagtail-nhsuk-frontend",
     version="1.0.0",
     description="NHSUK Frontend Styles for Wagtail",

testapp/testapp/templates/base.html

@@ -23,10 +23,10 @@
         <link rel="stylesheet" type="text/css" href="{% static 'css/testapp.css' %}">
 
         {# NHSUK CSS library #}
-        <link rel="stylesheet" type="text/css" href="{% static 'wagtailnhsukfrontend/css/wagtail-nhsuk-frontend.min.css' %}">
+        <link rel="stylesheet" type="text/css" href="{% static 'wagtailnhsukfrontend/css/nhsuk.min.css' %}">
 
         {# NHSUK JS library #}
-        <script type="text/javascript" src="{% static 'wagtailnhsukfrontend/js/nhsuk-5.1.0.min.js' %}" defer></script>
+        <script type="text/javascript" src="{% static 'wagtailnhsukfrontend/js/nhsuk.min.js' %}" defer></script>
 
         {% block extra_css %}
             {# Override this in templates to add extra stylesheets #}