Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scope global styles to do-bulma class #69

Merged
merged 2 commits into from
Jan 23, 2024
Merged
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
22 changes: 21 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,8 +67,19 @@ figure {

// Body
& {
@include font-regular;

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

.main.container {
display: flex;
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