From bfcdb4b7028bb604ce6e71fadb87488ca923d530 Mon Sep 17 00:00:00 2001 From: androiddrew Date: Sun, 2 Dec 2018 22:59:09 -0500 Subject: [PATCH] Converted to new Tachyons based layout and style --- .../blog/templates/blog/blog_index_page.html | 3 + .../cms/blog/templates/blog/blog_page.html | 24 ++-- .../templates/blog/blog_tag_index_page.html | 2 +- services/cms/cms/static/css/cms.css | 9 ++ .../cms/cms/static/icon/basic_book_pen.svg | 12 ++ .../cms/cms/static/icon/basic_settings.svg | 12 ++ .../cms/cms/static/icon/basic_webpage_txt.svg | 14 +++ services/cms/cms/static/scss/cms.scss | 12 ++ services/cms/cms/templates/base.html | 2 - services/cms/cms/templates/footer.html | 10 ++ services/cms/cms/templates/header.html | 33 +++--- .../cms/home/templates/home/home_page.html | 107 ++++++++++-------- 12 files changed, 161 insertions(+), 79 deletions(-) create mode 100644 services/cms/cms/static/icon/basic_book_pen.svg create mode 100644 services/cms/cms/static/icon/basic_settings.svg create mode 100644 services/cms/cms/static/icon/basic_webpage_txt.svg create mode 100644 services/cms/cms/static/scss/cms.scss create mode 100644 services/cms/cms/templates/footer.html diff --git a/services/cms/blog/templates/blog/blog_index_page.html b/services/cms/blog/templates/blog/blog_index_page.html index 77eddd0..74b579f 100644 --- a/services/cms/blog/templates/blog/blog_index_page.html +++ b/services/cms/blog/templates/blog/blog_index_page.html @@ -6,6 +6,8 @@ {% block content %} + {% include 'header.html' %} +

{{ page.title }}

@@ -33,5 +35,6 @@
+ {% include 'footer.html' %} {% endblock %} diff --git a/services/cms/blog/templates/blog/blog_page.html b/services/cms/blog/templates/blog/blog_page.html index 7c4db58..65b4152 100644 --- a/services/cms/blog/templates/blog/blog_page.html +++ b/services/cms/blog/templates/blog/blog_page.html @@ -5,10 +5,18 @@ {% block body_class %}helvetica{% endblock %} {% block content %} + {% include 'header.html' %} +

{{ page.title }}

{{ page.date }}

+ {% if page.tags.all.count %} +
+ {% for tag in page.tags.all %} + {{ tag }} + {% endfor %} +
+ {% endif %} -
{{ page.intro }}
{{ page.body|richtext }} {% for item in page.gallery_images.all %} @@ -18,17 +26,5 @@ {% endfor %} - {% if page.tags.all.count %} -
-

Tags

- {% for tag in page.tags.all %} - - - - {% endfor %} -
- - {% endif %} - -

Return to blog

+
{% endblock %} \ No newline at end of file diff --git a/services/cms/blog/templates/blog/blog_tag_index_page.html b/services/cms/blog/templates/blog/blog_tag_index_page.html index a9c4c16..28e803f 100644 --- a/services/cms/blog/templates/blog/blog_tag_index_page.html +++ b/services/cms/blog/templates/blog/blog_tag_index_page.html @@ -4,7 +4,7 @@ {% block body_class %}helvetica{% endblock %} {% block content %} - +{% include 'header.html' %}
{% if request.GET.tag|length %}

Showing pages tagged "{{ request.GET.tag }}"

diff --git a/services/cms/cms/static/css/cms.css b/services/cms/cms/static/css/cms.css index e69de29..b38f66d 100644 --- a/services/cms/cms/static/css/cms.css +++ b/services/cms/cms/static/css/cms.css @@ -0,0 +1,9 @@ +.bg-grad-blue { + background-image: linear-gradient(-208deg, #86C3D0 0%, #4E90A3 66%); } + +.bg-grad-green { + background-image: linear-gradient(to top right, #41b782, #86D169); } + +.hover-bg-orange:hover { + background-color: #FF6300; + transition: all .3s ease; } diff --git a/services/cms/cms/static/icon/basic_book_pen.svg b/services/cms/cms/static/icon/basic_book_pen.svg new file mode 100644 index 0000000..c73ba42 --- /dev/null +++ b/services/cms/cms/static/icon/basic_book_pen.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/services/cms/cms/static/icon/basic_settings.svg b/services/cms/cms/static/icon/basic_settings.svg new file mode 100644 index 0000000..8785054 --- /dev/null +++ b/services/cms/cms/static/icon/basic_settings.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/services/cms/cms/static/icon/basic_webpage_txt.svg b/services/cms/cms/static/icon/basic_webpage_txt.svg new file mode 100644 index 0000000..9bd072f --- /dev/null +++ b/services/cms/cms/static/icon/basic_webpage_txt.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/services/cms/cms/static/scss/cms.scss b/services/cms/cms/static/scss/cms.scss new file mode 100644 index 0000000..99c3029 --- /dev/null +++ b/services/cms/cms/static/scss/cms.scss @@ -0,0 +1,12 @@ +.bg-grad-blue { + background-image: linear-gradient(-208deg, #86C3D0 0%, #4E90A3 66%); +} + +.bg-grad-green { + background-image: linear-gradient(to top right, #41b782, #86D169); +} + +.hover-bg-orange:hover { + background-color: #FF6300; + transition: all .3s ease; +} diff --git a/services/cms/cms/templates/base.html b/services/cms/cms/templates/base.html index 6879350..379bfd9 100644 --- a/services/cms/cms/templates/base.html +++ b/services/cms/cms/templates/base.html @@ -29,8 +29,6 @@ {% wagtailuserbar %} -{% include "header.html" %} - {% block content %}{% endblock %} diff --git a/services/cms/cms/templates/footer.html b/services/cms/cms/templates/footer.html new file mode 100644 index 0000000..a424763 --- /dev/null +++ b/services/cms/cms/templates/footer.html @@ -0,0 +1,10 @@ +{% load wagtailcore_tags %} + + \ No newline at end of file diff --git a/services/cms/cms/templates/header.html b/services/cms/cms/templates/header.html index 374328d..262bd20 100644 --- a/services/cms/cms/templates/header.html +++ b/services/cms/cms/templates/header.html @@ -1,17 +1,20 @@ {% load wagtailcore_tags %} - \ No newline at end of file +
+ + +
\ No newline at end of file diff --git a/services/cms/home/templates/home/home_page.html b/services/cms/home/templates/home/home_page.html index 4bb5c60..9ed7e9e 100644 --- a/services/cms/home/templates/home/home_page.html +++ b/services/cms/home/templates/home/home_page.html @@ -7,55 +7,68 @@ {% block body_class %}helvetica bg-black-10{% endblock %} {% block content %} -
-
-
-
-

Datasketch

-

A full stack shop for web design, application development, and - training

- Read the blog +
+
+ {% include "header.html" %} +
+

Hire Datasketch

+

A full stack shop for web design, application development, and training

+ Connect or - Connect with us + Read our blog
-
-
-
-

Just a man trying to make a buck

-
-
- -

Training

-
-
-

- As a college educator I learned what does and does not work for students. I strive to bring each of my students - along thier learning journey. -

-
-
-
- -

Websites

-
-
-

- Design & Development, eCommerce, Responsive Design. I can deliver you a stunning website. -

-
-
-
- -

App Development

-
-
-

- Quite affectionate and outgoing. - She loves to get chin scratches and will - roll around on the floor waiting for you give her more of them. -

-
+ +
+

Just a man trying to make a buck

+
+
+
+ +

Training

+
+
+

+ As a college educator I learned what does and does not work for students. I strive to bring each of my students + along thier learning journey. +

+
+
+
+ +

Websites

+
+
+

+ Design & Development, eCommerce, Responsive Design. I can deliver you a stunning website. +

+
+
+
+ +

App Development

+
+
+

+ Quite affectionate and outgoing. + She loves to get chin scratches and will + roll around on the floor waiting for you give her more of them. +

+
+
+
+
+

Together we can make great things.

+
+ + +
+ +
+ +
+
+
+ {% include "footer.html" %} {% endblock %}