From b62e3eb0cad0ed31eaeffa4c7c26959d36a463de Mon Sep 17 00:00:00 2001 From: rebuilt Date: Wed, 11 Jan 2023 16:54:51 -0800 Subject: [PATCH] Visual edits. Add triangular shape to headers on all pages --- app/assets/stylesheets/partials/_colors.scss | 74 +++----------------- app/assets/stylesheets/partials/_layout.scss | 24 +++++++ app/views/contacts/_contact_form.html.erb | 2 +- app/views/home/index.html.erb | 43 +++++++----- app/views/layouts/_header.html.erb | 8 ++- app/views/qpa/index.html.erb | 17 +---- app/views/team/index.html.erb | 14 +--- 7 files changed, 68 insertions(+), 114 deletions(-) diff --git a/app/assets/stylesheets/partials/_colors.scss b/app/assets/stylesheets/partials/_colors.scss index 8e44e9b..b69a707 100644 --- a/app/assets/stylesheets/partials/_colors.scss +++ b/app/assets/stylesheets/partials/_colors.scss @@ -76,6 +76,7 @@ $ideal: $purple; .color-dark-blue { color: $dark-blue; } + .color-lime { color: $lime; } @@ -96,6 +97,10 @@ $ideal: $purple; background-color: $primary-lighter; } +.bg-color-primary-darker { + background-color: $primary-darker; +} + .bg-color-secondary { background-color: $secondary; } @@ -104,6 +109,10 @@ $ideal: $purple; background-color: $secondary-lighter; } +.bg-color-secondary-darker { + background-color: $secondary-darker; +} + .bg-color-light-blue { background-color: $light-blue; } @@ -159,68 +168,3 @@ background-color: $dark-blue; .bg-gray { background-color: $gray-3; } - -.bg-warning { - background-color: $warning; -} - -.bg-watch { - background-color: $watch; -} - -.bg-growth { - background-color: $growth; -} - -.bg-approval { - background-color: $approval; -} - -.bg-ideal { - background-color: $ideal; -} - -.bg-fill-warning, -.bg-fill-watch, -.bg-fill-growth -{ - fill: $light-gold; -} - -.bg-fill-approval, -.bg-fill-ideal -{ - fill: $light-purple; -} - -.fill-warning { - fill: $warning; -} - -.fill-watch { - fill: $watch; -} - -.fill-growth { - fill: $growth; -} - -.fill-approval { - fill: $approval; -} - -.fill-ideal { - fill: $ideal; -} - -.stroke-black { - stroke: $black; -} - -.stroke-gray-1 { - stroke: $gray-1; -} - -.stroke-gray-2 { - stroke: $gray-2; -} diff --git a/app/assets/stylesheets/partials/_layout.scss b/app/assets/stylesheets/partials/_layout.scss index 8dc8def..b38865b 100644 --- a/app/assets/stylesheets/partials/_layout.scss +++ b/app/assets/stylesheets/partials/_layout.scss @@ -6,3 +6,27 @@ .grid-item { padding: 20px; } + +.custom-shape-divider-bottom-triangle { + position: absolute; + bottom: 0; + left: 0; + width: 100%; + overflow: hidden; + line-height: 0; +} + +.custom-shape-divider-bottom-triangle svg { + position: relative; + display: block; + width: calc(100% + 1.3px); + height: 72px; +} + +.custom-shape-divider-bottom-triangle .shape-fill { + fill: #FFFFFF; +} + +.relative { + position: relative; +} diff --git a/app/views/contacts/_contact_form.html.erb b/app/views/contacts/_contact_form.html.erb index e7f15b2..b5a1942 100644 --- a/app/views/contacts/_contact_form.html.erb +++ b/app/views/contacts/_contact_form.html.erb @@ -3,7 +3,7 @@

Contact Form

<%= form_for @contact, url: home_index_path, method: :create, data: { turbo: false } do |f| %> -
+
<%= f.label :name %>
<%= f.text_field :name, required: true, class: "form-control" %>
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 9d254b7..4c97e6f 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,26 +1,31 @@ -
+
-
- - - - - - -
-
-

The Education Commonwealth Project

-

seeks to improve the way student learning and school quality are assessed, advancing an approach to measurement and accountability that is valid, democratic, and equitable

-
+
+ + + + + + +
+
+

The Education Commonwealth Project

+

seeks to improve the way student learning and school quality are assessed, advancing an approach to measurement and accountability that is valid, democratic, and equitable

+
+
+ + + +
@@ -65,7 +70,7 @@ -
+
<%= render partial: 'layouts/message_confirmation' %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 954d71e..473e84a 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,4 +1,4 @@ -
+
@@ -10,4 +10,10 @@
+ +
+ + + +
diff --git a/app/views/qpa/index.html.erb b/app/views/qpa/index.html.erb index 495ca36..384b42a 100644 --- a/app/views/qpa/index.html.erb +++ b/app/views/qpa/index.html.erb @@ -1,19 +1,6 @@ - -
-
-
-
-
-

Quality Performance Assessment

-
-
-
-
-
-
-
+<%= render partial: "layouts/header", locals: {heading: "Quality Performance Assessment"} %> -
+
diff --git a/app/views/team/index.html.erb b/app/views/team/index.html.erb index e071229..d616b28 100644 --- a/app/views/team/index.html.erb +++ b/app/views/team/index.html.erb @@ -1,17 +1,5 @@ -
-
-
-
-
-

Team

-
-
-
-
-
-
-
+<%= render partial: "layouts/header", locals: {heading: "Team"} %>