Skip to content

Commit

Permalink
ui: Alias all our Structure Icons to Flight Icons (#12209)
Browse files Browse the repository at this point in the history
  • Loading branch information
johncowen authored Feb 2, 2022
1 parent 7c31acc commit 0f94ce3
Show file tree
Hide file tree
Showing 13 changed files with 6,759 additions and 3,042 deletions.
3 changes: 3 additions & 0 deletions .changelog/12209.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
ui: Use @hashicorp/flight icons for all our icons.
```
1 change: 0 additions & 1 deletion ui/packages/consul-ui/app/components/buttons/skin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
%sort-button::before {
@extend %with-sort-mask, %as-pseudo;
position: relative;
top: 4px;
width: 16px;
height: 16px;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
.consul-external-source {
@extend %pill-200, %frame-gray-600, %p1;
}
.consul-external-source.kubernetes::before {
@extend %with-logo-kubernetes-color-icon, %as-pseudo;
}
.consul-external-source.terraform::before {
@extend %with-logo-terraform-color-icon, %as-pseudo;
}
.consul-external-source.nomad::before {
@extend %with-logo-nomad-color-icon, %as-pseudo;
}
.consul-external-source.consul::before,
.consul-external-source.consul-api-gateway::before {
@extend %with-logo-consul-color-icon, %as-pseudo;
}
.consul-external-source.vault::before {
@extend %with-vault-100;
}
.consul-external-source.aws::before {
@extend %with-aws-100;
}
.consul-external-source.leader::before {
@extend %with-star-outline-mask, %as-pseudo;
}
.consul-external-source.jwt::before {
@extend %with-logo-jwt-color-icon, %as-pseudo;
}
.consul-external-source.oidc::before {
@extend %with-logo-oidc-color-icon, %as-pseudo;
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
%pill-allow::before,
%pill-deny::before,
%pill-l7::before {
@extend %as-pseudo;
margin-right: 5px;
font-size: 0.9em;
}
%pill-allow,
%pill-deny,
Expand All @@ -24,11 +22,11 @@
@extend %frame-gray-900;
}
%pill-allow::before {
@extend %with-arrow-right-mask;
@extend %with-allow-300;
}
%pill-deny::before {
@extend %with-deny-color-mask;
@extend %with-deny-300;
}
%pill-l7::before {
@extend %with-layers-mask;
@extend %with-l7-300;
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
.consul-intention-fieldsets {
.value-allow > :last-child::before {
@extend %with-arrow-right-mask, %as-pseudo;
color: rgb(var(--tone-green-500));
@extend %with-allow-500;
}
.value-deny > :last-child::before {
@extend %with-deny-color-icon, %as-pseudo;
@extend %with-deny-500;
}
.value- > :last-child::before {
@extend %with-layers-mask, %as-pseudo;
@extend %with-l7-500;
}
}
28 changes: 0 additions & 28 deletions ui/packages/consul-ui/app/components/pill/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,3 @@ span.policy-node-identity::before {
span.policy-service-identity::before {
content: 'Service Identity: ';
}
%pill.kubernetes::before {
@extend %with-logo-kubernetes-color-icon, %as-pseudo;
}
%pill.terraform::before {
@extend %with-logo-terraform-color-icon, %as-pseudo;
}
%pill.nomad::before {
@extend %with-logo-nomad-color-icon, %as-pseudo;
}
%pill.consul::before,
%pill.consul-api-gateway::before {
@extend %with-logo-consul-color-icon, %as-pseudo;
}
%pill.vault::before {
@extend %with-vault-300;
}
%pill.aws::before {
@extend %with-logo-aws-color-icon, %as-pseudo;
}
%pill.leader::before {
@extend %with-star-outline-mask, %as-pseudo;
}
%pill.jwt::before {
@extend %with-logo-jwt-color-icon, %as-pseudo;
}
%pill.oidc::before {
@extend %with-logo-oidc-color-icon, %as-pseudo;
}
3 changes: 2 additions & 1 deletion ui/packages/consul-ui/app/components/pill/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
%pill::before {
margin-right: 4px;
font-size: 0.8em;
width: 0.75rem !important; /* 12px */
height: 0.75rem !important; /* 12px */
}
%pill-200 {
@extend %pill;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
color: rgb(var(--tone-gray-500));
}
%popover-select .aws button::before {
@extend %with-logo-aws-color-icon, %as-pseudo;
@extend %with-aws-300;
}
%popover-select .kubernetes button::before {
@extend %with-logo-kubernetes-color-icon, %as-pseudo;
Expand Down
12 changes: 10 additions & 2 deletions ui/packages/consul-ui/app/styles/base/icons/base-placeholders.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
%theme-light {
--theme-dark-none: ;
--theme-light-none: initial;
}
%theme-dark {
--theme-dark-none: initial;
--theme-light-none: ;
}
%with-icon {
background-repeat: no-repeat;
background-position: center;
Expand All @@ -20,8 +28,8 @@
content: '';
visibility: visible;
background-size: contain;
width: 1.2em;
height: 1.2em;
width: 1rem; /* 16px */
height: 1rem; /* 16px */
vertical-align: text-top;
}
%led-icon {
Expand Down
2,382 changes: 1,359 additions & 1,023 deletions ui/packages/consul-ui/app/styles/base/icons/base-variables.scss

Large diffs are not rendered by default.

Loading

0 comments on commit 0f94ce3

Please sign in to comment.