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.

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

Set sass variables with css variables to allow easy overrides #4263

Merged
merged 18 commits into from
Dec 13, 2024
Merged

Set sass variables with css variables to allow easy overrides #4263

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
daa9773
Convert sass variables in to css variables.
frjo Dec 7, 2024
1afcc4f
Convert sass variable quick-transition in to css variables.
frjo Dec 7, 2024
5c86d7b
Remove need for base-font-* and base-line-*.
frjo Dec 7, 2024
b7fda1f
Remove unused colours.
frjo Dec 7, 2024
fd9db79
Redo gutters and font-size.
frjo Dec 7, 2024
0a69174
Remove most use of color.adjust().
frjo Dec 7, 2024
1a2f337
Use css var colours.
frjo Dec 7, 2024
3f8a0e3
Seperate gutters and spacing.
frjo Dec 7, 2024
89b5d49
Fix bug in submission-form-copy.js.
frjo Dec 7, 2024
900885c
Adjust header styles.
frjo Dec 7, 2024
b85dd64
Move root css variables to seperate file.
frjo Dec 7, 2024
8afd3d7
Implement spacing-reverse.
frjo Dec 7, 2024
a689930
Revert "Use css var colours."
frjo Dec 7, 2024
0a36b87
Set sass var via css var to ease overriding the values.
frjo Dec 7, 2024
61af24e
Use sass variables set by css variables.
frjo Dec 7, 2024
d30d84d
Move css vars to tailwind variables.css.
frjo Dec 7, 2024
e639bd4
Use sass variables set by css variables, part 2.
frjo Dec 7, 2024
35b137e
Remove unused variables.
frjo Dec 7, 2024
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
Prev Previous commit
Remove unused variables.
  • Loading branch information
@frjo
frjo committed Dec 7, 2024
commit 35b137ea044b37107b3292934e3268ef17e673ea
5 changes: 0 additions & 5 deletions hypha/static_src/sass/abstracts/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,8 @@ $color--pastel-green: var(--color-pastel-green);
$color--black-60: var(--color-black-60);
$color--black-50: var(--color-black-50);
$color--black-40: var(--color-black-40);
$color--black-25: var(--color-black-25);
$color--black-20: var(--color-black-20);
$color--black-10: var(--color-black-10);
$color--white-50: var(--color-white-50);
$color--white-40: var(--color-white-40);
$color--white-25: var(--color-white-25);
$color--white-20: var(--color-white-20);
$color--white-10: var(--color-white-10);

Expand All @@ -72,7 +68,6 @@ $weight--black: var(--weight-black);
$weight--bold: var(--weight-bold);
$weight--semibold: var(--weight-semibold);
$weight--normal: var(--weight-normal);
$weight--light: var(--weight-light);

// Wrappers
$site-width: var(--site-width);
Expand Down
2 changes: 1 addition & 1 deletion hypha/static_src/sass/components/_admin-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
font-weight: variables.$weight--bold;

&::before {
@include mixins.triangle(top, currentColor, 5px);
@include mixins.triangle(top);
margin-inline-end: 0.5rem;
transform: rotate(-90deg);
}
Expand Down
1 change: 0 additions & 1 deletion hypha/static_src/sass/custom/_extra.scss
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions hypha/static_src/tailwind/base/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,8 @@
--color-black-60: rgb(0 0 0 / 60%);
--color-black-50: rgb(0 0 0 / 50%);
--color-black-40: rgb(0 0 0 / 40%);
--color-black-25: rgb(0 0 0 / 25%);
--color-black-20: rgb(0 0 0 / 20%);
--color-black-10: rgb(0 0 0 / 10%);
--color-white-50: rgb(255 255 255 / 50%);
--color-white-40: rgb(255 255 255 / 40%);
--color-white-25: rgb(255 255 255 / 25%);
--color-white-20: rgb(255 255 255 / 20%);
--color-white-10: rgb(255 255 255 / 10%);

Expand All @@ -73,7 +69,6 @@
--weight-bold: 700;
--weight-semibold: 600;
--weight-normal: 400;
--weight-light: 200;

/* Wrappers */
--site-width: 1280px;
Expand Down
2 changes: 1 addition & 1 deletion hypha/templates/base-apply.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{% block header %}
<header
class="header max-w-[1280px] flex py-2 gap-4 items-center justify-between mx-auto w-full"
class="header max-w-[1280px] py-2 flex gap-4 items-center justify-between mx-auto w-full"
x-data="{'showDesktopMenu': false, isDesktop: false, mm: null}"
x-init="mm = window.matchMedia(`(min-width: 768px)`); isDesktop = mm.matches; mm.addListener((e) => { isDesktop = e.matches }); "
>
Expand Down
Loading