From 4d6eb4ecf1f7a9e17448cb94a82fccbd07391841 Mon Sep 17 00:00:00 2001 From: Alex Basson Date: Tue, 5 Oct 2021 09:29:50 -0400 Subject: [PATCH] Remove unnecessary flex scss file; make header go edge-to-edge --- app/assets/stylesheets/flex.scss | 25 --------------------- app/assets/stylesheets/sqm_application.scss | 1 - app/views/layouts/sqm/_header.html.erb | 8 +++++-- app/views/layouts/sqm/application.html.erb | 2 +- 4 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 app/assets/stylesheets/flex.scss diff --git a/app/assets/stylesheets/flex.scss b/app/assets/stylesheets/flex.scss deleted file mode 100644 index a8d54dde..00000000 --- a/app/assets/stylesheets/flex.scss +++ /dev/null @@ -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; -} diff --git a/app/assets/stylesheets/sqm_application.scss b/app/assets/stylesheets/sqm_application.scss index 178697c5..d2d0a068 100644 --- 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"; diff --git a/app/views/layouts/sqm/_header.html.erb b/app/views/layouts/sqm/_header.html.erb index 9347ce89..e44c4d06 100644 --- a/app/views/layouts/sqm/_header.html.erb +++ b/app/views/layouts/sqm/_header.html.erb @@ -3,8 +3,12 @@

<%= link_to image_tag('logo.png', class: 'height-56'), root_path %>

-

Dashboard

-

Browse

+

+ Dashboard +

+

+ Browse +

diff --git a/app/views/layouts/sqm/application.html.erb b/app/views/layouts/sqm/application.html.erb index 246de849..41e92873 100644 --- a/app/views/layouts/sqm/application.html.erb +++ b/app/views/layouts/sqm/application.html.erb @@ -26,7 +26,7 @@ -
+
<%= render partial: 'layouts/sqm/header' %>