Skip to content

Commit

Permalink
Scope global styles to do-bulma class
Browse files Browse the repository at this point in the history
  • Loading branch information
MattIPv4 committed Jan 22, 2024
1 parent 974096e commit 466081c
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 55 deletions.
23 changes: 22 additions & 1 deletion src/components/_base.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2019 DigitalOcean
Copyright 2024 DigitalOcean
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -14,6 +14,15 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

* {
box-sizing: inherit;

&::before,
&::after {
box-sizing: inherit;
}
}

hr {
border: 0;
border-top: 2px solid $border;
Expand Down Expand Up @@ -58,6 +67,18 @@ figure {

// Body
& {
@include font-regular;

-moz-osx-font-smoothing: grayscale;
background: $background;
box-sizing: border-box;
color: $text;
line-height: $line-height;
margin: 0;
min-height: 100vh;
padding: 0;
text-rendering: optimizeLegibility;

display: flex;
flex-direction: column;

Expand Down
51 changes: 0 additions & 51 deletions src/globals/_base.scss

This file was deleted.

5 changes: 4 additions & 1 deletion src/globals/_fonts.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021 DigitalOcean
Copyright 2024 DigitalOcean
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -14,6 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// stylelint-disable-next-line import-notation
@import url("https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.min.css");

@font-face {
font-display: swap;
font-family: $light-font-family-name;
Expand Down
3 changes: 1 addition & 2 deletions src/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2020 DigitalOcean
Copyright 2024 DigitalOcean
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -16,7 +16,6 @@ limitations under the License.

@import "globals/variables";
@import "globals/fonts";
@import "globals/base";

.do-bulma {
@import "~bulma/bulma";
Expand Down

0 comments on commit 466081c

Please sign in to comment.