diff --git a/app/assets/images/children.webp b/app/assets/images/children.webp new file mode 100644 index 0000000..2ef3747 Binary files /dev/null and b/app/assets/images/children.webp differ diff --git a/app/assets/images/guage.svg b/app/assets/images/guage.svg new file mode 100644 index 0000000..dee2eb0 --- /dev/null +++ b/app/assets/images/guage.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/app/assets/images/logo.svg b/app/assets/images/logo.svg index 8010be7..d1d6ca9 100644 --- a/app/assets/images/logo.svg +++ b/app/assets/images/logo.svg @@ -1 +1,558 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/mail.svg b/app/assets/images/mail.svg new file mode 100644 index 0000000..720cde2 --- /dev/null +++ b/app/assets/images/mail.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/portfolio.svg b/app/assets/images/portfolio.svg new file mode 100644 index 0000000..9ced1df --- /dev/null +++ b/app/assets/images/portfolio.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + diff --git a/app/assets/images/twitter.svg b/app/assets/images/twitter.svg new file mode 100644 index 0000000..43462b7 --- /dev/null +++ b/app/assets/images/twitter.svg @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/app/assets/stylesheets/application.bootstrap.scss b/app/assets/stylesheets/application.bootstrap.scss index 05d74e3..8091fe0 100644 --- a/app/assets/stylesheets/application.bootstrap.scss +++ b/app/assets/stylesheets/application.bootstrap.scss @@ -1,13 +1,15 @@ @import 'partials/colors'; +@import 'partials/bootstrap-overrides'; @import 'bootstrap/scss/bootstrap'; @import 'bootstrap-icons/font/bootstrap-icons'; -@import 'partials/bootstrap-overrides'; @import "@fortawesome/fontawesome-free/scss/fontawesome"; @import "@fortawesome/fontawesome-free/scss/solid"; @import "@fortawesome/fontawesome-free/scss/regular"; @import "@fortawesome/fontawesome-free/scss/brands"; @import "@fortawesome/fontawesome-free/scss/v4-shims"; @import 'partials/layout'; +@import 'partials/typography'; @import 'partials/links'; @import 'partials/downloads'; @import 'partials/icons'; + diff --git a/app/assets/stylesheets/partials/_bootstrap-overrides.scss b/app/assets/stylesheets/partials/_bootstrap-overrides.scss index 23e4a5f..5ac19ff 100644 --- a/app/assets/stylesheets/partials/_bootstrap-overrides.scss +++ b/app/assets/stylesheets/partials/_bootstrap-overrides.scss @@ -1,25 +1,32 @@ @import 'colors'; .accordion-button:not(.collapsed) { - color: shade-color($primary, 50%); + color: $primary-darker; } .accordion-body h3 { - color: shade-color($primary, 50%); + color: $primary-darker; } -h1 { - color: $dark-blue; -} - -h2 { - color: $dark-blue; -} +$spacer: 1rem; +$spacers: (); +// stylelint-disable-next-line scss/dollar-variable-default +$spacers: map-merge( +( + 0: 0, + 1: ($spacer * .25), + 2: ($spacer * .5), + 3: $spacer, + 4: ($spacer * 2), + 5: ($spacer * 3), + 6: ($spacer * 4), + 7: ($spacer * 5), + 8: ($spacer * 6), + 9: ($spacer * 7), + 10: ($spacer * 8), + 11: ($spacer * 9), + 12: ($spacer * 10), +), +$spacers +); -h3 { - color: $dark-blue; -} - -h4 { - color: $dark-blue; -} diff --git a/app/assets/stylesheets/partials/_colors.scss b/app/assets/stylesheets/partials/_colors.scss index b69a707..2cc9e54 100644 --- a/app/assets/stylesheets/partials/_colors.scss +++ b/app/assets/stylesheets/partials/_colors.scss @@ -3,12 +3,14 @@ $gray-1: #595959; $gray-2: #CECECE; $gray-3: #F3F3F3; -$primary: #7f9df6; -$primary-lighter: #b9caff; +$primary: #0B8D9C; +$primary-lighter: lighten($primary, 30%); +$primary-dark: darken($primary, 15%); $primary-darker: darken($primary, 30%); -$secondary: #ffab2b; -$secondary-lighter: #ffcb7c; +$secondary: #C93148; +$secondary-lighter: darken($secondary, 30%); +$secondary-dark: darken($secondary, 15%); $secondary-darker: darken($secondary, 30%); $white: #FFFFFF; diff --git a/app/assets/stylesheets/partials/_typography.scss b/app/assets/stylesheets/partials/_typography.scss new file mode 100644 index 0000000..40164f2 --- /dev/null +++ b/app/assets/stylesheets/partials/_typography.scss @@ -0,0 +1,20 @@ +.nav, .nav-item, .dropdown-item { + font-family: 'League Spartan', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-weight: 700; +} + +.hero-text { + font-family: 'DM Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-weight: 500; + font-size: 1.2rem; +} + +.footer { + font-family: 'League Spartan', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-weight: 700; + line-height: 0.2em; +} + +body { + font-family: 'DM Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; +} diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contacts_controller.rb index 4fb58af..13fe875 100644 --- a/app/controllers/contacts_controller.rb +++ b/app/controllers/contacts_controller.rb @@ -1,4 +1,8 @@ class ContactsController < ApplicationController + def index + @contact = Contact.new + end + def new @contact = Contact.new end diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 92b789d..b9f91f3 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,8 +1,6 @@ class HomeController < ApplicationController skip_before_action :verify_authenticity_token - def index - @contact = Contact.new - end + def index; end def create puts '***************************** Inside home controller *****************************************' diff --git a/app/views/contacts/index.html.erb b/app/views/contacts/index.html.erb new file mode 100644 index 0000000..167f7aa --- /dev/null +++ b/app/views/contacts/index.html.erb @@ -0,0 +1,11 @@ +<%= render partial: "layouts/header", locals: {heading: "Contact Us"} %> + + +
+
+ + <%= render partial: 'layouts/message_confirmation' %> + + <%= render partial: "contacts/contact_form" %> +
+
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 949b211..1caa035 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,80 +1,37 @@ -
+
-
-
- - - - - - -
-
-

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

-
+
+ <%= image_tag "logo.svg", size: '250x250', class: "col-12 col-md-4 mx-0 px-0" %> +

Transforming how we assess student learning & school quality

-
- - - -
+
+
+

The Education Commonwealth Project works to challenge and expand the way student learning and school quality are assessed, advancing an approach to measurement and accountability that is valid, democratic, and equitable. ECP supports schools and communities with free and open-source tools, and broadly seeks to foster state- and national-level change.

+
- -
-
-
-
-
- <%= 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.

-
-
-
-
+
+ <%= image_tag "children.webp", class: "p-0" %> +
- <%= 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.

+
+
+
+ <%= image_tag "guage.svg", size: "100x100" %> +

School Quality measures

+

School quality measures (SQM) framework aims to describe the full measure of what makes a good school, using five major categories

-
-
- - <%= 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.

+
+
+
+ <%= image_tag "portfolio.svg", size: "100x100" %> +

Portfolios of Performance

+

Portfolios of Performance (POPs) are standards-aligned, curriculum-embedded tasks that measure students’ deeper learning of content and skills

-
-
- - -
-
- - <%= render partial: 'layouts/message_confirmation' %> - - <%= render partial: "contacts/contact_form" %>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb new file mode 100644 index 0000000..8cb6c09 --- /dev/null +++ b/app/views/layouts/_footer.html.erb @@ -0,0 +1,35 @@ +
+
+
+
+ <%= image_tag "logo.svg", size: "150x150", class: "col" %> +
+

Education Commonwealth Project

+

University of Massachusetts Lowell

+

850 Broadway St

+

Lowell, MA 01854

+
+
+
+
+
+
+ <%= link_to contacts_path do %> +
+ <%= image_tag "mail.svg", size: "100x100" %> +

Contact Us

+
+ <% end %> +
+
+ <%= link_to "https://twitter.com/EdCommProject", target: :_blank do %> +
+ <%= image_tag "twitter.svg" , size: "100x100" %> +

Follow Us

+
+ <% end %> +
+
+
+
+
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 473e84a..8bf2609 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,4 +1,4 @@ -
+
@@ -10,10 +10,4 @@
- -
- - - -
diff --git a/app/views/layouts/_nav.html.erb b/app/views/layouts/_nav.html.erb index 7f5b3be..c11bdf1 100644 --- a/app/views/layouts/_nav.html.erb +++ b/app/views/layouts/_nav.html.erb @@ -1,12 +1,10 @@ -