Skip to content

Fix/pr 997 conflicts #998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jagadishchaudhari-tangoe merged 4 commits into from
Mar 17, 2026
Merged

Fix/pr 997 conflicts #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
114c0a4
Merge pull request #971 from mobi/dev
pavanrajutangoe May 22, 2025
ce13025
Revert CSS Changes from Prod. (#974)
jagadishchaudhari-tangoe Jun 25, 2025
baefb0b
Merge remote-tracking branch 'origin/main' into dev.
jagadishchaudhari-tangoe Mar 17, 2026
06418a0
Merge branch 'dev' of https://github.com/mobi/goponents into dev
jagadishchaudhari-tangoe Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion projects/go-lib/styles/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ $theme-dark-border: darken($base-dark-secondary, 7%);
// UI Colors
// Negative Colors -
// These are used to portray dangerous actions, error states, or other negative states in the interface
$ui-color-negative: #DC3545;
$ui-color-negative: #db3939;
$ui-color-negative-hover: darken($ui-color-negative, 3.5%);
$ui-color-negative-active: darken($ui-color-negative, 7%);
$ui-color-negative-dark: darken($ui-color-negative-hover, 10%);
Expand Down
4 changes: 2 additions & 2 deletions projects/go-style-guide/src/app/features/standards/components/colors/colors.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h2 class="go-heading-2 go-heading--no-wrap">Base Colors</h2>
<span class="overline">#FFFFFF</span>
</div>
<div id="go-color-light-secondary" class="go-color-items__item go-color-items__item--dark">
<span class="overline">#ADB5BD</span>
<span class="overline">#B1B1B1</span>
</div>
<div id="go-color-dark" class="go-color-items__item">
<span class="overline">#313536</span>
Expand Down Expand Up @@ -145,7 +145,7 @@ <h2 class="go-heading-2 go-heading--no-wrap">Horizon Red</h2>
</p>
<div class="go-color-items">
<div class="go-color-items__item">
<span class="overline">#DC3545</span>
<span class="overline">#DB3939</span>
</div>
<div class="go-color-items__item">
<span class="overline">#d92637</span>
Expand Down
2 changes: 1 addition & 1 deletion projects/go-style-guide/src/app/features/standards/components/colors/colors.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class ColorsComponent {

horizonRed: string = `
// Use this to apply the negative (error) state color
$ui-color-negative: #DC3545;
$ui-color-negative: #DB3939;

// Used when the ui color needs a hover state
$ui-color-negative-hover: darken($ui-color-negative, 3.5%);
Expand Down
Loading