Merge branch 'main' into rohan/layered-dropdown-menu

iTwin · Nov 19, 2024 · 3568640 · 3568640
2 parents acab7f6 + fd0bfe1
commit 3568640
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/.changeset/red-singers-juggle.md b/.changeset/red-singers-juggle.md
@@ -0,0 +1,5 @@
+---
+'@itwin/itwinui-css': patch
+---
+
+`input` and `textarea` inside `.iui-input-flex-container` now properly get `cursor: not-allowed` when disabled.
diff --git a/.changeset/shiny-glasses-look.md b/.changeset/shiny-glasses-look.md
@@ -0,0 +1,5 @@
+---
+'@itwin/itwinui-react': patch
+---
+
+`InputWithDecorations.Input` now properly gets `cursor: not-allowed` when disabled.
diff --git a/apps/website/src/components/FeedbackLink.astro b/apps/website/src/components/FeedbackLink.astro
@@ -5,7 +5,7 @@ type Props = { page: string } & astroHTML.JSX.AnchorHTMLAttributes;
 let { page, ...rest } = Astro.props;
 
 const repoUrl = 'https://github.com/iTwin/iTwinUI';
-const githubFeedbackUrl = `${repoUrl}/discussions/new?category=documentation&title=Feedback%20on%20%60${page}%60&body=Replace%20this%20text%20with%20your%20feedback%20on%20the%20%60${page}%60%20page.`;
+const githubFeedbackUrl = `${repoUrl}/discussions/new?category=feedback&title=Feedback%20on%20%60${page}%60&body=Replace%20this%20text%20with%20your%20feedback%20on%20the%20%60${page}%60%20page.`;
 ---
 
 <a href={githubFeedbackUrl} {...rest}>

diff --git a/packages/itwinui-css/src/input-container/input-container.scss b/packages/itwinui-css/src/input-container/input-container.scss
@@ -196,6 +196,7 @@
 
     &:disabled {
       color: var(--iui-color-text-disabled);
+      cursor: not-allowed;
     }
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -196,6 +196,7 @@ @@
         &:disabled {
           color: var(--iui-color-text-disabled);
+          cursor: not-allowed;
         }
       }
@@ Expand Down @@