Remove unnecessary flex scss file; make header go edge-to-edge

4 years ago · 4d6eb4ecf1
parent 504bf8bc57
commit 4d6eb4ecf1
4 changed files with 7 additions and 29 deletions
--- a/app/assets/stylesheets/flex.scss
+++ b/app/assets/stylesheets/flex.scss
@ -1,25 +0,0 @@
-.fdr {
-  display: flex;
-  flex-direction: row;
-}
-
-.fdc {
-  display: flex;
-  flex-direction: column;
-}
-
-.fjc {
-  justify-content: center;
-}
-
-.fjb {
-  justify-content: space-between;
-}
-
-.fjl {
-  justify-content: left;
-}
-
-.fac {
-  align-items: center;
-}
--- a/app/assets/stylesheets/sqm_application.scss
+++ b/app/assets/stylesheets/sqm_application.scss
@ -14,7 +14,6 @@ $spacers: (
@import "fonts";
@import "colors";
@import "borders";
-@import "flex";
@import "dashboard";


--- a/app/views/layouts/sqm/_header.html.erb
+++ b/app/views/layouts/sqm/_header.html.erb
@ -3,8 +3,12 @@
    <div class="row py-4 justify-content-between align-items-center">
      <div class="col d-flex justify-content-start align-items-center">
        <p class="me-6"><%= link_to image_tag('logo.png', class: 'height-56'), root_path %></p>
-        <p class="me-4"><a class="h3" href="/districts/<%= @district.slug %>/schools/<%= @school.slug %>/dashboard?year=2020-21">Dashboard</a></p>
-        <p><a class="h3" href="/districts/<%= @district.slug %>/schools/<%= @school.slug %>/browse/teachers-and-leadership?year=2020-21">Browse</a></p>
+        <p class="me-4">
+          <a class="h3" href="/districts/<%= @district.slug %>/schools/<%= @school.slug %>/dashboard?year=2020-21">Dashboard</a>
+        </p>
+        <p>
+          <a class="h3" href="/districts/<%= @district.slug %>/schools/<%= @school.slug %>/browse/teachers-and-leadership?year=2020-21">Browse</a>
+        </p>
      </div>

      <div class="col d-flex justify-content-end">
--- a/app/views/layouts/sqm/application.html.erb
+++ b/app/views/layouts/sqm/application.html.erb
@ -26,7 +26,7 @@

 <body>

-<div class="container-fluid">
+<div>
  <%= render partial: 'layouts/sqm/header' %>
 </div>