diff --git a/assets/fonts/nunito-sans/Nunito-Sans-Bold.eot b/assets/fonts/nunito-sans/Nunito-Sans-Bold.eot new file mode 100644 index 0000000000..0484ab2a1c Binary files /dev/null and b/assets/fonts/nunito-sans/Nunito-Sans-Bold.eot differ diff --git a/assets/fonts/nunito-sans/Nunito-Sans-Bold.ttf b/assets/fonts/nunito-sans/Nunito-Sans-Bold.ttf new file mode 100644 index 0000000000..2736009070 Binary files /dev/null and b/assets/fonts/nunito-sans/Nunito-Sans-Bold.ttf differ diff --git a/assets/fonts/nunito-sans/Nunito-Sans-Bold.woff b/assets/fonts/nunito-sans/Nunito-Sans-Bold.woff new file mode 100644 index 0000000000..6f344c1276 Binary files /dev/null and b/assets/fonts/nunito-sans/Nunito-Sans-Bold.woff differ diff --git a/assets/fonts/nunito-sans/Nunito-Sans-Regular.eot b/assets/fonts/nunito-sans/Nunito-Sans-Regular.eot new file mode 100644 index 0000000000..3b5df0baac Binary files /dev/null and b/assets/fonts/nunito-sans/Nunito-Sans-Regular.eot differ diff --git a/assets/fonts/nunito-sans/Nunito-Sans-Regular.ttf b/assets/fonts/nunito-sans/Nunito-Sans-Regular.ttf new file mode 100644 index 0000000000..242ae43c9a Binary files /dev/null and b/assets/fonts/nunito-sans/Nunito-Sans-Regular.ttf differ diff --git a/assets/fonts/nunito-sans/Nunito-Sans-Regular.woff b/assets/fonts/nunito-sans/Nunito-Sans-Regular.woff new file mode 100644 index 0000000000..fe5ef4cbc6 Binary files /dev/null and b/assets/fonts/nunito-sans/Nunito-Sans-Regular.woff differ diff --git a/assets/fonts/oxygen/Oxygen-Bold.eot b/assets/fonts/oxygen/Oxygen-Bold.eot deleted file mode 100644 index 13c06f158e..0000000000 Binary files a/assets/fonts/oxygen/Oxygen-Bold.eot and /dev/null differ diff --git a/assets/fonts/oxygen/Oxygen-Bold.ttf b/assets/fonts/oxygen/Oxygen-Bold.ttf deleted file mode 100644 index 835ab0536f..0000000000 Binary files a/assets/fonts/oxygen/Oxygen-Bold.ttf and /dev/null differ diff --git a/assets/fonts/oxygen/Oxygen-Bold.woff b/assets/fonts/oxygen/Oxygen-Bold.woff deleted file mode 100644 index 6208faa25b..0000000000 Binary files a/assets/fonts/oxygen/Oxygen-Bold.woff and /dev/null differ diff --git a/assets/fonts/oxygen/Oxygen-Light.eot b/assets/fonts/oxygen/Oxygen-Light.eot deleted file mode 100644 index 4cd85cc650..0000000000 Binary files a/assets/fonts/oxygen/Oxygen-Light.eot and /dev/null differ diff --git a/assets/fonts/oxygen/Oxygen-Light.ttf b/assets/fonts/oxygen/Oxygen-Light.ttf deleted file mode 100644 index 08b9fec300..0000000000 Binary files a/assets/fonts/oxygen/Oxygen-Light.ttf and /dev/null differ diff --git a/assets/fonts/oxygen/Oxygen-Light.woff b/assets/fonts/oxygen/Oxygen-Light.woff deleted file mode 100644 index bc0f9bdaf4..0000000000 Binary files a/assets/fonts/oxygen/Oxygen-Light.woff and /dev/null differ diff --git a/assets/fonts/oxygen/Oxygen-Regular.eot b/assets/fonts/oxygen/Oxygen-Regular.eot deleted file mode 100644 index 65dceb9cae..0000000000 Binary files a/assets/fonts/oxygen/Oxygen-Regular.eot and /dev/null differ diff --git a/assets/fonts/oxygen/Oxygen-Regular.ttf b/assets/fonts/oxygen/Oxygen-Regular.ttf deleted file mode 100644 index a66ddf1c88..0000000000 Binary files a/assets/fonts/oxygen/Oxygen-Regular.ttf and /dev/null differ diff --git a/assets/fonts/oxygen/Oxygen-Regular.woff b/assets/fonts/oxygen/Oxygen-Regular.woff deleted file mode 100644 index c38dc51398..0000000000 Binary files a/assets/fonts/oxygen/Oxygen-Regular.woff and /dev/null differ diff --git a/frontend/components/AuthenticationFormWrapper/_styles.scss b/frontend/components/AuthenticationFormWrapper/_styles.scss index cf61c3222e..dadefe0cdd 100644 --- a/frontend/components/AuthenticationFormWrapper/_styles.scss +++ b/frontend/components/AuthenticationFormWrapper/_styles.scss @@ -3,7 +3,7 @@ flex-direction: column; justify-content: center; flex-grow: 1; - padding: $base 0; + padding: $pad-base 0; &__logo { width: 160px; diff --git a/frontend/components/KolideAce/_styles.scss b/frontend/components/KolideAce/_styles.scss index d5b2baec36..fca8e40ea5 100644 --- a/frontend/components/KolideAce/_styles.scss +++ b/frontend/components/KolideAce/_styles.scss @@ -25,7 +25,7 @@ &__hint { font-size: 14px; - font-weight: $normal; + font-weight: $regular; line-height: 1.57; letter-spacing: 1px; color: $accent-text; diff --git a/frontend/components/UserBlock/_styles.scss b/frontend/components/UserBlock/_styles.scss index 85328efc2a..cdd1e6d1a3 100644 --- a/frontend/components/UserBlock/_styles.scss +++ b/frontend/components/UserBlock/_styles.scss @@ -57,8 +57,8 @@ padding: 0; text-transform: uppercase; letter-spacing: 1px; - font-weight: $light; - font-size: $base; + font-weight: $regular; + font-size: $medium; } &__details { @@ -104,7 +104,7 @@ transition: color 300ms ease-in-out; float: right; text-transform: uppercase; - font-weight: $light; + font-weight: $regular; font-size: $medium; letter-spacing: 1px; @@ -126,7 +126,7 @@ color: $text-medium; font-size: $medium; text-transform: uppercase; - line-height: $larger; + line-height: $x-large; margin: 0; letter-spacing: 1px; @@ -142,11 +142,11 @@ &__position { @include ellipsis; font-size: $small; - line-height: $larger; + line-height: $x-large; margin: 0; letter-spacing: 0.5px; color: $text-ultradark; - font-weight: $light; + font-weight: $regular; &--hidden { display: none; @@ -157,7 +157,7 @@ transition: color 300ms ease-in-out; color: $link; font-size: $small; - line-height: $larger; + line-height: $x-large; margin: 0; &--disabled { @@ -166,8 +166,8 @@ } &__last-seen { - font-size: $mini; - line-height: $larger; + font-size: $x-small; + line-height: $x-large; margin: 0; color: $text-medium; } diff --git a/frontend/components/WarningBanner/_styles.scss b/frontend/components/WarningBanner/_styles.scss index 6c3cb0c590..8782d3f6ef 100644 --- a/frontend/components/WarningBanner/_styles.scss +++ b/frontend/components/WarningBanner/_styles.scss @@ -29,7 +29,7 @@ color: $white; font-size: 15px; text-decoration: underline; - font-weight: $light; + font-weight: $regular; letter-spacing: 0.6px; margin-left: 15px; } diff --git a/frontend/components/buttons/Button/_styles.scss b/frontend/components/buttons/Button/_styles.scss index 36b3d7fefb..fdf717e8f2 100644 --- a/frontend/components/buttons/Button/_styles.scss +++ b/frontend/components/buttons/Button/_styles.scss @@ -39,7 +39,7 @@ $base-class: 'button'; letter-spacing: 1px; border-radius: 0; font-size: $medium; - font-family: 'Oxygen', $helvetica; + font-family: 'Nunito Sans', sans-serif; font-weight: $bold; display: inline-block; padding: 0 $pad-large; @@ -130,7 +130,7 @@ $base-class: 'button'; background-image: linear-gradient(134deg, $gradient-start 0%, $gradient-end 0%); color: $white; font-size: $large; - font-weight: $light; + font-weight: $regular; letter-spacing: 4px; padding: $medium; width: 100%; diff --git a/frontend/components/buttons/DropdownButton/_styles.scss b/frontend/components/buttons/DropdownButton/_styles.scss index 36179944f8..9195202706 100644 --- a/frontend/components/buttons/DropdownButton/_styles.scss +++ b/frontend/components/buttons/DropdownButton/_styles.scss @@ -35,7 +35,7 @@ color: $text-dark; text-transform: none; text-align: left; - font-weight: $normal; + font-weight: $regular; margin: 0; border-radius: 0; padding: 0 10px; diff --git a/frontend/components/forms/FormField/_styles.scss b/frontend/components/forms/FormField/_styles.scss index 3cf97aef0e..65c67af6e2 100644 --- a/frontend/components/forms/FormField/_styles.scss +++ b/frontend/components/forms/FormField/_styles.scss @@ -18,7 +18,7 @@ &__hint { font-size: 14px; - font-weight: $normal; + font-weight: $regular; line-height: 1.57; letter-spacing: 1px; color: $accent-text; diff --git a/frontend/components/forms/InviteUserForm/_styles.scss b/frontend/components/forms/InviteUserForm/_styles.scss index 445de545e7..73c0c115bd 100644 --- a/frontend/components/forms/InviteUserForm/_styles.scss +++ b/frontend/components/forms/InviteUserForm/_styles.scss @@ -7,7 +7,7 @@ &__label { font-size: 16px; - font-weight: $normal; + font-weight: $regular; letter-spacing: 1px; color: $text-dark; padding-left: 32px; diff --git a/frontend/components/forms/LabelForm/_styles.scss b/frontend/components/forms/LabelForm/_styles.scss index 5c0bb0fda1..a7f7422cea 100644 --- a/frontend/components/forms/LabelForm/_styles.scss +++ b/frontend/components/forms/LabelForm/_styles.scss @@ -1,6 +1,6 @@ .label-form { &__wrapper { - padding: $base; + padding: $pad-base; } &__label-title, @@ -23,11 +23,11 @@ &__save-btn, &__cancel-btn { - margin-right: $xsmall; + margin-right: $pad-xsmall; } &__text-editor-wrapper { - margin: $base 0; + margin: $pad-base 0; } } diff --git a/frontend/components/forms/LoginForm/_styles.scss b/frontend/components/forms/LoginForm/_styles.scss index 61ccf7c7c2..15ef24f1c1 100644 --- a/frontend/components/forms/LoginForm/_styles.scss +++ b/frontend/components/forms/LoginForm/_styles.scss @@ -22,19 +22,19 @@ padding: 30px; width: 460px; min-height: 350px; - font-weight: $light; + font-weight: $regular; } &__submit-btn { border-radius: 2px; - padding: $base; + padding: $pad-base; width: 460px; } &__sso-btn { border-top-left-radius: 0; border-top-right-radius: 0; - padding: $base; + padding: $pad-base; width: 460px; height: 72px; } diff --git a/frontend/components/forms/RegistrationForm/ConfirmationPage/_styles.scss b/frontend/components/forms/RegistrationForm/ConfirmationPage/_styles.scss index 7e6e68f5b1..2265c9a29a 100644 --- a/frontend/components/forms/RegistrationForm/ConfirmationPage/_styles.scss +++ b/frontend/components/forms/RegistrationForm/ConfirmationPage/_styles.scss @@ -51,7 +51,7 @@ td { font-size: 14px; - font-weight: $light; + font-weight: $regular; line-height: 1.71; letter-spacing: 0.5px; color: $text-dark; @@ -67,7 +67,7 @@ &__import { user-select: none; font-size: 14px; - font-weight: $light; + font-weight: $regular; line-height: 1.71; letter-spacing: 0.5px; color: $text-dark; diff --git a/frontend/components/forms/RegistrationForm/_styles.scss b/frontend/components/forms/RegistrationForm/_styles.scss index 94620ee10f..c1992f5de9 100644 --- a/frontend/components/forms/RegistrationForm/_styles.scss +++ b/frontend/components/forms/RegistrationForm/_styles.scss @@ -118,7 +118,7 @@ &__description { font-size: 14px; - font-weight: $light; + font-weight: $regular; line-height: 1.43; letter-spacing: 0.5px; color: $text-dark; diff --git a/frontend/components/forms/admin/AppConfigForm/_styles.scss b/frontend/components/forms/admin/AppConfigForm/_styles.scss index d3a7e39ce5..f07f53e2a2 100644 --- a/frontend/components/forms/admin/AppConfigForm/_styles.scss +++ b/frontend/components/forms/admin/AppConfigForm/_styles.scss @@ -5,7 +5,7 @@ button { color: $link; font-size: 15px; - font-weight: $normal; + font-weight: $regular; float: right; height: 23px; letter-spacing: -0.5px; @@ -84,7 +84,7 @@ p { font-size: 15px; - font-weight: $normal; + font-weight: $regular; line-height: 1.6; letter-spacing: 0.5px; color: $text-dark; @@ -162,7 +162,7 @@ .slide-wrapper { .slider-option { font-size: 18px; - font-weight: $light; + font-weight: $regular; letter-spacing: 1.3px; text-align: left; vertical-align: text-bottom; diff --git a/frontend/components/forms/admin/EditUserForm/_styles.scss b/frontend/components/forms/admin/EditUserForm/_styles.scss index b235820b51..93f3db403a 100644 --- a/frontend/components/forms/admin/EditUserForm/_styles.scss +++ b/frontend/components/forms/admin/EditUserForm/_styles.scss @@ -25,7 +25,7 @@ } &__form-btn { - padding: inherit $base; + padding: inherit $pad-base; &--submit { float: right; diff --git a/frontend/components/forms/admin/OsqueryOptionsForm/_styles.scss b/frontend/components/forms/admin/OsqueryOptionsForm/_styles.scss index 3797522db2..54e7afdc93 100644 --- a/frontend/components/forms/admin/OsqueryOptionsForm/_styles.scss +++ b/frontend/components/forms/admin/OsqueryOptionsForm/_styles.scss @@ -26,7 +26,7 @@ } &__text-editor-wrapper { - margin: $base 0; + margin: $pad-base 0; width: 100%; } } diff --git a/frontend/components/forms/fields/Checkbox/_styles.scss b/frontend/components/forms/fields/Checkbox/_styles.scss index c79da065c7..04d3e7f523 100644 --- a/frontend/components/forms/fields/Checkbox/_styles.scss +++ b/frontend/components/forms/fields/Checkbox/_styles.scss @@ -58,7 +58,7 @@ &__label { font-size: 13px; - font-weight: $normal; + font-weight: $regular; line-height: 20px; letter-spacing: 0.5px; color: $text-medium; diff --git a/frontend/components/forms/fields/Dropdown/_styles.scss b/frontend/components/forms/fields/Dropdown/_styles.scss index 0fca4ef061..ec602a6a63 100644 --- a/frontend/components/forms/fields/Dropdown/_styles.scss +++ b/frontend/components/forms/fields/Dropdown/_styles.scss @@ -2,7 +2,7 @@ &__label { display: block; font-size: 16px; - font-weight: $light; + font-weight: $regular; color: $text-dark; margin-bottom: $pad-xsmall; @@ -74,7 +74,7 @@ .Select-value-label { font-size: 16px; - font-weight: $normal; + font-weight: $regular; color: $text-dark; line-height: 28px; } diff --git a/frontend/components/forms/fields/InputField/_styles.scss b/frontend/components/forms/fields/InputField/_styles.scss index 4735a60592..bdb4e71d9f 100644 --- a/frontend/components/forms/fields/InputField/_styles.scss +++ b/frontend/components/forms/fields/InputField/_styles.scss @@ -6,7 +6,7 @@ font-size: 16px; padding: $pad-xsmall 12px; color: $text-dark; - font-family: 'Oxygen', sans-serif; + font-family: 'Nunito Sans', sans-serif; box-sizing: border-box; height: 40px; @@ -52,8 +52,8 @@ &__label { display: block; - font-size: $base; - font-weight: $light; + font-size: $medium; + font-weight: $regular; color: $text-dark; margin-bottom: $pad-xsmall; @@ -68,7 +68,7 @@ &__hint { font-size: 14px; - font-weight: $normal; + font-weight: $regular; line-height: 1.57; letter-spacing: 1px; color: $accent-text; diff --git a/frontend/components/forms/fields/InputFieldWithIcon/_styles.scss b/frontend/components/forms/fields/InputFieldWithIcon/_styles.scss index 45c7011b75..ab7c1f1a34 100644 --- a/frontend/components/forms/fields/InputFieldWithIcon/_styles.scss +++ b/frontend/components/forms/fields/InputFieldWithIcon/_styles.scss @@ -29,7 +29,7 @@ width: 100%; box-sizing: border-box; color: $text-dark; - font-weight: $light; + font-weight: $regular; ::placeholder { color: $accent-text; @@ -66,7 +66,7 @@ &__hint { font-size: 14px; - font-weight: $normal; + font-weight: $regular; line-height: 1.57; letter-spacing: 1px; color: $accent-text; diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/_styles.scss b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/_styles.scss index 2ac4dbed79..69704f6e47 100644 --- a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/_styles.scss +++ b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/_styles.scss @@ -1,12 +1,12 @@ .target-list { &__type { background-color: $bg-medium; - line-height: $larger; - padding: 0 $base; + line-height: $x-large; + padding: 0 $pad-base; margin: 0; text-transform: uppercase; - font-weight: $light; - font-size: $mini; + font-weight: $regular; + font-size: $x-small; color: $text-dark; letter-spacing: 0.5px; } diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/TargetDetails/_styles.scss b/frontend/components/forms/fields/SelectTargetsDropdown/TargetDetails/_styles.scss index 793f772d16..9115c02f1f 100644 --- a/frontend/components/forms/fields/SelectTargetsDropdown/TargetDetails/_styles.scss +++ b/frontend/components/forms/fields/SelectTargetsDropdown/TargetDetails/_styles.scss @@ -4,7 +4,7 @@ &__back { color: $text-dark; - font-size: $xsmall; + font-size: $xx-small; display: none; @include breakpoint(ltdesktop) { @@ -80,7 +80,7 @@ &__labels-list { font-size: $small; - font-weight: $normal; + font-weight: $regular; line-height: 1.85; letter-spacing: 0.5px; color: $text-medium; @@ -133,7 +133,7 @@ margin: $pad-xsmall 0; letter-spacing: 0.4px; font-size: $small; - font-weight: $normal; + font-weight: $regular; } &__hosts-count { @@ -155,7 +155,7 @@ &__description { font-size: $pad-medium; - font-weight: $normal; + font-weight: $regular; line-height: 1.71; color: $text-dark; margin: 0 0 $pad-small; diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/_styles.scss b/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/_styles.scss index e8c0a95deb..edae464e0f 100644 --- a/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/_styles.scss +++ b/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/_styles.scss @@ -18,7 +18,7 @@ &__add-btn { line-height: 34px; font-size: $small; - font-weight: $normal; + font-weight: $regular; text-transform: none; padding: 0 $pad-half; } @@ -26,7 +26,7 @@ &__add-btn { transition: color 0ms; color: $success; - font-size: $base; + font-size: $medium; } &__target-content { @@ -74,7 +74,7 @@ &__label-host { color: $link; - font-size: $base; + font-size: $medium; margin-left: $pad-half; } @@ -96,7 +96,7 @@ } &__target-icon { - font-size: $base; + font-size: $medium; color: $text-medium; margin-right: $pad-xsmall; } diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/_styles.scss b/frontend/components/forms/fields/SelectTargetsDropdown/_styles.scss index 480950253c..26847028bc 100644 --- a/frontend/components/forms/fields/SelectTargetsDropdown/_styles.scss +++ b/frontend/components/forms/fields/SelectTargetsDropdown/_styles.scss @@ -25,7 +25,7 @@ &__targets-count { font-size: $small; - margin-left: $xsmall; + margin-left: $pad-xsmall; color: $brand; } @@ -195,7 +195,7 @@ .Select-value-label { font-size: 16px; - font-weight: $normal; + font-weight: $regular; color: $text-dark; padding: 0 0 0 $pad-medium; line-height: 34px; diff --git a/frontend/components/forms/fields/Slider/_styles.scss b/frontend/components/forms/fields/Slider/_styles.scss index 68a88cc3b6..6fdeeebc84 100644 --- a/frontend/components/forms/fields/Slider/_styles.scss +++ b/frontend/components/forms/fields/Slider/_styles.scss @@ -47,7 +47,7 @@ &__label { font-size: 18px; - font-weight: $light; + font-weight: $regular; letter-spacing: 1.3px; text-align: left; vertical-align: text-bottom; diff --git a/frontend/components/forms/queries/QueryForm/_styles.scss b/frontend/components/forms/queries/QueryForm/_styles.scss index 51a86b90cd..d0f9b23063 100644 --- a/frontend/components/forms/queries/QueryForm/_styles.scss +++ b/frontend/components/forms/queries/QueryForm/_styles.scss @@ -1,6 +1,6 @@ .query-form { &__wrapper { - padding: $base; + padding: $pad-base; h1 { margin-bottom: 19px; @@ -27,11 +27,11 @@ &__save-query-btn, &__cancel-btn { - margin-right: $xsmall; + margin-right: $pad-xsmall; } &__text-editor-wrapper { - margin: $base 0; + margin: $pad-base 0; } &__title { diff --git a/frontend/components/hosts/AddHostModal/_styles.scss b/frontend/components/hosts/AddHostModal/_styles.scss index b17f009bd3..2ea6a2ed4d 100644 --- a/frontend/components/hosts/AddHostModal/_styles.scss +++ b/frontend/components/hosts/AddHostModal/_styles.scss @@ -21,7 +21,7 @@ h3 { font-size: 15px; - font-weight: $normal; + font-weight: $regular; line-height: 1.6; letter-spacing: normal; color: rgba(32, 37, 50, 0.48); @@ -63,7 +63,7 @@ p { font-size: 15px; - font-weight: $normal; + font-weight: $regular; line-height: 1.6; letter-spacing: normal; color: rgba(32, 37, 50, 0.66); diff --git a/frontend/components/hosts/HostContainer/_styles.scss b/frontend/components/hosts/HostContainer/_styles.scss index dd42a12664..a75da113b5 100644 --- a/frontend/components/hosts/HostContainer/_styles.scss +++ b/frontend/components/hosts/HostContainer/_styles.scss @@ -3,14 +3,14 @@ width: 440px; margin: 35px auto; font-size: 15px; - font-weight: $normal; + font-weight: $regular; line-height: 2; letter-spacing: normal; color: rgba(32, 37, 50, 0.66); h1 { font-size: 32px; - font-weight: $normal; + font-weight: $regular; line-height: normal; letter-spacing: normal; color: #48c586; diff --git a/frontend/components/hosts/HostPagination/_style.scss b/frontend/components/hosts/HostPagination/_style.scss index c4917e40f4..c37d9dc83a 100644 --- a/frontend/components/hosts/HostPagination/_style.scss +++ b/frontend/components/hosts/HostPagination/_style.scss @@ -9,7 +9,7 @@ &__pagination { margin: 0 25px 0 0; padding: 0; - font-family: 'Oxygen', 'Helvetica Neue', 'Helvetica', 'Roboto', 'Arial', sans-serif; + font-family: 'Nunito Sans', sans-serif; .rc-pagination-prev, .rc-pagination-next, diff --git a/frontend/components/hosts/LonelyHost/_styles.scss b/frontend/components/hosts/LonelyHost/_styles.scss index 576ee9152a..0e15a39c1c 100644 --- a/frontend/components/hosts/LonelyHost/_styles.scss +++ b/frontend/components/hosts/LonelyHost/_styles.scss @@ -50,7 +50,7 @@ h1 { font-size: 28px; - font-weight: $normal; + font-weight: $regular; color: #27d77e; padding-left: 5px; } diff --git a/frontend/components/modals/Modal/_styles.scss b/frontend/components/modals/Modal/_styles.scss index 9af026e49d..d60de9649a 100644 --- a/frontend/components/modals/Modal/_styles.scss +++ b/frontend/components/modals/Modal/_styles.scss @@ -23,7 +23,7 @@ @include size(30px); line-height: 30px; color: $text-medium; - font-size: $larger; + font-size: $x-large; &:hover { color: $alert-light; @@ -33,7 +33,7 @@ &__header { font-size: 24px; - font-weight: $normal; + font-weight: $regular; line-height: normal; letter-spacing: -0.5px; text-align: left; diff --git a/frontend/components/packs/EditPackFormWrapper/_styles.scss b/frontend/components/packs/EditPackFormWrapper/_styles.scss index 37a006995b..9cdfb87038 100644 --- a/frontend/components/packs/EditPackFormWrapper/_styles.scss +++ b/frontend/components/packs/EditPackFormWrapper/_styles.scss @@ -13,7 +13,7 @@ &__description { font-size: 15px; - font-weight: $normal; + font-weight: $regular; line-height: 2; color: $text-medium; max-width: 800px; diff --git a/frontend/components/packs/PacksList/Row/_styles.scss b/frontend/components/packs/PacksList/Row/_styles.scss index 953f109ca1..3173c6f3b9 100644 --- a/frontend/components/packs/PacksList/Row/_styles.scss +++ b/frontend/components/packs/PacksList/Row/_styles.scss @@ -49,7 +49,7 @@ &__status-text { color: $text-ultradark; - font-weight: $normal; + font-weight: $regular; margin-left: 10px; @include breakpoint(smalldesk) { diff --git a/frontend/components/queries/QueryPageSelectTargets/_styles.scss b/frontend/components/queries/QueryPageSelectTargets/_styles.scss index 49b05942d4..0d8fee9765 100644 --- a/frontend/components/queries/QueryPageSelectTargets/_styles.scss +++ b/frontend/components/queries/QueryPageSelectTargets/_styles.scss @@ -1,5 +1,5 @@ .query-page-select-targets { &__wrapper { - padding: $base; + padding: $pad-base; } } diff --git a/frontend/components/queries/ScheduledQueriesList/_styles.scss b/frontend/components/queries/ScheduledQueriesList/_styles.scss index 9b0b547220..2592d62fa7 100644 --- a/frontend/components/queries/ScheduledQueriesList/_styles.scss +++ b/frontend/components/queries/ScheduledQueriesList/_styles.scss @@ -83,7 +83,7 @@ &:nth-child(3) { font-size: 14px; - font-weight: $normal; + font-weight: $regular; line-height: 2.71; letter-spacing: -0.5px; color: $text-ultradark; @@ -93,7 +93,7 @@ &:nth-child(5), &:nth-child(6) { font-size: 14px; - font-weight: $normal; + font-weight: $regular; line-height: 2.71; letter-spacing: -0.5px; text-align: center; @@ -124,7 +124,7 @@ h1 { color: $text-dark; font-size: 24px; - font-weight: $light; + font-weight: $regular; line-height: 1.96; letter-spacing: -0.5px; margin: 0; @@ -135,13 +135,13 @@ line-height: 2; letter-spacing: -0.4px; color: $text-dark; - font-weight: $light; + font-weight: $regular; margin: 0; } p { font-size: 16px; - font-weight: $normal; + font-weight: $regular; line-height: 2.5; color: $text-dark; margin: 0; @@ -156,7 +156,7 @@ li { margin-left: 15px; font-size: 16px; - font-weight: $normal; + font-weight: $regular; line-height: 2.5; color: $text-dark; } diff --git a/frontend/components/queries/ScheduledQueriesListWrapper/_styles.scss b/frontend/components/queries/ScheduledQueriesListWrapper/_styles.scss index 0dd7924b59..0ad4cfa680 100644 --- a/frontend/components/queries/ScheduledQueriesListWrapper/_styles.scss +++ b/frontend/components/queries/ScheduledQueriesListWrapper/_styles.scss @@ -1,7 +1,7 @@ .scheduled-queries-list-wrapper { flex-grow: 1; padding: $pad-small $pad-base; - margin-bottom: $base; + margin-bottom: $pad-base; &__query-count { margin: 0 0 15px; diff --git a/frontend/components/side_panels/HostSidePanel/PanelGroupItem/_styles.scss b/frontend/components/side_panels/HostSidePanel/PanelGroupItem/_styles.scss index 0a0f21760b..bb042b84ca 100644 --- a/frontend/components/side_panels/HostSidePanel/PanelGroupItem/_styles.scss +++ b/frontend/components/side_panels/HostSidePanel/PanelGroupItem/_styles.scss @@ -28,7 +28,7 @@ $base-class: 'panel-group-item'; font-size: 16px; line-height: 2.25; letter-spacing: 0.5px; - font-weight: $normal; + font-weight: $regular; color: $text-medium; text-align: left; padding: 0 $pad-large; diff --git a/frontend/components/side_panels/HostSidePanel/_styles.scss b/frontend/components/side_panels/HostSidePanel/_styles.scss index c91211f342..703303c324 100644 --- a/frontend/components/side_panels/HostSidePanel/_styles.scss +++ b/frontend/components/side_panels/HostSidePanel/_styles.scss @@ -1,7 +1,7 @@ .host-side-panel { &__add-label-btn { color: $success; - font-weight: $normal; + font-weight: $regular; line-height: 2.25; letter-spacing: 0.5px; padding: 0 30px; @@ -84,7 +84,7 @@ span { font-size: 16px; - font-weight: $normal; + font-weight: $regular; line-height: normal; letter-spacing: -0.5px; color: $link; diff --git a/frontend/components/side_panels/PackInfoSidePanel/_styles.scss b/frontend/components/side_panels/PackInfoSidePanel/_styles.scss index 838124499c..7ec950ca0b 100644 --- a/frontend/components/side_panels/PackInfoSidePanel/_styles.scss +++ b/frontend/components/side_panels/PackInfoSidePanel/_styles.scss @@ -8,7 +8,7 @@ &__title { font-size: 18px; - font-weight: $normal; + font-weight: $regular; letter-spacing: 0.7px; color: $text-dark; border-bottom: 1px solid $accent-light; diff --git a/frontend/components/side_panels/QueryDetailsSidePanel/_styles.scss b/frontend/components/side_panels/QueryDetailsSidePanel/_styles.scss index bafc5b01a4..17f8121a2f 100644 --- a/frontend/components/side_panels/QueryDetailsSidePanel/_styles.scss +++ b/frontend/components/side_panels/QueryDetailsSidePanel/_styles.scss @@ -25,7 +25,7 @@ p { font-size: 14px; - font-weight: $normal; + font-weight: $regular; line-height: 1.71; color: $text-medium; } diff --git a/frontend/components/side_panels/ScheduleQuerySidePanel/SearchPackQuery/_styles.scss b/frontend/components/side_panels/ScheduleQuerySidePanel/SearchPackQuery/_styles.scss index 18211ea183..a3c37c01f1 100644 --- a/frontend/components/side_panels/ScheduleQuerySidePanel/SearchPackQuery/_styles.scss +++ b/frontend/components/side_panels/ScheduleQuerySidePanel/SearchPackQuery/_styles.scss @@ -33,7 +33,7 @@ p { margin: 0 0 10px; font-size: 14px; - font-weight: $normal; + font-weight: $regular; line-height: 1.71; color: $text-medium; } diff --git a/frontend/components/side_panels/SiteNavHeader/_styles.scss b/frontend/components/side_panels/SiteNavHeader/_styles.scss index d512a0239e..c118cf4ad8 100644 --- a/frontend/components/side_panels/SiteNavHeader/_styles.scss +++ b/frontend/components/side_panels/SiteNavHeader/_styles.scss @@ -128,7 +128,7 @@ height: 0; width: 239px; position: absolute; - left: $base; + left: $pad-base; padding: 0; z-index: 2; overflow: hidden; @@ -166,7 +166,7 @@ } &__position { - font-weight: $normal; + font-weight: $regular; color: rgba(255, 255, 255, 0.6); em { @@ -186,7 +186,7 @@ &__nav-item { font-size: 15px; - font-weight: $normal; + font-weight: $regular; letter-spacing: 0.5px; padding: 14px 0; diff --git a/frontend/components/side_panels/SiteNavSidePanel/_styles.scss b/frontend/components/side_panels/SiteNavSidePanel/_styles.scss index 08e3113257..88302d8cf2 100644 --- a/frontend/components/side_panels/SiteNavSidePanel/_styles.scss +++ b/frontend/components/side_panels/SiteNavSidePanel/_styles.scss @@ -26,7 +26,7 @@ &__name { text-decoration: none; vertical-align: middle; - font-weight: $normal; + font-weight: $regular; font-size: 14px; @at-root .site-nav--small & { @@ -190,7 +190,7 @@ cursor: pointer; padding: 9px 0 9px 60px; font-size: 13px; - font-weight: $light; + font-weight: $regular; width: 100%; text-align: left; diff --git a/frontend/pages/ConfirmInvitePage/_styles.scss b/frontend/pages/ConfirmInvitePage/_styles.scss index 8dc3719c25..90f737ea4b 100644 --- a/frontend/pages/ConfirmInvitePage/_styles.scss +++ b/frontend/pages/ConfirmInvitePage/_styles.scss @@ -13,7 +13,7 @@ p { color: $text-dark; font-size: 14px; - font-weight: $light; + font-weight: $regular; } } @@ -54,7 +54,7 @@ &__lead-text { color: $brand; font-size: 18px; - font-weight: $light; + font-weight: $regular; margin-top: 0; text-align: center; } @@ -62,7 +62,7 @@ &__sub-lead-text { color: $text-dark; font-size: 14px; - font-weight: $light; + font-weight: $regular; margin-bottom: 0; } } diff --git a/frontend/pages/ConfirmSSOInvitePage/_styles.scss b/frontend/pages/ConfirmSSOInvitePage/_styles.scss index 2188514507..8fba12750a 100644 --- a/frontend/pages/ConfirmSSOInvitePage/_styles.scss +++ b/frontend/pages/ConfirmSSOInvitePage/_styles.scss @@ -14,7 +14,7 @@ p { color: $text-dark; font-size: 14px; - font-weight: $light; + font-weight: $regular; } } @@ -55,7 +55,7 @@ &__lead-text { color: $brand; font-size: 18px; - font-weight: $light; + font-weight: $regular; margin-top: 0; text-align: center; } @@ -63,7 +63,7 @@ &__sub-lead-text { color: $text-dark; font-size: 14px; - font-weight: $light; + font-weight: $regular; margin-bottom: 0; } } diff --git a/frontend/pages/RegistrationPage/Breadcrumbs/_styles.scss b/frontend/pages/RegistrationPage/Breadcrumbs/_styles.scss index 672fff75d2..cb40b38a5e 100644 --- a/frontend/pages/RegistrationPage/Breadcrumbs/_styles.scss +++ b/frontend/pages/RegistrationPage/Breadcrumbs/_styles.scss @@ -14,7 +14,7 @@ text-align: center; width: 145px; font-size: 14px; - font-weight: $normal; + font-weight: $regular; line-height: 1.53; letter-spacing: 0.5px; color: $text-medium; diff --git a/frontend/pages/UserSettingsPage/_styles.scss b/frontend/pages/UserSettingsPage/_styles.scss index 1eabcf45d5..e946efdb5e 100644 --- a/frontend/pages/UserSettingsPage/_styles.scss +++ b/frontend/pages/UserSettingsPage/_styles.scss @@ -76,7 +76,7 @@ &__secret-label { font-size: 15px; - font-weight: $normal; + font-weight: $regular; line-height: 1.6; letter-spacing: normal; color: rgba(32, 37, 50, 0.66); diff --git a/frontend/pages/admin/AppSettingsPage/_styles.scss b/frontend/pages/admin/AppSettingsPage/_styles.scss index adeade8cbf..0e18dbcc5e 100644 --- a/frontend/pages/admin/AppSettingsPage/_styles.scss +++ b/frontend/pages/admin/AppSettingsPage/_styles.scss @@ -7,7 +7,7 @@ h2 { font-size: 20px; - font-weight: $normal; + font-weight: $regular; line-height: 2.4; letter-spacing: 0.8px; color: $text-dark; @@ -26,7 +26,7 @@ small { font-size: 15px; - font-weight: $normal; + font-weight: $regular; line-height: 1.6; letter-spacing: 0.5px; color: $text-dark; diff --git a/frontend/pages/admin/OsqueryOptionsPage/_styles.scss b/frontend/pages/admin/OsqueryOptionsPage/_styles.scss index f5e0b0a3ac..1e11bd8568 100644 --- a/frontend/pages/admin/OsqueryOptionsPage/_styles.scss +++ b/frontend/pages/admin/OsqueryOptionsPage/_styles.scss @@ -19,7 +19,7 @@ p { font-size: 15px; - font-weight: $normal; + font-weight: $regular; line-height: 1.6; letter-spacing: 0.5px; color: $text-dark; diff --git a/frontend/pages/hosts/ManageHostsPage/_styles.scss b/frontend/pages/hosts/ManageHostsPage/_styles.scss index f687ceb101..00f6556e7d 100644 --- a/frontend/pages/hosts/ManageHostsPage/_styles.scss +++ b/frontend/pages/hosts/ManageHostsPage/_styles.scss @@ -50,7 +50,7 @@ h2 { text-transform: uppercase; color: $text-dark; - font-weight: $light; + font-weight: $regular; font-size: 16px; } @@ -71,7 +71,7 @@ &__host-count { flex-grow: 1; font-size: 14px; - font-weight: $light; + font-weight: $regular; letter-spacing: 0.9px; color: $text-dark; margin: 0; diff --git a/frontend/pages/packs/AllPacksPage/_styles.scss b/frontend/pages/packs/AllPacksPage/_styles.scss index 53e26bfe11..fd3e92273d 100644 --- a/frontend/pages/packs/AllPacksPage/_styles.scss +++ b/frontend/pages/packs/AllPacksPage/_styles.scss @@ -2,7 +2,7 @@ &__bulk-action-btn { color: $link; font-size: 15px; - font-weight: $normal; + font-weight: $regular; margin-left: 26px; &--disable { @@ -50,7 +50,7 @@ } &__wrapper { - padding: $base; + padding: $pad-base; min-height: 90vh; } diff --git a/frontend/pages/queries/ManageQueriesPage/_styles.scss b/frontend/pages/queries/ManageQueriesPage/_styles.scss index d178d71ae7..fbbc65f070 100644 --- a/frontend/pages/queries/ManageQueriesPage/_styles.scss +++ b/frontend/pages/queries/ManageQueriesPage/_styles.scss @@ -1,7 +1,7 @@ .manage-queries-page { &__delete-queries-btn { font-size: 15px; - font-weight: $normal; + font-weight: $regular; } &__ctas { @@ -55,7 +55,7 @@ } &__wrapper { - padding: $base; + padding: $pad-base; min-height: 90vh; } diff --git a/frontend/styles/global/_fonts.scss b/frontend/styles/global/_fonts.scss index 1e2f56c947..b47d7343ca 100644 --- a/frontend/styles/global/_fonts.scss +++ b/frontend/styles/global/_fonts.scss @@ -1,31 +1,22 @@ @font-face { - font-family: 'Oxygen'; - src: url('../assets/fonts/oxygen/Oxygen-Light.eot'); - src: url('../assets/fonts/oxygen/Oxygen-Light.eot?#iefix') format('embedded-opentype'), - url('../assets/fonts/oxygen/Oxygen-Light.woff') format('woff'), - url('../assets/fonts/oxygen/Oxygen-Light.ttf') format('truetype'); - font-weight: 300; + font-family: 'Nunito Sans'; font-style: normal; + font-weight: 400; + src: url('../assets/fonts/nunito-sans/Nunito-Sans-Bold.eot'); + src: local(''), + url('../assets/fonts/nunito-sans/Nunito-Sans-Regular.eot?#iefix') format('embedded-opentype'), + url('../assets/fonts/nunito-sans/Nunito-Sans-Regular.woff') format('woff'), + url('../assets/fonts/nunito-sans/Nunito-Sans-Regular.ttf') format('truetype'), } - @font-face { - font-family: 'Oxygen'; - src: url('../assets/fonts/oxygen/Oxygen-Bold.eot'); - src: url('../assets/fonts/oxygen/Oxygen-Bold.eot?#iefix') format('embedded-opentype'), - url('../assets/fonts/oxygen/Oxygen-Bold.woff') format('woff'), - url('../assets/fonts/oxygen/Oxygen-Bold.ttf') format('truetype'); - font-weight: bold; - font-style: normal; -} - -@font-face { - font-family: 'Oxygen'; - src: url('../assets/fonts/oxygen/Oxygen-Regular.eot'); - src: url('../assets/fonts/oxygen/Oxygen-Regular.eot?#iefix') format('embedded-opentype'), - url('../assets/fonts/oxygen/Oxygen-Regular.woff') format('woff'), - url('../assets/fonts/oxygen/Oxygen-Regular.ttf') format('truetype'); - font-weight: normal; + font-family: 'Nunito Sans'; font-style: normal; + font-weight: 700; + src: url('../assets/fonts/nunito-sans/Nunito-Sans-Bold.eot'); + src: local(''), + url('../assets/fonts/nunito-sans/Nunito-Sans-Bold.eot?#iefix') format('embedded-opentype'), + url('../assets/fonts/nunito-sans/Nunito-Sans-Bold.woff') format('woff'), + url('../assets/fonts/nunito-sans/Nunito-Sans-Bold.ttf') format('truetype'), } @font-face { @@ -43,7 +34,8 @@ url('../assets/fonts/source-code-pro/SourceCodePro-Regular.ttf.woff') format('woff'), url('../assets/fonts/source-code-pro/SourceCodePro-Regular.ttf') format('truetype'); font-weight: normal; - font-style: normal; } + font-style: normal; +} body { -webkit-font-smoothing: antialiased; diff --git a/frontend/styles/global/_global.scss b/frontend/styles/global/_global.scss index ecbffe1840..c67e052452 100644 --- a/frontend/styles/global/_global.scss +++ b/frontend/styles/global/_global.scss @@ -11,8 +11,8 @@ body { color: $text-ultradark; padding: 0; margin: 0; - font-family: 'Oxygen', sans-serif; - font-size: $base; + font-family: 'Nunito Sans', sans-serif; + font-size: $medium; line-height: 1.6; min-width: $medium-width; height: 100%; @@ -36,7 +36,7 @@ h3 { h1 { font-size: 24px; - font-weight: $light; + font-weight: $regular; letter-spacing: -0.5px; color: $text-dark; margin: 0; @@ -108,7 +108,7 @@ a { input, textarea, button { - font-family: 'Oxygen', sans-serif; + font-family: 'Nunito Sans', sans-serif; &:-webkit-autofill { -webkit-box-shadow: 0 0 0 1000px #fff inset; diff --git a/frontend/styles/var/fonts.scss b/frontend/styles/var/fonts.scss index e2f9c0043e..737de25c06 100644 --- a/frontend/styles/var/fonts.scss +++ b/frontend/styles/var/fonts.scss @@ -1,11 +1,9 @@ -$xsmall: px-to-rem(10); -$mini: px-to-rem(12); -$small: px-to-rem(14); -$medium: px-to-rem(16); -$base: px-to-rem(18); +$xx-small: px-to-rem(12); +$x-small: px-to-rem(14); +$small: px-to-rem(16); +$medium: px-to-rem(20); $large: px-to-rem(24); -$larger: px-to-rem(32); +$x-large: px-to-rem(28); -$light: 300; -$normal: 400; -$bold: 600; +$regular: 400; +$bold: 700; diff --git a/server/mail/templates/change_email_confirmation.html b/server/mail/templates/change_email_confirmation.html index d7cedfaf6b..45001ec793 100644 --- a/server/mail/templates/change_email_confirmation.html +++ b/server/mail/templates/change_email_confirmation.html @@ -1,10 +1,11 @@ - + + - +
- -
+
+

Change Confirmation

Hello,

This message is to confirm that the email address you recently changed actually works. Please click the link below to confirm that you want to change your email address in Kolide.

- @@ -65,10 +66,10 @@ - - diff --git a/server/mail/templates/invite_token.html b/server/mail/templates/invite_token.html index a0221b63e8..30b84b63ea 100644 --- a/server/mail/templates/invite_token.html +++ b/server/mail/templates/invite_token.html @@ -1,10 +1,11 @@ - + + -
+ {{.BaseURL}}/email/change/{{.Token}}
+ Fleet Documentation +
+
- -
+
+

You Have Been Invited To Fleet!

Hello,

{{.InvitedByUsername}} has invited you to join {{.OrgName}}. Please click the link below to accept the invitation and setup your account.

- - - diff --git a/server/mail/templates/password_reset.html b/server/mail/templates/password_reset.html index 959c5bd444..095ed327f4 100644 --- a/server/mail/templates/password_reset.html +++ b/server/mail/templates/password_reset.html @@ -1,10 +1,11 @@ - + + -
+ {{if .SSOEnabled}} {{.BaseURL}}/login/ssoinvites/{{.Token}}?name={{.Name}}&email={{.Email}} {{else}} @@ -69,10 +70,10 @@
+ Fleet Documentation +
+
- - - - diff --git a/server/mail/templates/smtp_setup.html b/server/mail/templates/smtp_setup.html index c9c693789e..2d659a250b 100644 --- a/server/mail/templates/smtp_setup.html +++ b/server/mail/templates/smtp_setup.html @@ -1,10 +1,11 @@ - + + -
+
+

Reset Your Fleet Password...

Someone requested a password reset on your Fleet account. Follow the link below to reset your password:

Reset Password

@@ -59,10 +60,10 @@
+ Fleet Documentation +
+
- - - -
+
+

Confirmed Fleet SMTP Setup

This message confirms that SMTP is set up properly on your Fleet instance.
+ Fleet Documentation +