Skip to content

Commit

Permalink
Merge branch '7' into 8
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed Aug 20, 2024
2 parents 07fee74 + 1c43bd6 commit de6c50b
Show file tree
Hide file tree
Showing 36 changed files with 1,999 additions and 1,367 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/tag-patch-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Tag patch release

on:
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch
workflow_dispatch:
inputs:
latest_local_sha:
description: The latest local sha
required: true
type: string

permissions: {}

jobs:
tagpatchrelease:
name: Tag patch release
# Only run cron on the tractorcow-farm account
if: (github.event_name == 'schedule' && github.repository_owner == 'tractorcow-farm') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Tag release
uses: silverstripe/gha-tag-release@v2
with:
latest_local_sha: ${{ inputs.latest_local_sha }}
4 changes: 2 additions & 2 deletions .github/workflows/update-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Update JS

on:
workflow_dispatch:
# Run on a schedule of once per quarter
# At 4:20 AM UTC, on day 1 of the month, only in March and September
schedule:
- cron: '20 4 1 */3 *'
- cron: '20 4 1 3,9 *'

permissions: {}

Expand Down
179 changes: 0 additions & 179 deletions .sass-lint.yml

This file was deleted.

1 change: 1 addition & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('@silverstripe/eslint-config/.stylelintrc');
2 changes: 1 addition & 1 deletion client/dist/styles/fluent.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions client/src/styles/fluent.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ $fluent-color-localised: rgb(102, 15, 242);
position: relative;

&:before {
color: white;
color: #fff;
position: absolute;
top: 50%;
line-height: 0;
Expand All @@ -72,7 +72,7 @@ $fluent-color-localised: rgb(102, 15, 242);
background-size: 12px;
border-radius: 5px;
border: 0 none;
color: white;
color: #fff;
padding: 5px 21px 5px 24px;
width: 100%;

Expand All @@ -82,7 +82,7 @@ $fluent-color-localised: rgb(102, 15, 242);
padding: 2px;

> option {
color: white;
color: #fff;
}
}
}
Expand Down Expand Up @@ -146,7 +146,7 @@ $fluent-color-localised: rgb(102, 15, 242);
line-height: 1em;
display: block !important;// sass-lint:disable-line no-important
margin: 0;
padding: 0 11px 8px 11px;
padding: 0 11px 8px;
border-bottom: 1px solid #ccc;
color: #999;

Expand Down
Loading

0 comments on commit de6c50b

Please sign in to comment.