Skip to content

Commit

Permalink
Migrate bourbon and neat from bower to npm (#688)
Browse files Browse the repository at this point in the history
* Migrate bourbon and neat from bower to npm

* upgrade bourbon libraries

* fix box-sizing

* remove console.log
  • Loading branch information
hussam-i-am authored Oct 30, 2023
1 parent 135c179 commit 35e1f2f
Show file tree
Hide file tree
Showing 13 changed files with 417 additions and 649 deletions.
2 changes: 1 addition & 1 deletion frontend/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12.22.6
v14.21.3
4 changes: 2 additions & 2 deletions frontend/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"buildpacks": [
{
"url": "https://github.com/lstoll/heroku-buildpack-monorepo"
}
},
{
"url": "https://buildpack-registry.s3.amazonaws.com/buildpacks/aedev/emberjs.tgz"
}
Expand All @@ -11,7 +11,7 @@
"ACME_KEY_1": {
"description": "used to identify folder with heroku-buildpack-monorepo",
"value": "frontend"
},
}
},
"formation": {
"web": {
Expand Down
5 changes: 0 additions & 5 deletions frontend/app/styles/bitters/_grid-settings.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import "neat-helpers"; // or "../neat/neat-helpers" when not in Rails

// Neat Overrides
// $column: 90px;
// $gutter: 30px;
Expand All @@ -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);
2 changes: 1 addition & 1 deletion frontend/app/styles/bitters/_variables.scss
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frontend/app/styles/components/checkin/tracked-level.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions frontend/app/styles/components/label-switch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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: "";
Expand All @@ -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;
Expand All @@ -65,7 +65,7 @@
+ .checkbox {

&:before {
@include transform(scale(0));
transform: scale(0);
}

&:after {
Expand Down
2 changes: 1 addition & 1 deletion frontend/app/styles/components/step-controls.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
margin-top: 20px;
.back,
.forward {
@include span-columns(6);
@include grid-column(6);
text-align: center;
a {
margin-top: 8px;
Expand Down
2 changes: 1 addition & 1 deletion frontend/app/styles/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -658,4 +658,4 @@ input[type=checkbox]{
.flex-container.right-nav a:nth-child(2) {
padding-right: 8px;
padding-left: 8px;
}
}
19 changes: 19 additions & 0 deletions frontend/app/styles/mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,22 @@
@include card;
max-width: 500px;
}

@mixin outer-container {
@include clearfix;
box-sizing: border-box;
margin: {
left: auto;
right: auto;
}

*,::after,::before {
box-sizing: border-box;
}
}

@mixin media($query) {
@media screen and (min-width: $query) {
@content;
}
}
2 changes: 0 additions & 2 deletions frontend/bower.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"name": "flaredown",
"dependencies": {
"bourbon": "4.2.3",
"neat": "~1.7.2",
"pace": "vectart/pace",
"d3": "~3.5.13",
"drag-drop-polyfill": "2.0.0-beta.1",
Expand Down
7 changes: 7 additions & 0 deletions frontend/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ module.exports = function(defaults) {
}
},

sassOptions: {
includePaths: [
'node_modules/bourbon/core',
'node_modules/bourbon-neat/core',
]
},

fingerprint: {
exclude: [
'weather/clear-day',
Expand Down
Loading

0 comments on commit 35e1f2f

Please sign in to comment.