Skip to content

Commit

Permalink
Merge branch 'main' into fix-91/Change-cursor-pointer-in-checkbox's-d…
Browse files Browse the repository at this point in the history
…isabled-state
  • Loading branch information
TorstenDittmann authored Nov 16, 2023
2 parents 6f0fbe8 + 68a720e commit 99dea9b
Show file tree
Hide file tree
Showing 563 changed files with 8,436 additions and 2,366 deletions.
6 changes: 6 additions & 0 deletions .changeset/brown-shirts-judge.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@appwrite.io/pink-icons": patch
"@appwrite.io/pink": patch
---

Fix desynced icons
6 changes: 6 additions & 0 deletions .changeset/dirty-hounds-do.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@appwrite.io/pink-icons": patch
"@appwrite.io/pink": patch
---

patch bump
6 changes: 6 additions & 0 deletions .changeset/neat-cats-cough.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@appwrite.io/pink-icons": minor
"@appwrite.io/pink": minor
---

add divider
25 changes: 25 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"mode": "pre",
"tag": "next",
"initialVersions": {
"@appwrite.io/kitchensink": "0.0.0",
"@appwrite.io/pink-design": "0.0.0-rc1",
"@appwrite.io/fonts": "0.0.0",
"@appwrite.io/pink-icons": "0.0.6",
"@appwrite.io/pink": "0.0.6"
},
"changesets": [
"brown-shirts-judge",
"neat-cats-cough",
"pretty-feet-return",
"pretty-gorillas-cough",
"rotten-carpets-joke",
"sweet-turtles-hope",
"ten-pandas-share",
"ten-snakes-teach",
"three-waves-cheer",
"two-pans-shake",
"witty-bulldogs-repeat",
"dirty-hounds-do"
]
}
6 changes: 6 additions & 0 deletions .changeset/pretty-feet-return.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@appwrite.io/pink-icons": minor
"@appwrite.io/pink": minor
---

Fix avatar icons
6 changes: 6 additions & 0 deletions .changeset/pretty-gorillas-cough.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@appwrite.io/pink-icons": minor
"@appwrite.io/pink": minor
---

Fix switch button
6 changes: 6 additions & 0 deletions .changeset/rotten-carpets-joke.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@appwrite.io/pink-icons": patch
"@appwrite.io/pink": patch
---

fixes for 1.4.x release
6 changes: 6 additions & 0 deletions .changeset/sweet-turtles-hope.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@appwrite.io/pink-icons": minor
"@appwrite.io/pink": minor
---

Fix: font cropping
6 changes: 6 additions & 0 deletions .changeset/ten-pandas-share.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@appwrite.io/pink-icons": patch
"@appwrite.io/pink": patch
---

fix desync issue
6 changes: 6 additions & 0 deletions .changeset/ten-snakes-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@appwrite.io/pink-icons": patch
"@appwrite.io/pink": patch
---

patch
6 changes: 6 additions & 0 deletions .changeset/three-waves-cheer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@appwrite.io/pink-icons": patch
"@appwrite.io/pink": patch
---

pre-release patch
6 changes: 6 additions & 0 deletions .changeset/two-pans-shake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@appwrite.io/pink-icons": minor
"@appwrite.io/pink": minor
---

Add bun icon
6 changes: 6 additions & 0 deletions .changeset/witty-bulldogs-repeat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@appwrite.io/pink-icons": minor
"@appwrite.io/pink": minor
---

Changes for 1.4 from other branch
26 changes: 26 additions & 0 deletions .github/workflows/alt-text-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Accessibility-alt-text-bot
on:
issues:
types: [opened, edited]
pull_request:
types: [opened, edited]
issue_comment:
types: [created, edited]
discussion:
types: [created, edited]
discussion_comment:
types: [created, edited]

permissions:
issues: write
pull-requests: write
discussions: write

jobs:
accessibility_alt_text_bot:
name: Check alt text is set on issue or pull requests
runs-on: ubuntu-latest
if: ${{ github.event.issue || github.event.pull_request || github.event.discussion }}
steps:
- name: Get action 'github/accessibility-alt-text-bot'
uses: github/[email protected]
5 changes: 4 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
push:
branches:
- main
- pre/** # pre-release branches
- style-level-* # style-level branches
- style-updates-for-release-1.4 # BRUTEFORCE

concurrency: ${{ github.workflow }}-${{ github.ref }}

Expand All @@ -21,7 +24,7 @@ jobs:
node-version: 16.x

- name: Install Dependencies
run: npm i
run: npm ci

- name: Create Release Pull Request or Publish to npm
id: changesets
Expand Down
37 changes: 37 additions & 0 deletions VERSIONING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Versioning

Versioning consists in 3 steps. Specifying a bump (which can be `patch`, `minor` or `major`), updating package versions, and releasing.

## Automatic PR flow

### Bumping

To specify a new bump in the package versions, you can use the `bump-x` script, where `x` is the bump type.

This will automatically generate a [changeset](https://github.com/changesets/changesets). A changeset is a file that contains the bump intent, and a list of all commits that will be included in the release.

### Releasing

After bumping, you should commit and push the changesets. This will trigger a GitHub action that will automatically create a release PR to your branch. This PR will contain all the changesets that have been pushed since the last release.

## CLI flow

### Bumping

To specify a new bump in the package versions, you can use the `bump-x` script, where `x` is the bump type.

This will automatically generate a [changeset](https://github.com/changesets/changesets). A changeset is a file that contains the bump intent, and a list of all commits that will be included in the release.

### Updating package versions

To apply the bump intents, and change the package versions accordingly, you can use the `version` script. This will automatically update all the `CHANGELOG.md` files, and the `package.json` files.

### Releasing

If everything looks good, you can release the new version using the `release` script. This will automatically create a new git tag, and publish the packages to npm. Don't forget to commit!

## Pre-releasing

Sometimes, you will want to release a pre-release version. Firstly, be sure to be in a branch that is not `main`. Then, you can use the `pre` script, which will enter the current branch into pre-release mode. While in pre-release mode, all other actions are the same, but the version will be suffixed with `-next.X`.

Before merging this pre-release branch into `main`, be sure to exit the pre-release mode using the `pre` script again.
20 changes: 16 additions & 4 deletions apps/kitchensink/auth.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
>
<ul class="toaster-list s-9NkT8-ZB_aEl">
<li class="alert-sticky is-success">
<button class="x-button" aria-label="close alert">
<button class="button is-text is-only-icon" style="--button-size:1.5rem;" aria-label="close alert">
<span class="icon-x" aria-hidden="true"></span>
</button>
<div class="alert-sticky-image">
Expand Down Expand Up @@ -76,12 +76,24 @@ <h1 class="heading-level-4">Users</h1>
<section class="common-section">
<article class="card common-section">
<div class="common-section grid-1-2">
<div class="grid-1-2-col-1">
<div class="u-flex-vertical u-gap-16">
<h2 class="heading-level-7">Auth Methods</h2>
<p>Enable the auth methods you wish to use.</p>
</div>
<div class="grid-1-2-col-2">
<form class="form">

<div class="u-flex u-padding-block-8 u-sep-block-end">
<ul class="buttons-list u-margin-inline-start-auto">
<li class="buttons-list-item">
<button class="button is-text"><span class="text">Enable all</span></button>
</li>
<li class="buttons-list-item">
<button class="button is-text u-padding-inline-end-0"><span class="text">Disable all</span></button>
</li>
</ul>
</div>

<form class="form u-padding-block-start-20">
<ul class="form-list is-multiple">
<li class="form-item">
<label class="choice-item">
Expand Down Expand Up @@ -527,8 +539,8 @@ <h2 class="heading-level-6 common-section">OAuth2 Providers</h2>

</div>
</div>
<footer class="main-footer"></footer>
</section>
<footer class="main-footer"></footer>
</main>
<script type="module" src="/main.js"></script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion apps/kitchensink/auth2.html
Original file line number Diff line number Diff line change
Expand Up @@ -518,8 +518,8 @@ <h4 class="modal-title">Apple OAuth2 Settings</h4>
</ul>
</form>
</div>
<footer class="main-footer"></footer>
</section>
<footer class="main-footer"></footer>
</main>
<script type="module" src="/main.js"></script>
</body>
Expand Down
Loading

0 comments on commit 99dea9b

Please sign in to comment.