Skip to content

Commit

Permalink
chore: add missing status attibutes to validate icons
Browse files Browse the repository at this point in the history
This is a backport of 19a1250.
  • Loading branch information
kevinbuhmann committed Sep 16, 2022
1 parent df26a02 commit 072bff8
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 49 deletions.
1 change: 1 addition & 0 deletions projects/angular/src/forms/input/input-container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { NgControlService } from '../common/providers/ng-control.service';
*ngIf="showInvalid"
class="clr-validate-icon"
shape="exclamation-circle"
status="danger"
aria-hidden="true"
></cds-icon>
<cds-icon
Expand Down
24 changes: 12 additions & 12 deletions projects/angular/src/forms/styles/containers.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { ClrIconModule } from '../../icon/icon.module';
>
<div class="clr-input-wrapper">
<input type="text" id="{{ layout }}-basic" placeholder="Enter value here" class="clr-input" />
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand Down Expand Up @@ -74,7 +74,7 @@ import { ClrIconModule } from '../../icon/icon.module';
<label for="{{ layout }}-checkbox3" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand Down Expand Up @@ -122,7 +122,7 @@ import { ClrIconModule } from '../../icon/icon.module';
<label for="{{ layout }}-checkbox9" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand Down Expand Up @@ -170,7 +170,7 @@ import { ClrIconModule } from '../../icon/icon.module';
<label for="{{ layout }}-toggle3" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand Down Expand Up @@ -218,7 +218,7 @@ import { ClrIconModule } from '../../icon/icon.module';
<label for="{{ layout }}-toggle9" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand Down Expand Up @@ -266,7 +266,7 @@ import { ClrIconModule } from '../../icon/icon.module';
<label for="{{ layout }}-radio3" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand Down Expand Up @@ -314,7 +314,7 @@ import { ClrIconModule } from '../../icon/icon.module';
<label for="{{ layout }}-radio6" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand All @@ -337,7 +337,7 @@ import { ClrIconModule } from '../../icon/icon.module';
<input #fileInput type="file" id="{{ layout }}-file" placeholder="Enter value here" class="clr-file" />
</div>
<!-- IMPORTANT DIFFERENCE IN STRUCTURE! ICON IS NOT PART OF THE INPUT WRAPPER -->
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand All @@ -358,7 +358,7 @@ import { ClrIconModule } from '../../icon/icon.module';
<input type="file" id="{{ layout }}-file" placeholder="Enter value here" />
</div>
<!-- IMPORTANT DIFFERENCE IN STRUCTURE! ICON IS NOT PART OF THE INPUT WRAPPER -->
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand All @@ -382,7 +382,7 @@ import { ClrIconModule } from '../../icon/icon.module';
placeholder="Enter value here"
class="clr-textarea"
></textarea>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -405,7 +405,7 @@ import { ClrIconModule } from '../../icon/icon.module';
<option>Option 2</option>
<option>Option 3</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -428,7 +428,7 @@ import { ClrIconModule } from '../../icon/icon.module';
<option>Option 2</option>
<option>Option 3</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand Down
18 changes: 9 additions & 9 deletions projects/demo/src/app/radios/radios.demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ <h4>Vertical</h4>
<label for="vertical-radio3" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand All @@ -279,7 +279,7 @@ <h4>Vertical</h4>
<label for="vertical-radio6" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand All @@ -301,7 +301,7 @@ <h4>Vertical</h4>
<label for="vertical-radio9" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand All @@ -327,7 +327,7 @@ <h4>Horizontal</h4>
<label for="horizontal-radio3" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand All @@ -349,7 +349,7 @@ <h4>Horizontal</h4>
<label for="horizontal-radio6" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand All @@ -371,7 +371,7 @@ <h4>Horizontal</h4>
<label for="horizontal-radio9" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand All @@ -397,7 +397,7 @@ <h4>Compact</h4>
<label for="compact-radio3" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand All @@ -419,7 +419,7 @@ <h4>Compact</h4>
<label for="compact-radio6" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand All @@ -441,7 +441,7 @@ <h4>Compact</h4>
<label for="compact-radio9" class="clr-control-label">option 3</label>
</div>
<div class="clr-subtext-wrapper">
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
<span class="clr-subtext">Helper Text</span>
</div>
</div>
Expand Down
26 changes: 13 additions & 13 deletions projects/demo/src/app/selects/selects.demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ <h4>Vertical</h4>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -224,7 +224,7 @@ <h4>Vertical</h4>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -239,7 +239,7 @@ <h4>Vertical</h4>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -254,7 +254,7 @@ <h4>Vertical</h4>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -269,7 +269,7 @@ <h4>Vertical</h4>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -288,7 +288,7 @@ <h4>Horizontal</h4>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -303,7 +303,7 @@ <h4>Horizontal</h4>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -318,7 +318,7 @@ <h4>Horizontal</h4>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -333,7 +333,7 @@ <h4>Horizontal</h4>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -352,7 +352,7 @@ <h4>Compact</h4>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -367,7 +367,7 @@ <h4>Compact</h4>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -382,7 +382,7 @@ <h4>Compact</h4>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -397,7 +397,7 @@ <h4>Compact</h4>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand Down
12 changes: 6 additions & 6 deletions projects/demo/src/app/textarea/textarea.demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ <h4>Vertical</h4>
<div class="clr-control-container">
<div class="clr-textarea-wrapper">
<textarea id="vertical-textarea-basic" placeholder="Enter value here" class="clr-textarea"></textarea>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -108,7 +108,7 @@ <h4>Vertical</h4>
<div class="clr-control-container clr-error">
<div class="clr-textarea-wrapper">
<textarea id="vertical-textarea-basic-error" placeholder="Enter value here" class="clr-textarea"></textarea>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -123,7 +123,7 @@ <h4>Horizontal</h4>
<div class="clr-control-container">
<div class="clr-textarea-wrapper">
<textarea id="horizontal-textarea-basic" placeholder="Enter value here" class="clr-textarea"></textarea>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -134,7 +134,7 @@ <h4>Horizontal</h4>
<div class="clr-control-container clr-error">
<div class="clr-textarea-wrapper">
<textarea id="horizontal-textarea-basic-error" placeholder="Enter value here" class="clr-textarea"></textarea>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -149,7 +149,7 @@ <h4>Compact</h4>
<div class="clr-control-container">
<div class="clr-textarea-wrapper">
<textarea id="compact-textarea-basic" placeholder="Enter value here" class="clr-textarea"></textarea>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand All @@ -160,7 +160,7 @@ <h4>Compact</h4>
<div class="clr-control-container clr-error">
<div class="clr-textarea-wrapper">
<textarea id="compact-textarea-basic-error" placeholder="Enter value here" class="clr-textarea"></textarea>
<cds-icon class="clr-validate-icon" shape="exclamation-circle"></cds-icon>
<cds-icon class="clr-validate-icon" shape="exclamation-circle" status="danger"></cds-icon>
</div>
<span class="clr-subtext">Helper Text</span>
</div>
Expand Down

0 comments on commit 072bff8

Please sign in to comment.