Skip to content

Commit

Permalink
Refresh the style of alerts (jenkinsci#9115)
Browse files Browse the repository at this point in the history
* Init

* Update _alert.scss

* Update _theme.scss
  • Loading branch information
janfaracik committed Apr 4, 2024
1 parent 8a89117 commit b9fac75
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 63 deletions.
52 changes: 40 additions & 12 deletions war/src/main/scss/abstracts/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,46 @@ $semantics: (
--breadcrumbs-bar-background: hsla(240, 20%, 96.5%, 0.8);

// Alert call outs
--alert-success-text-color: #155724;
--alert-success-bg-color: #d4edda;
--alert-success-border-color: #c3e6cb;
--alert-info-text-color: #31708f;
--alert-info-bg-color: #d9edf7;
--alert-info-border-color: #bce8f1;
--alert-warning-text-color: #8a6d3b;
--alert-warning-bg-color: #fcf8e3;
--alert-warning-border-color: #faebcc;
--alert-danger-text-color: #a94442;
--alert-danger-bg-color: #f2dede;
--alert-danger-border-color: #ebccd1;
--alert-success-text-color: var(--success-color);
--alert-success-bg-color: color-mix(
in sRGB,
var(--success-color) 10%,
transparent
);
--alert-success-border-color: color-mix(
in sRGB,
var(--success-color) 5%,
transparent
);
--alert-info-text-color: var(--blue);
--alert-info-bg-color: color-mix(in sRGB, var(--blue) 10%, transparent);
--alert-info-border-color: color-mix(in sRGB, var(--blue) 5%, transparent);
--alert-warning-text-color: color-mix(
in sRGB,
var(--warning-color) 80%,
var(--text-color)
);
--alert-warning-bg-color: color-mix(
in sRGB,
var(--warning-color) 10%,
transparent
);
--alert-warning-border-color: color-mix(
in sRGB,
var(--warning-color) 5%,
transparent
);
--alert-danger-text-color: var(--error-color);
--alert-danger-bg-color: color-mix(
in sRGB,
var(--error-color) 10%,
transparent
);
--alert-danger-border-color: color-mix(
in sRGB,
var(--error-color) 5%,
transparent
);

// Typography
--text-color-secondary: var(--secondary);
Expand Down
51 changes: 0 additions & 51 deletions war/src/main/scss/base/_style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1048,57 +1048,6 @@ select.select-ajax-pending {
display: none;
}

.alert {
font-size: var(--font-size-sm);
padding: 15px;
margin-bottom: 20px;
border: 1px solid transparent;
border-radius: var(--form-input-border-radius);
}

.alert a {
color: inherit;
text-decoration: underline;

&:hover,
&:focus,
&:active {
text-decoration: underline;
}
}

.alert-success {
color: var(--alert-success-text-color);
background-color: var(--alert-success-bg-color);
border-color: var(--alert-success-border-color);
}

.alert-info {
color: var(--alert-info-text-color);
background-color: var(--alert-info-bg-color);
border-color: var(--alert-info-border-color);
}

.alert-warning {
color: var(--alert-warning-text-color);
background-color: var(--alert-warning-bg-color);
border-color: var(--alert-warning-border-color);
}

.alert-warning p {
color: var(--alert-warning-text-color);
}

.alert-danger {
color: var(--alert-danger-text-color);
background-color: var(--alert-danger-bg-color);
border-color: var(--alert-danger-border-color);
}

.alert-danger p {
color: var(--alert-danger-text-color);
}

body.no-decoration #main-panel {
margin: 0 auto !important;
}
Expand Down
54 changes: 54 additions & 0 deletions war/src/main/scss/components/_alert.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
.alert {
font-size: var(--font-size-sm);
padding: 15px;
margin-bottom: 20px;
border: 1px solid transparent;
border-radius: 10px;

strong {
font-weight: 500;
}
}

.alert a {
color: inherit;
text-decoration: underline;

&:hover,
&:focus,
&:active {
text-decoration: underline;
}
}

.alert-success {
color: var(--alert-success-text-color);
background-color: var(--alert-success-bg-color);
border-color: var(--alert-success-border-color);
}

.alert-info {
color: var(--alert-info-text-color);
background-color: var(--alert-info-bg-color);
border-color: var(--alert-info-border-color);
}

.alert-warning {
color: var(--alert-warning-text-color);
background-color: var(--alert-warning-bg-color);
border-color: var(--alert-warning-border-color);
}

.alert-warning p {
color: var(--alert-warning-text-color);
}

.alert-danger {
color: var(--alert-danger-text-color);
background-color: var(--alert-danger-bg-color);
border-color: var(--alert-danger-border-color);
}

.alert-danger p {
color: var(--alert-danger-text-color);
}
1 change: 1 addition & 0 deletions war/src/main/scss/components/_index.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "app-bar";
@use "alert";
@use "badges";
@use "breadcrumbs";
@use "buttons-deprecated";
Expand Down

0 comments on commit b9fac75

Please sign in to comment.