Skip to content

Commit

Permalink
Update styles
Browse files Browse the repository at this point in the history
  • Loading branch information
nanoparsec committed Feb 10, 2022
1 parent 2d9bbe5 commit 677e8da
Show file tree
Hide file tree
Showing 12 changed files with 71 additions and 29 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,4 @@ typings/
.env

documentation/
.DS_Store
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "bootstrap"]
path = bootstrap
url = git@github.com:twbs/bootstrap.git
branch = v.4.6.0
1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

3 changes: 2 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@
"buildTags": "extended"
},
"engines": {
"node": ">=10.0.0 <15.0.0"
"node": ">=12.0.0"
}
}
13 changes: 7 additions & 6 deletions src/styles/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,9 @@ $font-size-sm: ($font-size-base * .875);
//
// $font-weight-light: 300 !default;
// $font-weight-normal: 400 !default;
// $font-weight-bold: 700 !default;
//
$font-weight-bold: bold !default;
$font-weight-heavy: 800 !default;

// $font-weight-base: $font-weight-normal !default;
$line-height-base: $paragraph-line-height;
//
Expand All @@ -255,8 +256,8 @@ $line-height-base: $paragraph-line-height;
// $h6-font-size: $font-size-base !default;
//
$headings-margin-bottom: $spacer;
$headings-font-family: $font-family-sans-serif-bold;
$headings-font-weight: normal;
$headings-font-family: $font-family-sans-serif;
$headings-font-weight: $font-weight-heavy;
$headings-line-height: $heading-line-height;
// $headings-color: inherit !default;
//
Expand Down Expand Up @@ -364,12 +365,12 @@ $input-btn-focus-box-shadow: none;
// $btn-line-height-sm: $input-btn-line-height-sm !default;
//
// $btn-padding-y-lg: $input-btn-padding-y-lg !default;
// $btn-padding-x-lg: $input-btn-padding-x-lg !default;
// $btn-padding-x-lg: $input-btn-padding-x-lg !default;ƒ
// $btn-line-height-lg: $input-btn-line-height-lg !default;
//
// $btn-border-width: $input-btn-border-width !default;
//
// $btn-font-weight: $font-weight-normal !default;
$btn-font-weight: $font-weight-bold !default;
// $btn-box-shadow: inset 0 1px 0 rgba($white, .15), 0 1px 1px rgba($black, .075) !default;
// $btn-focus-width: $input-btn-focus-width !default;
// $btn-focus-box-shadow: $input-btn-focus-box-shadow !default;
Expand Down
23 changes: 19 additions & 4 deletions src/styles/overrides/_buttons.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
//
// Buttons
//
.btn-success {
color: $brand-white;
}

.btn {
font-family: $font-family-sans-serif-bold;
.btn-primary {
&:hover,
&:active,
&:focus {
color: $brand-secondary;
background-color: $brand-primary;
border-color: $brand-primary;
}
}

.btn-success {
color: $brand-white;
.btn-secondary {
&:hover,
&:active,
&:focus {
color: $brand-white;
background-color: $brand-secondary;
border-color: $brand-secondary;
}
}
22 changes: 22 additions & 0 deletions src/styles/overrides/_dropdowns.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,25 @@
.dropdown-menu {
box-shadow: $dropdown-box-shadow;
}

.btn-secondary:not(:disabled):not(.disabled):active,
.btn-secondary:not(:disabled):not(.disabled).active,
.show > .btn-secondary.dropdown-toggle
{
color: $brand-white;
background-color: $brand-secondary;
border-color: $brand-secondary;
}

.btn-secondary:not(:disabled):not(.disabled):active,
.btn-secondary:not(:disabled):not(.disabled).active,
.show > .btn-primary.dropdown-toggle
{
color: $brand-secondary;
background-color: $brand-primary;
border-color: $brand-primary;
}

.dropdown-item.active {
background-color: $brand-secondary;
}
2 changes: 1 addition & 1 deletion src/styles/overrides/_list-groups.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//
// List Groups
//

.list-group,
.list-group-item {
p {
&:not(.lead) {
@extend %heading-font-regular;

line-height: $line-height-base;
font-size: $font-size-base;
}
Expand Down
3 changes: 2 additions & 1 deletion src/styles/overrides/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
}

.navbar-brand {
@extend %heading-font-heavy;

text-decoration: none;
font-family: $font-family-sans-serif-heavy;
}
2 changes: 2 additions & 0 deletions src/styles/overrides/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
thead {
th {
@extend %heading-font-heavy;

border-bottom: 0;
color: $brand-secondary;
}
}
}
27 changes: 13 additions & 14 deletions src/styles/overrides/_type.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
p {
&:not(.info),
&:not(.lead) {
@extend %body-font-regular;

line-height: $line-height-base;
font-family: $font-family-serif;
font-size: $companion-font-size;
}
}
Expand All @@ -27,33 +28,26 @@ a {
}
}


// Headlines
h1,
.h1,
h2,
.h2,
h3,
.h3,
h4,
.h4,
h5,
.h5,
h6,
.h6,
.display-1,
.display-2,
.display-3,
.display-4 {
font-family: $font-family-sans-serif-heavy;
}

h1,
.h1,
.display-1,
.display-2,
.display-3,
.display-4 {
color: $h1-color;
}


// Code
code {
background-color: $code-background-color;
Expand All @@ -64,13 +58,18 @@ code {

// Lists
ul {
@extend %body-font-regular;

&:not([class]) {
li {
list-style-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10"><circle fill="#ff9c66" cx="5" cy="4" r="4"/></svg>');
font-size: $companion-font-size;
list-style-image: url("data:image/svg+xml;utf8,%3c?xml version='1.0' encoding='utf-8'?%3e%3csvg xmlns='http://www.w3.org/2000/svg' width='9' height='9' viewBox='0 0 10 10'%3e%3ccircle fill='%23ff9c66' cx='5' cy='4' r='4'/%3e%3c/svg%3e");
}
}
}

dt {
font-family: $font-family-sans-serif-bold;
@extend %heading-font-bold;

color: $brand-secondary;
}

0 comments on commit 677e8da

Please sign in to comment.