Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions ui/app/styles/components/action-block.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@use '../utils/font_variables';
@use '../utils/mixins';
@use '../utils/size_variables';

Expand Down Expand Up @@ -46,7 +45,7 @@

.action-block-title {
font-size: size_variables.$size-5;
font-weight: font_variables.$font-weight-bold;
font-weight: var(--token-typography-font-weight-bold);
}
.action-block-action {
text-align: right;
Expand Down
3 changes: 1 addition & 2 deletions ui/app/styles/components/calendar-widget.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@use '../utils/box-shadow_variables';
@use '../utils/font_variables';
@use '../utils/size_variables';

/**
Expand Down Expand Up @@ -28,7 +27,7 @@ $dark-gray: #535f73;
.select-year {
grid-area: select-year;
margin: 10px 24px;
font-weight: font_variables.$font-weight-bold;
font-weight: var(--tokens-typography-font-weight-bold);
display: flex;
justify-content: space-between;
align-items: first baseline;
Expand Down
9 changes: 4 additions & 5 deletions ui/app/styles/components/console-ui-panel.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@use 'sass:color';
@use '../utils/box-shadow_variables';
@use '../utils/font_variables';
@use '../utils/size_variables';

/**
Expand Down Expand Up @@ -32,7 +31,7 @@ $console-close-height: 35px;
display: flex;
flex-direction: column;
font-size: size_variables.$size-7;
font-weight: font_variables.$font-weight-semibold;
font-weight: var(--token-typography-font-weight-semibold);
justify-content: flex-end;
min-height: calc(100% - $console-close-height); // account for close button that is sticky positioned
padding: size_variables.$spacing-12 size_variables.$spacing-12 size_variables.$spacing-18;
Expand Down Expand Up @@ -63,9 +62,9 @@ $console-close-height: 35px;
caret-color: hsl(0, 0%, 100%);
color: hsl(0, 0%, 100%);
flex: 1 1 auto;
font-family: font_variables.$family-monospace;
font-size: size_variables.$size-6;
font-weight: font_variables.$font-weight-bold;
font-family: var(--token-typography-font-stack-code);
font-size: var(--token-typography-body-300-font-size);
font-weight: var(--tokens-typography-font-weight-bold);
outline: none;
padding: size_variables.$spacing-8;
margin-right: size_variables.$spacing-8;
Expand Down
4 changes: 1 addition & 3 deletions ui/app/styles/components/doc-link.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
@use '../utils/font_variables';

/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1
*/

.doc-link {
color: var(--token-color-palette-blue-200);
font-weight: font_variables.$font-weight-semibold;
font-weight: var(--tokens-typography-font-weight-semibold);
&:hover {
text-decoration: underline !important;
}
Expand Down
5 changes: 2 additions & 3 deletions ui/app/styles/components/empty-state-component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@use '../utils/font_variables';
@use '../utils/size_variables';

/**
Expand Down Expand Up @@ -32,8 +31,8 @@

.empty-state-title {
color: var(--token-color-palette-neutral-400);
font-size: size_variables.$size-4;
font-weight: font_variables.$font-weight-semibold;
font-size: var(--token-typography-display-400-font-size);
font-weight: var(--token-typography-font-weight-semibold);
line-height: 1.2;
margin-bottom: size_variables.$spacing-8;
}
Expand Down
7 changes: 3 additions & 4 deletions ui/app/styles/components/info-table-row.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@use '../utils/font_variables';
@use '../utils/mixins';
@use '../utils/size_variables';

Expand Down Expand Up @@ -45,7 +44,7 @@
}

.helper-text {
font-weight: normal;
font-weight: var(--token-typography-font-weight-regular);
}
&.justify-right {
display: flex;
Expand Down Expand Up @@ -94,9 +93,9 @@

.info-table-row-header {
margin: 0;
font-size: size_variables.$size-8;
font-size: var(--token-typography-body-200-font-size);
color: var(--token-color-palette-neutral-400);
font-weight: font_variables.$font-weight-semibold;
font-weight: var(--token-typography-font-weight-semibold);

@include mixins.until(size_variables.$mobile) {
display: none;
Expand Down
5 changes: 2 additions & 3 deletions ui/app/styles/components/list-item-row.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@use '../utils/box-shadow_variables';
@use '../utils/font_variables';
@use '../utils/size_variables';
@use '../core/box.scss';
@use '../helper-classes/general.scss';
Expand All @@ -24,8 +23,8 @@
.center-inside-row {
width: 50%;
margin-left: auto;
font-size: size_variables.$size-8;
font-weight: font_variables.$font-weight-semibold;
font-size: var(--token-typography-body-200-font-size);
font-weight: var(--token-typography-font-weight-semibold);
color: var(--token-color-palette-neutral-400);
}

Expand Down
5 changes: 2 additions & 3 deletions ui/app/styles/components/masked-input.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@use '../utils/font_variables';
@use '../utils/size_variables';

/**
Expand Down Expand Up @@ -28,7 +27,7 @@ pre.masked-font {
// need to be the same font and small
.masked-input.masked .masked-value {
font-size: 9px;
font-family: font_variables.$family-sans;
font-family: var(--token-typography-font-stack-text);
line-height: 2.5;
}

Expand All @@ -44,7 +43,7 @@ pre.masked-font {

//override bulma's pre styling
.masked-input .display-only {
line-height: 1.5;
line-height: var(--token-typography-body-300-line-height);
font-size: 1rem;
padding-top: 0;
padding-bottom: 0;
Expand Down
9 changes: 4 additions & 5 deletions ui/app/styles/components/popup-menu.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@use '../utils/box-shadow_variables';
@use '../utils/font_variables';
@use '../utils/size_variables';

/**
Expand Down Expand Up @@ -46,7 +45,7 @@
display: block;
height: auto;
font-size: size_variables.$size-7;
font-weight: font_variables.$font-weight-semibold;
font-weight: var(--token-typography-font-weight-semibold);
padding: size_variables.$spacing-10 size_variables.$spacing-12;
text-align: left;
text-decoration: none;
Expand All @@ -63,7 +62,7 @@
span {
margin-left: -(size_variables.$spacing-4);
font-size: size_variables.$size-7;
font-weight: font_variables.$font-weight-semibold;
font-weight: var(--token-typography-font-weight-semibold);
}
}

Expand Down Expand Up @@ -111,7 +110,7 @@
.menu-label {
color: var(--token-color-palette-neutral-500);
font-size: size_variables.$size-9;
font-weight: font_variables.$font-weight-normal;
font-weight: var(--token-typography-font-weight-regular);
letter-spacing: 0;
margin: 0;
padding: size_variables.$spacing-8 size_variables.$spacing-12 0;
Expand All @@ -131,7 +130,7 @@
.popup-menu-content p {
box-shadow: none;
padding-top: size_variables.$spacing-8;
font-weight: font_variables.$font-weight-semibold;
font-weight: var(--token-typography-font-weight-semibold);
}

.popup-menu-content .level-left {
Expand Down
5 changes: 2 additions & 3 deletions ui/app/styles/components/radio-card.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@use '../utils/box-shadow_variables';
@use '../utils/font_variables';
@use '../utils/size_variables';

/**
Expand Down Expand Up @@ -83,14 +82,14 @@
}

.radio-card-message-title {
font-weight: font_variables.$font-weight-semibold;
font-weight: var(--token-typography-font-weight-semibold);
font-size: size_variables.$size-7;
margin-bottom: size_variables.$spacing-4;
}
.radio-card-message-body {
line-height: 1.2;
color: var(--token-color-foreground-faint);
font-size: size_variables.$size-8;
font-size: var(--token-typography-body-200-font-size);
}

.radio-card-radio-row {
Expand Down
2 changes: 1 addition & 1 deletion ui/app/styles/components/raft-join.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
}
.raft-join-unseal {
color: var(--token-color-palette-amber-200);
font-size: size_variables.$size-6;
font-size: var(--token-typography-body-300-font-size);
display: inline-block;
}
5 changes: 2 additions & 3 deletions ui/app/styles/components/regex-validator.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@use '../utils/font_variables';
@use '../utils/size_variables';

/**
Expand All @@ -17,8 +16,8 @@
flex: 0 1 auto;
}
.regex-group {
font-family: font_variables.$family-monospace;
font-size: size_variables.$size-8;
font-family: var(--token-typography-font-stack-code);
font-size: var(--token-typography-body-200-font-size);
color: var(--token-color-palette-neutral-500);
}
.regex-group-position {
Expand Down
5 changes: 2 additions & 3 deletions ui/app/styles/components/replication-dashboard.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@use '../utils/font_variables';
@use '../utils/mixins';
@use '../utils/size_variables';

Expand All @@ -23,7 +22,7 @@
}

.helper-text {
font-weight: font_variables.$font-weight-normal;
font-weight: var(--token-typography-font-weight-regular);
}

.title.is-6 {
Expand Down Expand Up @@ -60,7 +59,7 @@
grid-template-columns: 1fr 1fr;
grid-template-rows: 0.2fr 0.2fr 0.2fr;
padding: size_variables.$spacing-24;
line-height: 1.5;
line-height: var(--token-typography-body-300-line-height);

&.summary {
grid-template-rows: 0.2fr 1fr 0.2fr 1fr;
Expand Down
2 changes: 1 addition & 1 deletion ui/app/styles/components/replication-summary.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}

.helper-text {
font-weight: normal;
font-weight: var(--token-typography-font-weight-regular);
}

.float-right {
Expand Down
7 changes: 3 additions & 4 deletions ui/app/styles/components/search-select.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@use '../utils/box-shadow_variables';
@use '../utils/font_variables';
@use '../utils/size_variables';

/**
Expand Down Expand Up @@ -87,8 +86,8 @@

.ember-power-select-option--no-matches-message {
color: var(--token-color-palette-neutral-400);
font-size: size_variables.$size-8;
font-weight: font_variables.$font-weight-semibold;
font-size: var(--token-typography-body-200-font-size);
font-weight: var(--token-typography-font-weight-semibold);
text-transform: uppercase;

&:hover,
Expand Down Expand Up @@ -131,7 +130,7 @@

.search-select-list-key {
color: var(--token-color-foreground-faint);
font-size: size_variables.$size-8;
font-size: var(--token-typography-body-200-font-size);
}

.search-select .search-icon {
Expand Down
7 changes: 3 additions & 4 deletions ui/app/styles/components/sidebar.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@use '../utils/font_variables';
@use '../utils/size_variables';

/**
Expand All @@ -12,8 +11,8 @@
.popup-menu-content {
.menu-label {
color: hsl(0, 0%, 4%);
font-size: 14px;
font-weight: font_variables.$font-weight-bold;
font-size: var(--token-typography-body-200-font-size);
font-weight: var(--token-typography-font-weight-bold);
text-transform: unset;
}
.token-alert {
Expand All @@ -23,7 +22,7 @@

.confirm-action-message p {
padding-top: size_variables.$spacing-4;
font-weight: font_variables.$font-weight-semibold;
font-weight: var(--token-typography-font-weight-semibold);
color: hsl(0, 0%, 4%);
}
}
Loading
Loading