Skip to content

Commit

Permalink
chore(deps): update ui deps
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremydw committed Aug 20, 2021
1 parent e62d5d6 commit 66e1e3f
Show file tree
Hide file tree
Showing 4 changed files with 1,987 additions and 449 deletions.
2 changes: 1 addition & 1 deletion grow/ui/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const gulpAutoprefixer = require('gulp-autoprefixer');
const path = require('path');
const readdirRecursive = require('fs-readdir-recursive');
const rename = require('gulp-rename');
const sass = require('gulp-sass');
const sass = require('gulp-dart-sass');
const webpack = require('webpack');
const webpackStream = require('webpack-stream');

Expand Down
13 changes: 7 additions & 6 deletions grow/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@
"description": "Grow UI",
"private": true,
"dependencies": {
"babel-loader": "^8.0.6",
"babel-loader": "^8.2.2",
"babili-webpack-plugin": "^0.1.2",
"deep-extend": "^0.6.0",
"fs-readdir-recursive": "^1.1.0",
"gulp": "^4.0.2",
"gulp-autoprefixer": "^7.0.0",
"gulp-rename": "^1.4.0",
"gulp-sass": "^4.0.2",
"webpack": "^4.32.2",
"webpack-stream": "^5.2.1"
"gulp-autoprefixer": "^8.0.0",
"gulp-rename": "^2.0.0",
"gulp-dart-sass": "^1.0.2",
"npm-check-updates": "^11.8.3",
"webpack": "^5.51.1",
"webpack-stream": "^6.1.2"
},
"browserslist": [
"last 1 version",
Expand Down
15 changes: 8 additions & 7 deletions grow/ui/sass/composite/ui.sass
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:math"
@import '../_config'
@import url('https://fonts.googleapis.com/css?family=Roboto')

Expand Down Expand Up @@ -59,23 +60,23 @@ $transition_medium: 1000ms

&:nth-child(0n+2)
right: 0
top: $icon_size_large / 2 + $icon_size_tiny / 2 + $button_offset
top: math.div($icon_size_large, 2) + math.div($icon_size_tiny, 2) + $button_offset

@for $i from 1 through $icon_count + 1
&:nth-child(0n+#{$i+2})
top: $icon_size_small * $i + $button_offset * ($i + 1) + $icon_size_tiny + ($icon_size_large - $icon_size_small) / 2
top: $icon_size_small * $i + $button_offset * ($i + 1) + $icon_size_tiny + math.div(($icon_size_large - $icon_size_small), 2)

.grow__icon
background-color: $color-secondary
background-position: center
background-repeat: no-repeat
background-size: $icon_size_small/2
background-size: math.div($icon_size_small, 2)
border-radius: 100%
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2)
color: $color-on-secondary
display: block
height: $icon_size_small
margin-right: ($icon_size_large - $icon_size_small) / 2
margin-right: math.div(($icon_size_large - $icon_size_small), 2)
transition: box-shadow $transition_fast ease-in-out
width: $icon_size_small
z-index: 10000
Expand All @@ -100,7 +101,7 @@ $transition_medium: 1000ms
background-size: $icon_size_tiny
background-image: url(data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI0IiB2aWV3Qm94PSIwIDAgMjQgMjQiIHdpZHRoPSIyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNMTkgNi40MUwxNy41OSA1IDEyIDEwLjU5IDYuNDEgNSA1IDYuNDEgMTAuNTkgMTIgNSAxNy41OSA2LjQxIDE5IDEyIDEzLjQxIDE3LjU5IDE5IDE5IDE3LjU5IDEzLjQxIDEyeiIvPjwvc3ZnPg==)
height: $icon_size_tiny
margin-right: ($icon_size_large - $icon_size_tiny) / 2
margin-right: math.div(($icon_size_large - $icon_size_tiny), 2)
width: $icon_size_tiny

&.grow__icon_edit
Expand All @@ -119,8 +120,8 @@ $transition_medium: 1000ms
top: 0

.grow__button:nth-child(0n+2)
top: $icon_size_large / 2 + $icon_size_tiny / 2 + $button_offset
right: $icon_size_large / 2 + $icon_size_tiny / 2 + $button_offset
top: math.div($icon_size_large, 2) + math.div($icon_size_tiny, 2) + $button_offset
right: math.div($icon_size_large, 2) + math.div($icon_size_tiny, 2) + $button_offset

&.grow__expand
.grow__label
Expand Down

0 comments on commit 66e1e3f

Please sign in to comment.