diff --git a/.gitignore b/.gitignore index aca6ef03d..0a21cad9f 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,5 @@ app/assets/stylesheets/govuk_template/.sass-cache/ .sass-cache/ cache/ app/static/* +app/static/stylesheets/*.css + diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss index 50c9ec702..d7689cbd6 100644 --- a/app/assets/stylesheets/app.scss +++ b/app/assets/stylesheets/app.scss @@ -44,4 +44,36 @@ #global-header #logo { white-space: nowrap; +} + + + +#navigation { + padding: 50px 0 0 0; +} + +#navigation li { + @include core-16(); + margin: 3px 0; +} + +#navigation ul { + border-bottom: 1px solid #777; + margin: 0 20px 0 0; + list-style-type: none; + padding: 0; +} + +#navigation a:link,a:visited { + text-decoration: none; +} + +#navigation a:hover { + color: #2e8aca; +} + + + +a:visited { + color: #005ea5; } \ No newline at end of file diff --git a/app/assets/stylesheets/components/navigation.scss b/app/assets/stylesheets/components/navigation.scss new file mode 100644 index 000000000..f11e2c541 --- /dev/null +++ b/app/assets/stylesheets/components/navigation.scss @@ -0,0 +1,23 @@ +#navigation { + padding: 50px 0 0 0; +} + +#navigation li { + @include core-16(); + margin: 3px 0; +} + +#navigation ul { + border-bottom: 1px solid #777; + margin: 0 20px 0 0; + list-style-type: none; + padding: 0; +} + +#navigation a:link,a:visited { + text-decoration: none; +} + +#navigation a:hover { + color: #2e8aca; +} \ No newline at end of file diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index e0591db04..e2b93d0c5 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -33,6 +33,7 @@ @import "components/sms-message"; @import "components/submit-form"; @import "components/table"; +@import "components/navigation"; // TODO: break this up @import "app"; diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html new file mode 100644 index 000000000..8ee24ff6a --- /dev/null +++ b/app/templates/main_nav.html @@ -0,0 +1,19 @@ +{% macro main_nav() %} + + +{% endmacro %} \ No newline at end of file diff --git a/app/templates/views/dashboard.html b/app/templates/views/dashboard.html index a8d5e6e31..147a069c6 100644 --- a/app/templates/views/dashboard.html +++ b/app/templates/views/dashboard.html @@ -1,26 +1,24 @@ -{% extends "admin_template.html" %} +{% extends "withnav_template.html" %} + {% block page_title %} GOV.UK Notify | Dashboard {% endblock %} -{% block content %} +{% block maincolumn_content %} -
-

Dashboard

-
-
+ {% endblock %} diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html new file mode 100644 index 000000000..b0bd19960 --- /dev/null +++ b/app/templates/withnav_template.html @@ -0,0 +1,15 @@ +{% extends "admin_template.html" %} +{% from "main_nav.html" import main_nav with context %} + +{% block content %} + +
+
+ {{ main_nav() }} +
+
+ {% block maincolumn_content %}{% endblock %} +
+
+ +{% endblock %} \ No newline at end of file