diff --git a/package.json b/package.json index f8ceede4..d2c8c2ec 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "dependencies": { "@canonical/global-nav": "3.5.0", "@canonical/cookie-policy": "3.5.0", - "vanilla-framework": "4.2.0" + "vanilla-framework": "4.5.0" }, "devDependencies": { "autoprefixer": "10.4.13", diff --git a/static/sass/_settings.scss b/static/sass/_settings.scss index 433b03ca..85df7c88 100644 --- a/static/sass/_settings.scss +++ b/static/sass/_settings.scss @@ -3,3 +3,5 @@ $color-aubergine: #77216f; $color-hero: #252525; $theme-default-nav: dark; $breakpoint-navigation-threshold: 940px; +// update documentation sidebar width for deeper nesting +$l-documentation-sidebar-width: 18rem; diff --git a/templates/base_layout.html b/templates/base_layout.html index fd9323d4..b7431820 100644 --- a/templates/base_layout.html +++ b/templates/base_layout.html @@ -57,83 +57,23 @@ - + - - -
- {% block content %} - {{ content | safe }} - {% endblock content %} -
- -
- - + {% block body %} + {% include "partial/_navigation.html" %} + +
+ {% block content %} + {{ content | safe }} + {% endblock content %} +
+ + {% include "partial/_footer.html" %} + {% endblock body %} -{% endblock %} +{% endblock body %} diff --git a/templates/partial/_footer.html b/templates/partial/_footer.html new file mode 100644 index 00000000..604eebc1 --- /dev/null +++ b/templates/partial/_footer.html @@ -0,0 +1,58 @@ +{% if is_docs %} + +{% else %} + +{% endif %} \ No newline at end of file diff --git a/templates/partial/_navigation.html b/templates/partial/_navigation.html new file mode 100644 index 00000000..2ef1a8de --- /dev/null +++ b/templates/partial/_navigation.html @@ -0,0 +1,61 @@ +{% macro nav_logo() %} +
+ + Menu + Close menu +
+{% endmacro %} + +{% macro nav_items() %} + +{% endmacro %} + + diff --git a/yarn.lock b/yarn.lock index 86cfa9f6..fa133577 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3117,10 +3117,10 @@ vanilla-framework@4.0.0: resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-4.0.0.tgz#a2fee9bd9763ebd6932b764f9d66484dc177d4cc" integrity sha512-fiPnmaTUe15l5MRNJ6IsiJ8qiunfmgtLETOFltaYiE/bQKL7xTI+riBak2iygBKeF1y0Gi/GxUNt4hyb6xDPKA== -vanilla-framework@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-4.2.0.tgz#7391818e31ff4fdf222e8e1d45f2861ccf502282" - integrity sha512-Y+Ps2CWDp1v5uzUq2tv+T8LjUfHOgdDVhsarGFPa5ICSmXYS/w/2tWyNr1LAbJtZdYAuFOXDHSqYl0aCnGRUTg== +vanilla-framework@4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-4.5.0.tgz#992332239682821094defaae0e8aacd343bf9239" + integrity sha512-35q360QpJirosK7403fSQLRPXsdabZ6LdkP2x5bqJBak3rkwmYE34wOqGbm0KggQLXSZimW5ZP2Y+0LohtAF+w== verbalize@^0.1.2: version "0.1.2"