diff --git a/app/assets/images/sqm/framework_wheel.png b/app/assets/images/sqm/framework_wheel.png new file mode 100644 index 0000000..d2cbb66 Binary files /dev/null and b/app/assets/images/sqm/framework_wheel.png differ diff --git a/app/assets/stylesheets/application.bootstrap.scss b/app/assets/stylesheets/application.bootstrap.scss index 8eb6bdc..6431768 100644 --- a/app/assets/stylesheets/application.bootstrap.scss +++ b/app/assets/stylesheets/application.bootstrap.scss @@ -1,7 +1,9 @@ +@import 'partials/colors'; @import 'bootstrap/scss/bootstrap'; @import 'bootstrap-icons/font/bootstrap-icons'; -@import 'partials/colors'; @import 'partials/bootstrap-overrides'; +@import "@fortawesome/fontawesome-free/scss/fontawesome"; +@import "@fortawesome/fontawesome-free/scss/solid"; @import 'partials/layout'; @import 'partials/links'; @import 'partials/downloads'; diff --git a/app/assets/stylesheets/partials/_bootstrap-overrides.scss b/app/assets/stylesheets/partials/_bootstrap-overrides.scss index 363d994..23e4a5f 100644 --- a/app/assets/stylesheets/partials/_bootstrap-overrides.scss +++ b/app/assets/stylesheets/partials/_bootstrap-overrides.scss @@ -1,4 +1,5 @@ @import 'colors'; + .accordion-button:not(.collapsed) { color: shade-color($primary, 50%); } diff --git a/app/assets/stylesheets/partials/_colors.scss b/app/assets/stylesheets/partials/_colors.scss index b16345c..8e44e9b 100644 --- a/app/assets/stylesheets/partials/_colors.scss +++ b/app/assets/stylesheets/partials/_colors.scss @@ -2,19 +2,27 @@ $black: #3E3A38; $gray-1: #595959; $gray-2: #CECECE; $gray-3: #F3F3F3; -$light-blue: #FAFCFD; + +$primary: #7f9df6; +$primary-lighter: #b9caff; +$primary-darker: darken($primary, 30%); + +$secondary: #ffab2b; +$secondary-lighter: #ffcb7c; +$secondary-darker: darken($secondary, 30%); + $white: #FFFFFF; $blue: #01788E; +$light-blue: #FAFCFD; $dark-blue: #1d2742; -// #1d2742; - $red: #C93047; $dark-red: #920020; $gold: #FFC857; $light-gold: #FFFAEE; + $purple: #49416D; $light-purple: #EDECF0; @@ -27,6 +35,28 @@ $growth: $gold; $approval: $purple; $ideal: $purple; +.color-primary { + color: $primary; +} + +.color-primary-lighter { + color: $primary-lighter; +} + +.color-primary-darker { + color: $primary-darker; +} +.color-secondary { + color: $secondary; +} + +.color-secondary-lighter { + color: $secondary-lighter; +} + +.color-secondary-darker { + color: $secondary-darker; +} .color-red { color: $red; } @@ -58,6 +88,22 @@ $ideal: $purple; color: $gray-2; } +.bg-color-primary { + background-color: $primary; +} + +.bg-color-primary-lighter { + background-color: $primary-lighter; +} + +.bg-color-secondary { + background-color: $secondary; +} + +.bg-color-secondary-lighter { + background-color: $secondary-lighter; +} + .bg-color-light-blue { background-color: $light-blue; } diff --git a/app/views/contacts/_contact_form.html.erb b/app/views/contacts/_contact_form.html.erb index e52a3ea..e7f15b2 100644 --- a/app/views/contacts/_contact_form.html.erb +++ b/app/views/contacts/_contact_form.html.erb @@ -1,26 +1,35 @@
-

Contact Form

+
+

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: "contact-form-text-area" %>
+ <%= f.text_field :name, required: true, class: "form-control" %>
+
+
<%= f.label :email %>
- <%= f.text_field :email, required: true, class: "contact-form-text-area" %>
+ <%= f.text_field :email, required: true, class: "form-control" %>
+
+
<%= f.label :organization %>
- <%= f.text_field :organization, required: true, class: "contact-form-text-area" %>
+ <%= f.text_field :organization, required: true, class: "form-control" %>
+
+
<%= f.label :message %>
- <%= f.text_area :message, rows: 8, cols: 40, required: true, class: "contact-form-text-area", + <%= f.text_area :message, rows: 8, cols: 40, required: true, class: "form-control", placeholder: "Send me a message"%>
+
-
- <%= f.label :nickname %> - <%= f.text_field :nickname, :hint => 'Leave this field blank!' %> -
- - <%= f.submit 'Send Message', class: 'btn btn-primary' %> +
+ <%= f.label :nickname %> + <%= f.text_field :nickname, :hint => 'Leave this field blank!' %>
+ + <%= f.submit 'Send Message', class: 'btn btn-primary' %> <% end %>
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 8fe98e0..f520904 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -2,20 +2,22 @@
-
-
- - - - - - -
-

The Education Commonwealth Project

+
+ + + + + + +
+
+

The Education Commonwealth Project

+

supports assessments of student learning and school progress that are more valid, democratic, and holistic than test-based school measurement

@@ -28,14 +30,33 @@
-

<%= link_to "About ECP", work_with_ecp_index_path, class: "color-dark-blue" %>

-

The Education Commonwealth Project (ECP) works to support assessment of student learning and school progress that is valid, democratic, and equitable. Pushing back against the overreliance on standardized testing, ECP offers free and open-source resources that all schools can use. And thanks to support from the Massachusetts State Legislature, ECP offers additional support for public schools and districts in Massachusetts.

+
+ <%= link_to work_with_ecp_index_path do %> + + <% end %> +
+
+

<%= link_to "About ECP", work_with_ecp_index_path, class: "color-dark-blue" %>

+

The Education Commonwealth Project (ECP) works to support assessment of student learning and school progress that is valid, democratic, and equitable. Pushing back against the overreliance on standardized testing, ECP offers free and open-source resources that all schools can use. And thanks to support from the Massachusetts State Legislature, ECP offers additional support for public schools and districts in Massachusetts.

+
+
+ + <%= link_to sqm_index_path do %> + + <% end %> +

<%= link_to "School Quality Measures", sqm_index_path , class: "color-dark-blue" %>

SQM honors the full range of what schools do, using data to support and sustain schools rather than to rate and rank them. Whether it means identifying new indicators for tracking progress, or visualizing data in ways that foster richer conversations, the SQM team is here to support Massachusetts districts as they work to assemble a fuller and more accurate portrait of their schools.

+
+ + <%= link_to qpa_index_path do %> + + <% end %> +

<%= link_to "Quality Performance Assessment", qpa_index_path , class: "color-dark-blue" %>

QPA offers a clearer picture of what students know and can do, assessing learning through the use of meaningful projects designed by educators. By providing examples of high quality performance assessments, a toolkit of protocols, and guidance, the QPA team seeks to provide a model for reimagining state assessment in Massachusetts and beyond.

@@ -45,7 +66,7 @@
-
+
<%= render partial: 'layouts/message_confirmation' %> diff --git a/app/views/qpa/index.html.erb b/app/views/qpa/index.html.erb index 95f9614..495ca36 100644 --- a/app/views/qpa/index.html.erb +++ b/app/views/qpa/index.html.erb @@ -87,8 +87,7 @@

- <%# TODO link to QPA team section on team page %> -

+

Speak with a member of the QPA team

diff --git a/app/views/sqm/index.html.erb b/app/views/sqm/index.html.erb index 96e381f..867af28 100644 --- a/app/views/sqm/index.html.erb +++ b/app/views/sqm/index.html.erb @@ -4,7 +4,10 @@
-
+
+ <%= image_tag "sqm/framework_wheel.png", style: "width: 100%;" %> +
+