Skip to content

Rework Sass imports to use new dart sass style #385

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.

Sign up for GitHub

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

Merged
afischer merged 1 commit into from
Jul 16, 2025
Merged

Rework Sass imports to use new dart sass style #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions styles/errors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
// the authentication layer.)

// top level templating values that can be overridden
@use "partials/vars";
@use "partials/theme";
@use "vars" as *;
@use "theme" as *;

// core layout styles rarely overridden
@use "partials/core/mixins";
@use "partials/core/base";
@use "partials/core/furniture";
@use "partials/core/pages";
@use "partials/core/categories";
@use "core/mixins" as *;
@use "core/base" as *;
@use "core/furniture" as *;
@use "core/pages" as *;
@use "core/categories" as *;

// final stylesheet with any additional styles for custom logic
@use "partials/custom";
@use "custom" as *;
40 changes: 20 additions & 20 deletions styles/partials/_theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "vars";
@use "vars" as *;

// Fonts
//------------------------------------------------------------------------------
Expand All @@ -12,23 +12,23 @@ $font-sans: 'Open Sans', sans-serif;
// Colors
//------------------------------------------------------------------------------
// Default Light Theme
$masthead-background: vars.$gray-10;
$main-homepage-background: vars.$white;
$main-homepage-icon-color: vars.$black;
$main-homepage-icon-border: vars.$black;
$main-page-text-color: vars.$gray-35;
$main-page-btn-color: vars.$gray-45;
$masthead-background: $gray-10;
$main-homepage-background: $white;
$main-homepage-icon-color: $black;
$main-homepage-icon-border: $black;
$main-page-text-color: $gray-35;
$main-page-btn-color: $gray-45;
$search-container-background: #e6e2e2;
$search-container-hover: vars.$gray-70;
$btn-homepage-background: vars.$white;
$btn-homepage-border: vars.$black;
$btn-default-background: vars.$white;
$btn-default-background-hover: vars.$accent;
$btn-default-border: vars.$black;
$btn-default-text-color: vars.$black;
$btn-default-text-hover: vars.$black;
$btn-user-initial: vars.$gray-50;
$elem-link-color: vars.$gray-50;
$elem-active-link-color: vars.$gray-50;
$elem-link-accent: vars.$accent;
$nav-text-color: vars.$gray-40;
$search-container-hover: $gray-70;
$btn-homepage-background: $white;
$btn-homepage-border: $black;
$btn-default-background: $white;
$btn-default-background-hover: $accent;
$btn-default-border: $black;
$btn-default-text-color: $black;
$btn-default-text-hover: $black;
$btn-user-initial: $gray-50;
$elem-link-color: $gray-50;
$elem-active-link-color: $gray-50;
$elem-link-accent: $accent;
$nav-text-color: $gray-40;
66 changes: 33 additions & 33 deletions styles/partials/core/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@use "../theme";
@use "../vars";
@use "theme" as *;
@use "vars" as *;
@use "mixins";

// Basic Styling
//------------------------------------------------------------------------------
body {
font-family: theme.$font-sans;
font-family: $font-sans;
font-weight: 100;
margin: 0;
padding: 0;
Expand All @@ -16,13 +16,13 @@ pre {
}

h1, h2, h3, h4, h5, h6 {
font-family: theme.$font-sans;
font-family: $font-sans;
margin-top: 45px;
margin-bottom: 20px;
}

a {
color: vars.$accent;
color: $accent;
text-decoration: none;

&:hover {
Expand All @@ -44,7 +44,7 @@ table {
th, td {
padding: 0.25rem 0.5rem;
text-align: left;
border: 1px solid vars.$gray-50;
border: 1px solid $gray-50;
p {
margin: 0;
}
Expand All @@ -69,14 +69,14 @@ button:focus {
line-height: 18px;
font-weight: 300;
font-style: normal;
font-family: theme.$font-sans;
font-family: $font-sans;
background-color: transparent;
border-radius: 3px;
transition: background-color 0.3s;
display: inline-block;
padding: 4px 8px 6px 8px;
border: 1px solid theme.$btn-default-border;
color: theme.$btn-default-text-color;
border: 1px solid $btn-default-border;
color: $btn-default-text-color;
cursor: pointer;

@include mixins.tablet{
Expand All @@ -92,7 +92,7 @@ button:focus {
}

.button.btn-cat {
background: theme.$btn-default-background;
background: $btn-default-background;
border-radius: 0;
margin: 4px 0 0 0;
-webkit-font-smoothing: antialiased;
Expand All @@ -106,8 +106,8 @@ button:focus {

&:hover {
cursor: pointer;
background: theme.$btn-default-background-hover;
color: theme.$btn-default-text-hover;
background: $btn-default-background-hover;
color: $btn-default-text-hover;
text-decoration: none;
}
}
Expand All @@ -116,21 +116,21 @@ button:focus {
margin: 10px 0 0 0;
-webkit-font-smoothing: antialiased;
font-size: 14px;
background-color: theme.$btn-homepage-background;
border: 1px solid theme.$btn-homepage-border;
background-color: $btn-homepage-background;
border: 1px solid $btn-homepage-border;
border-radius: 0;
color: theme.$main-page-btn-color;
-webkit-box-shadow: 2.5px 2.5px 0px -1px vars.$accent-dark;
-moz-box-shadow: 2.5px 2.5px 0px -1px vars.$accent-dark;
box-shadow: 2.5px 2.5px 0px -1px vars.$accent-dark;
color: $main-page-btn-color;
-webkit-box-shadow: 2.5px 2.5px 0px -1px $accent-dark;
-moz-box-shadow: 2.5px 2.5px 0px -1px $accent-dark;
box-shadow: 2.5px 2.5px 0px -1px $accent-dark;
padding: 5px 12px;

&:hover {
background: theme.$elem-link-accent;
color: vars.$white;
-webkit-box-shadow: 3px 3px 0px 0px vars.$gray-25;
-moz-box-shadow: 3px 3px 0px 0px vars.$gray-25;
box-shadow: 3px 3px 0px 0px vars.$gray-25;
background: $elem-link-accent;
color: $white;
-webkit-box-shadow: 3px 3px 0px 0px $gray-25;
-moz-box-shadow: 3px 3px 0px 0px $gray-25;
box-shadow: 3px 3px 0px 0px $gray-25;
text-decoration: none;
}
}
Expand All @@ -140,37 +140,37 @@ button:focus {
line-height: 20px;
font-weight: 400;
font-style: normal;
font-family: theme.$font-sans;
font-family: $font-sans;
background-color: transparent;
transition: background-color 0.3s;
display: inline-block;
padding: 7px 10px;
border: 1px solid vars.$gray-40;
border: 1px solid $gray-40;
cursor: pointer;
-webkit-font-smoothing: antialiased;
-webkit-box-shadow: 5px 5px 0px 0px vars.$offwhite;
-moz-box-shadow: 5px 5px 0px 0px vars.$offwhite;
box-shadow: 5px 5px 0px 0px vars.$offwhite;
-webkit-box-shadow: 5px 5px 0px 0px $offwhite;
-moz-box-shadow: 5px 5px 0px 0px $offwhite;
box-shadow: 5px 5px 0px 0px $offwhite;
margin-right: 10px;
color: vars.$gray-20;
color: $gray-20;
margin-top: 10px;

&:hover {
background: vars.$gray-20;
color: vars.$white;
background: $gray-20;
color: $white;
}
}

.button.btn-plaintext {
border: none;
text-decoration: underline;
background: transparent;
color: theme.$nav-text-color;
color: $nav-text-color;
font-size: 13px;
line-height: 29px;

&:hover {
cursor: pointer;
color: vars.$accent;
color: $accent;
}
}
Loading