Skip to content

Commit e64f6cc

Browse files
Merge branch 'master' into aryanshah/migrate_eslint
2 parents da928db + fe994b5 commit e64f6cc

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

.github/workflows/slack.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,27 @@ jobs:
1515
- name: Get current star count
1616
run: |
1717
echo "STARS=$(curl --silent 'https://api.github.com/repos/${{ github.repository }}' -H 'Accept: application/vnd.github.preview' | jq '.stargazers_count')" >> $GITHUB_ENV
18+
1819
- name: Notify Slack
19-
env:
20-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
21-
uses: pullreminders/slack-action@master
20+
uses: slackapi/[email protected]
2221
with:
23-
args: '{\"channel\":\"CSK7N9TGX\",\"text\":\"${{ github.actor }} just starred ${{ github.repository }}! (https://github.com/${{ github.repository }}/stargazers) Total ⭐️: ${{ env.STARS }}\"}'
22+
method: chat.postMessage
23+
token: ${{ secrets.SLACK_BOT_TOKEN }}
24+
payload: |
25+
channel: CSK7N9TGX
26+
type: "mrkdwn"
27+
text: "<https://github.com/${{ github.actor }}|${{ github.actor }}> just starred <https://github.com/${{ github.repository }}/stargazers|${{ github.repository }}> bringing the total ⭐️ count up to: ${{ env.STARS }}"
2428
2529
good-first-issue-notify:
2630
if: github.event_name == 'issues' && (github.event.label.name == 'good first issue' || github.event.label.name == 'first-timers-only')
2731
name: Notify Slack for new good-first-issue
2832
runs-on: ubuntu-latest
2933
steps:
3034
- name: Notify Slack
31-
env:
32-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
33-
uses: pullreminders/slack-action@master
35+
uses: slackapi/[email protected]
3436
with:
35-
args: '{\"channel\":\"C019426UBNY\",\"type\":\"section\",\"text\":\":new: Good first issue up for grabs: ${{ github.event.issue.title }} - ${{ github.event.issue.html_url }} \"}'
36-
37+
method: chat.postMessage
38+
token: ${{ secrets.SLACK_BOT_TOKEN }}
39+
payload: |
40+
channel: C019426UBNY
41+
text: ":new: Good first issue up for grabs: <${{ github.event.issue.title }}|${{ github.event.issue.html_url }}>"

src/custom/TransferModal/TransferList/style.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export const TransferButton = styled(Button)(({ theme }) => ({
5353
fill: theme.palette.icon.default,
5454
'&:hover': {
5555
borderColor: theme.palette.border?.brand,
56-
backgroundColor: `${KEPPEL} !important`,
56+
backgroundColor: `${theme.palette.interactive.primary} !important`,
5757
fill: theme.palette.icon.inverse
5858
}
5959
}));

src/custom/Workspaces/WorkspaceTransferButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export const RecordRow: React.FC<RecordRowProps> = ({ title, name, date }) => {
107107
sx={{
108108
fontSize: 14,
109109
fontStyle: 'italic',
110-
color: `${theme.palette.text.disabled}`,
110+
color: `${theme.palette.background.constant?.white}99`,
111111
paddingRight: '12px',
112112
textAlign: 'end'
113113
}}

src/custom/Workspaces/styles.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ export const CardWrapper = styled(Card)(({ theme }) => ({
359359

360360
export const CardBackWrapper = styled(CardWrapper)(({ theme }) => ({
361361
minHeight: theme.spacing(50),
362-
background: 'linear-gradient(180deg, #007366 0%, #000 100%)'
362+
background: theme.palette.surface.tint
363363
}));
364364

365365
export const CardFrontWrapper = styled(CardWrapper)(({ theme }) => ({

src/theme/components/button.modifier.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export const MuiButton: Components<Theme>['MuiButton'] = {
1414
return {
1515
...textB2SemiBold,
1616
fontWeight: 500,
17+
lineHeight: 'normal',
1718
'&.MuiButton-contained': {
1819
color: constant?.white,
1920
backgroundColor: brand?.default,

0 commit comments

Comments
 (0)