generated from ztimson/template
Added gap
This commit is contained in:
45
.github/workflows/build.yaml
vendored
45
.github/workflows/build.yaml
vendored
@@ -43,11 +43,40 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
tag: ${{env.VERSION}}
|
tag: ${{env.VERSION}}
|
||||||
|
|
||||||
docs:
|
container:
|
||||||
name: Publish CDN & Docs
|
name: Build Container
|
||||||
needs: build
|
runs-on: ubuntu-latest
|
||||||
uses: ztimson/actions/.github/workflows/docker.yaml@develop
|
container: docker
|
||||||
with:
|
steps:
|
||||||
name: ztimson/css-utils
|
- name: Build Container
|
||||||
repository: ${{github.server_url}}/${{github.repository}}.git
|
run: |
|
||||||
pass: ${{secrets.DEPLOY_TOKEN}}
|
git clone -b "${{github.ref_name}}" "$(echo ${{github.server_url}}/${{github.repository}}.git | sed s%://%://${{github.token}}@% )" .
|
||||||
|
DOCKER_HUB=$([ -n "${{secrets.DOCKER_HUB_USER}}" ] && [ -n "${{secrets.DOCKER_HUB_TOKEN}}" ] && [ -n "${{secrets.DOCKER_HUB_IMAGE}}" ] && echo "true" || echo "false")
|
||||||
|
REGISTRY="$(echo "${{github.server_url}}" | sed -E 's|https?://||')"
|
||||||
|
VERSION=$(cat package.json | grep version | grep -Eo '[0-9][[:alnum:]\.\/\-]+')
|
||||||
|
|
||||||
|
docker login -u "${{github.repository_owner}}" -p "${{secrets.DEPLOY_TOKEN}}" "$REGISTRY"
|
||||||
|
if [ "$DOCKER_HUB" = "true" ]; then docker login -u "${{secrets.DOCKER_HUB_USER}}" -p "${{secrets.DOCKER_HUB_TOKEN}}" docker.io; fi
|
||||||
|
|
||||||
|
docker build -t "$REGISTRY/${{github.repository}}:${{github.ref_name}}" .
|
||||||
|
docker push "$REGISTRY/${{github.repository}}:${{github.ref_name}}"
|
||||||
|
if [ "$DOCKER_HUB" = "true" ]; then
|
||||||
|
docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:${{github.ref_name}}"
|
||||||
|
docker push "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:${{github.ref_name}}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${{github.ref_name}}" = "master" ]; then
|
||||||
|
docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "$REGISTRY/${{github.repository}}:$VERSION"
|
||||||
|
docker push "$REGISTRY/${{github.repository}}:$VERSION"
|
||||||
|
if [ "$DOCKER_HUB" = "true" ]; then
|
||||||
|
docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:$VERSION"
|
||||||
|
docker push "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:$VERSION"
|
||||||
|
fi
|
||||||
|
|
||||||
|
docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "$REGISTRY/${{github.repository}}:latest"
|
||||||
|
docker push "$REGISTRY/${{github.repository}}:latest"
|
||||||
|
if [ "$DOCKER_HUB" = "true" ]; then
|
||||||
|
docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:latest"
|
||||||
|
docker push "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:latest"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|||||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "@ztimson/css-utils",
|
"name": "@ztimson/css-utils",
|
||||||
"version": "1.3.3",
|
"version": "1.3.4",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "@ztimson/css-utils",
|
"name": "@ztimson/css-utils",
|
||||||
"version": "1.3.3",
|
"version": "1.3.4",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"sass": "^1.80.6"
|
"sass": "^1.80.6"
|
||||||
|
|||||||
@@ -447,6 +447,7 @@ $divisible: (0, 10, 20, 25, 30, 33, 34, 40, 50, 60, 66, 70, 75, 80, 90, 100);
|
|||||||
.hidden#{$bp} { visibility: hidden !important; }
|
.hidden#{$bp} { visibility: hidden !important; }
|
||||||
|
|
||||||
@each $s, $size in $sizes {
|
@each $s, $size in $sizes {
|
||||||
|
.gap#{$bp}-#{$s} { gap: $size !important; } // Gap
|
||||||
.b#{$bp}-#{$s} { border: #{$s}px solid var(--theme-border) !important; } // Border
|
.b#{$bp}-#{$s} { border: #{$s}px solid var(--theme-border) !important; } // Border
|
||||||
.m#{$bp}-#{$s} { margin: $size !important; } // Margin
|
.m#{$bp}-#{$s} { margin: $size !important; } // Margin
|
||||||
.p#{$bp}-#{$s} { padding: $size !important; } // Padding
|
.p#{$bp}-#{$s} { padding: $size !important; } // Padding
|
||||||
|
|||||||
Reference in New Issue
Block a user