upgrade bourbon libraries

rubyforgood · Oct 20, 2023 · 7e3dd5c · 7e3dd5c
1 parent dcba408
commit 7e3dd5c
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 1,244 deletions.
diff --git a/frontend/app/styles/bitters/_grid-settings.scss b/frontend/app/styles/bitters/_grid-settings.scss
@@ -1,5 +1,3 @@
-@import "neat-helpers"; // or "../neat/neat-helpers" when not in Rails
-
 // Neat Overrides
 // $column: 90px;
 // $gutter: 30px;
@@ -9,6 +7,3 @@
 // Neat Breakpoints
 $medium-screen: 600px;
 $large-screen: 900px;
-
-$medium-screen-up: new-breakpoint(min-width $medium-screen 4);
-$large-screen-up: new-breakpoint(min-width $large-screen 8);
diff --git a/frontend/app/styles/bitters/_variables.scss b/frontend/app/styles/bitters/_variables.scss
@@ -1,7 +1,7 @@
 @use 'sass:math';
 
 // Typography
-$base-font-family: $helvetica;
+$base-font-family: $font-stack-helvetica;
 $heading-font-family: $base-font-family;
 
 // Font Sizes

diff --git a/frontend/app/styles/components/checkin/tracked-level.scss b/frontend/app/styles/components/checkin/tracked-level.scss
@@ -34,7 +34,7 @@
 
       .tooltip {
         @include position(absolute, null 0 3em 0);
-        @include transition (all 0.2s ease-in-out);
+        transition: all 0.2s ease-in-out;
         background-color: black;
         background: black;
         border-radius: 3px;

diff --git a/frontend/app/styles/components/label-switch.scss b/frontend/app/styles/components/label-switch.scss
@@ -26,7 +26,7 @@
     display: none;
 
     + .checkbox {
-      @include transition(all 0.3s ease);
+      transition: all 0.3s ease;
       border-radius: $switch-radius;
       border: none;
       cursor: pointer;
@@ -39,8 +39,8 @@
 
       &:before {
         @include position(absolute, 2px 0 0 2px);
-        @include transform(scale(1));
-        @include transition(all 0.3s ease);
+        transform: scale(1);
+        transition: all 0.3s ease;
         background-color: $switch-background;
         border-radius: $switch-radius;
         content: "";
@@ -51,7 +51,7 @@
 
       &:after {
         @include position(absolute, 2px 0 0 2px);
-        @include transition(all 0.3s ease);
+        transition: all 0.3s ease;
         @include size($knob-size);
         background-color: $switch-background;
         border-radius: $knob-radius;
@@ -65,7 +65,7 @@
       + .checkbox {
 
         &:before {
-          @include transform(scale(0));
+          transform: scale(0);
         }
 
         &:after {

diff --git a/frontend/app/styles/components/step-controls.scss b/frontend/app/styles/components/step-controls.scss
@@ -3,7 +3,7 @@
   margin-top: 20px;
   .back,
   .forward {
-    @include span-columns(6);
+    @include grid-column(6);
     text-align: center;
     a {
       margin-top: 8px;

diff --git a/frontend/app/styles/global.scss b/frontend/app/styles/global.scss
@@ -658,4 +658,4 @@ input[type=checkbox]{
 .flex-container.right-nav a:nth-child(2) {
   padding-right: 8px;
   padding-left: 8px;
-}
+}
diff --git a/frontend/app/styles/mixins.scss b/frontend/app/styles/mixins.scss
@@ -14,3 +14,18 @@
 	@include card;
 	max-width: 500px;
 }
+
+@mixin outer-container {
+  @include clearfix;
+  box-sizing: border-box;
+  margin: {
+    left: auto;
+    right: auto;
+  }
+}
+
+@mixin media($query) {
+  @media screen and (min-width: $query) {
+    @content;
+  }
+}
diff --git a/frontend/config/environment.js b/frontend/config/environment.js
@@ -1,6 +1,8 @@
 'use strict';
 
 module.exports = function(environment) {
+
+  console.log('environment: ' + process.env.FACEBOOK_APP_ID)
   var ENV = {
     rootURL: '/',
     environment: environment,

diff --git a/frontend/ember-cli-build.js b/frontend/ember-cli-build.js
@@ -21,8 +21,8 @@ module.exports = function(defaults) {
 
     sassOptions: {
       includePaths: [
-        'node_modules/bourbon/app/assets/stylesheets',
-        'node_modules/bourbon-neat/app/assets/stylesheets',
+        'node_modules/bourbon/core',
+        'node_modules/bourbon-neat/core',
       ]
     },