Skip to content

Commit b459558

Browse files
authored
chore: prepare 20.0.6 (#132)
* ci: rebase main after release (#129) * fix(tab): fix tab overflow always displayed (#131)
1 parent eefd3c7 commit b459558

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

.github/workflows/release.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,23 @@ jobs:
5555
git config user.name "github-actions[bot]"
5656
git config user.email "github-actions[bot]@users.noreply.github.com"
5757
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
58+
5859
pnpm exec nx release ${{ github.event.inputs.version || '' }} --skip-publish --verbose --dryRun=${{ github.event.inputs.dryRun }}
5960
env:
6061
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6162

63+
- name: Sync main with release 📤
64+
if: ${{ github.event.inputs.dryRun == 'false' }}
65+
run: |
66+
git config user.name "github-actions[bot]"
67+
git config user.email "github-actions[bot]@users.noreply.github.com"
68+
69+
git fetch origin
70+
git checkout main
71+
git pull origin main
72+
git merge origin/release --no-ff -m "chore: merge release into main"
73+
git push origin main
74+
6275
- name: Build code 🛠
6376
run: pnpm lib:build
6477

libs/flowbite-angular/tab/src/tab-list/theme.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export interface FlowbiteTabListHostTheme {
1414

1515
export const flowbiteTabListTheme: FlowbiteTabListTheme = createTheme({
1616
host: {
17-
base: 'flex overflow-x-scroll overflow-y-clip border-b text-center',
17+
base: 'flex overflow-x-auto overflow-y-clip border-b text-center',
1818
transition: '',
1919
color: {
2020
default: {

0 commit comments

Comments
 (0)