diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 65cff9b2..42a2c521 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,21 +1,4 @@ -$spacer: 8px; -$spacers: ( - 0: 0, - 1: ($spacer * .25), - 2: ($spacer * .5), - 3: $spacer, - 4: ($spacer * 2), - 5: ($spacer * 3), - 6: ($spacer * 4), - 7: ($spacer * 5), -); - @import "bootstrap"; -@import "fonts"; -@import "colors"; -@import "borders"; -@import "flex"; @import "scaffolds"; @import "school_categories"; @import "questions"; -@import "dashboard"; diff --git a/app/assets/stylesheets/sqm_application.scss b/app/assets/stylesheets/sqm_application.scss new file mode 100644 index 00000000..76e34bc9 --- /dev/null +++ b/app/assets/stylesheets/sqm_application.scss @@ -0,0 +1,18 @@ +$spacer: 8px; +$spacers: ( + 0: 0, + 1: ($spacer * .25), + 2: ($spacer * .5), + 3: $spacer, + 4: ($spacer * 2), + 5: ($spacer * 3), + 6: ($spacer * 4), + 7: ($spacer * 5), +); + +@import "bootstrap"; +@import "fonts"; +@import "colors"; +@import "borders"; +@import "flex"; +@import "dashboard"; diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 0dc69cdd..bc6a6422 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -1,4 +1,6 @@ class BrowseController < ApplicationController + layout "sqm/application" + def show @category = CategoryPresenter.new( category: SqmCategory.find_by_name('Teachers & Leadership'), diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 28ffba4b..689a31ad 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -1,4 +1,6 @@ class DashboardController < ApplicationController + layout "sqm/application" + def index schools districts diff --git a/app/views/layouts/sqm/_header.html.erb b/app/views/layouts/sqm/_header.html.erb new file mode 100644 index 00000000..e24dadd5 --- /dev/null +++ b/app/views/layouts/sqm/_header.html.erb @@ -0,0 +1,10 @@ +
+
+
+ <%= link_to("Frequently Asked Questions", "/MCIEA-Data-Dashboard-FAQ.pdf", class: 'faq', target: '_blank') %> +
+

+ <%= link_to(image_tag('logo.png'), root_path) %> +

+
+
diff --git a/app/views/layouts/sqm/application.html.erb b/app/views/layouts/sqm/application.html.erb new file mode 100644 index 00000000..af449fac --- /dev/null +++ b/app/views/layouts/sqm/application.html.erb @@ -0,0 +1,38 @@ + + + + + + + + MCIEA + <%= csrf_meta_tags %> + <%= stylesheet_link_tag 'sqm_application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + + + + +
+
+
+ <%= render partial: 'layouts/sqm/header' %> + + <%= yield %> +
+
+
+ +