Use sqm_application.html.erb layout and sqm_application.scss for new pages

4 years ago · 516701332d
parent 03a52161a6
commit 516701332d
6 changed files with 70 additions and 17 deletions
--- 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";
--- a/app/assets/stylesheets/sqm_application.scss
+++ 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";
--- 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'),
--- 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
--- a/app/views/layouts/sqm/_header.html.erb
+++ b/app/views/layouts/sqm/_header.html.erb
@ -0,0 +1,10 @@
 <header class="row">
  <div class="title col-12">
    <div class="float-right">
      <%= link_to("Frequently Asked Questions", "/MCIEA-Data-Dashboard-FAQ.pdf", class: 'faq', target: '_blank') %>
    </div>
    <h2 style="clear: right; text-align: center; margin-bottom: 30px;">
      <%= link_to(image_tag('logo.png'), root_path) %>
    </h2>
  </div>
 </header>
--- a/app/views/layouts/sqm/application.html.erb
+++ b/app/views/layouts/sqm/application.html.erb
@ -0,0 +1,38 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en">
 <head>
  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
  <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport"/>
  <link href="https://fonts.googleapis.com/css?family=Bitter:400,600,700" rel="stylesheet" type="text/css"/>
  <link href="https://fonts.googleapis.com/css?family=Cabin:400,600,700" rel="stylesheet" type="text/css"/>
  <title>MCIEA</title>
  <%= csrf_meta_tags %>
  <%= stylesheet_link_tag 'sqm_application', media: 'all', 'data-turbolinks-track': 'reload' %>
  <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
  <!-- Global site tag (gtag.js) - Google Analytics -->
  <script src="https://www.googletagmanager.com/gtag/js?id=UA-132936999-1" type="javascript"></script>
  <script type="javascript">
    window.dataLayer = window.dataLayer || [];
    function gtag() {
      dataLayer.push(arguments);
    }
    gtag('js', new Date());
    gtag('config', 'UA-132936999-1');
  </script>
 </head>
 <body>
 <div class="container">
  <div class="row">
    <div class="col-12">
      <%= render partial: 'layouts/sqm/header' %>
      <%= yield %>
    </div>
  </div>
 </div>
 </body>
 </html>