summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2023-09-03 08:55:57 +0200
committerLibravatar GitHub <noreply@github.com>2023-09-03 08:55:57 +0200
commit63c5f6278be8df17fc139dda1d41e0b26951509d (patch)
tree53a3f74fc6ad7e50961d9cc768e521d07377a6b4
parent28252e64086ad99897e881aa5e27e64654e9bafb (diff)
parent404f4974a31b57469d70b4a94c99c2d4ec0600d2 (diff)
downloadiced-63c5f6278be8df17fc139dda1d41e0b26951509d.tar.gz
iced-63c5f6278be8df17fc139dda1d41e0b26951509d.tar.bz2
iced-63c5f6278be8df17fc139dda1d41e0b26951509d.zip
Merge branch 'master' into dtzxporter-patch-1
Diffstat (limited to '')
-rw-r--r--.github/workflows/verify.yml19
-rw-r--r--CHANGELOG.md4
-rw-r--r--examples/styling/src/main.rs1
3 files changed, 5 insertions, 19 deletions
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
deleted file mode 100644
index 089dd5c9..00000000
--- a/.github/workflows/verify.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Verify
-on:
- pull_request:
- branches:
- - master
-jobs:
- changelog:
- runs-on: ubuntu-20.04
- steps:
- - uses: actions/checkout@v2
- with:
- fetch-depth: 0
- - name: Check `CHANGELOG.md` has changes
- run: |
- ! git diff --exit-code origin/master HEAD -- CHANGELOG.md
- - name: Check `CHANGELOG.md` thanks the PR author
- if: ${{ github.event.pull_request.user.login != 'hecrj' }}
- run: |
- sed -n '/## \[Unreleased\]/,/^## /p' CHANGELOG.md | sed -n '/Many thanks to.../,//p' | grep '@${{ github.event.pull_request.user.login }}'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8be92a28..fd930a36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,8 +12,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated `wgpu` to `0.17`. [#2065](https://github.com/iced-rs/iced/pull/2065)
- Changed `Button::style` to take an `impl Into<...>` for consistency. [#2046](https://github.com/iced-rs/iced/pull/2046)
+### Fixed
+- Missing `width` attribute in `styling` example. [#2062](https://github.com/iced-rs/iced/pull/2062)
+
Many thanks to...
+- @akshayr-mecha
- @dtzxporter
## [0.10.0] - 2023-07-28
diff --git a/examples/styling/src/main.rs b/examples/styling/src/main.rs
index f8a4c80a..51538ec2 100644
--- a/examples/styling/src/main.rs
+++ b/examples/styling/src/main.rs
@@ -108,6 +108,7 @@ impl Sandbox for Styling {
column!["Scroll me!", vertical_space(800), "You did it!"]
.width(Length::Fill),
)
+ .width(Length::Fill)
.height(100);
let checkbox = checkbox(