Merge pull request #97 from nhsuk/frontend_update

update css to frontend release 2.1.0
nhsuk · Apr 12, 2019 · f46c88b · f46c88b
2 parents bb2a968 + 3bce6b6
commit f46c88b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ Include the CSS in your base template
 
 Include the Javascript in your base template
 ```html
-  <script type="text/javascript" src="{% static 'wagtailnhsukfrontend/js/nhsuk-1.0.0.min.js' %}" defer></script>
+  <script type="text/javascript" src="{% static 'wagtailnhsukfrontend/js/nhsuk-2.1.0.min.js' %}" defer></script>
 ```
 
 # Further reading

diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@ class CompileCSSCommand(build):
     def run(self):
         filepath_base = 'wagtailnhsukfrontend/static/wagtailnhsukfrontend/css/'
         filenames = [
-            'nhsuk-1.0.0.min.css',
+            'nhsuk-2.1.0.min.css',
             'fixes.css',
         ]
 

diff --git a/testapp/testapp/templates/base.html b/testapp/testapp/templates/base.html
@@ -26,7 +26,7 @@
         <link rel="stylesheet" type="text/css" href="{% static 'wagtailnhsukfrontend/css/wagtail-nhsuk-frontend.min.css' %}">
 
         {# NHSUK JS library #}
-        <script type="text/javascript" src="{% static 'wagtailnhsukfrontend/js/nhsuk-1.0.0.min.js' %}" defer></script>
+        <script type="text/javascript" src="{% static 'wagtailnhsukfrontend/js/nhsuk-2.1.0.min.js' %}" defer></script>
 
         {% block extra_css %}
             {# Override this in templates to add extra stylesheets #}

diff --git a/wagtailnhsukfrontend/static/wagtailnhsukfrontend/css/nhsuk-1.0.0.min.css b/wagtailnhsukfrontend/static/wagtailnhsukfrontend/css/nhsuk-1.0.0.min.css
diff --git a/wagtailnhsukfrontend/static/wagtailnhsukfrontend/css/nhsuk-2.1.0.min.css b/wagtailnhsukfrontend/static/wagtailnhsukfrontend/css/nhsuk-2.1.0.min.css
diff --git a/...agtailnhsukfrontend/js/nhsuk-1.0.0.min.js → ...agtailnhsukfrontend/js/nhsuk-2.1.0.min.js b/...agtailnhsukfrontend/js/nhsuk-1.0.0.min.js → ...agtailnhsukfrontend/js/nhsuk-2.1.0.min.js