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

change Sass configuaration #205

Merged
merged 32 commits into from
Aug 12, 2022
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
73817c1
use tools for most config files
dvdherron Apr 14, 2022
51d5470
use forwarded accoutrement in components
dvdherron Apr 14, 2022
280d089
use forwarded accoutrement in forms files
dvdherron Apr 14, 2022
6f2115c
reconfigure initial/
dvdherron Apr 14, 2022
f39edf4
reconfigure layout files
dvdherron Apr 14, 2022
5b865f8
reconfigure page and patterns
dvdherron Apr 15, 2022
8d43188
wip: separate colors into modules
dvdherron Apr 19, 2022
9ff50f2
hide ccs color previews
dvdherron Apr 21, 2022
0fb728c
move ccs defaults
dvdherron Apr 21, 2022
0fed177
Merge branch 'main' into sass-config
dvdherron May 17, 2022
2020b47
Merge branch 'main' into sass-config
dvdherron Jun 14, 2022
2339047
move color config
dvdherron Jun 15, 2022
a022eab
@use 'sass:map' and map.get() in color config
stacyk Aug 1, 2022
9e1d20d
convert sass color maps to variables
stacyk Aug 1, 2022
e8c9d58
remove unused
stacyk Aug 1, 2022
86117cb
simplify color include, lint
stacyk Aug 1, 2022
aac7f3f
show color variable names and values, even though they are empty
stacyk Aug 1, 2022
05ae64e
Merge branch 'main' into sass-config
jgerigmeyer Aug 1, 2022
fc17e22
lint
jgerigmeyer Aug 1, 2022
b0faf7a
Merge branch 'main' into sass-config
jgerigmeyer Aug 1, 2022
065a1d5
Merge branch 'main' into sass-config
jgerigmeyer Aug 9, 2022
1f69e67
update linter
jgerigmeyer Aug 9, 2022
4ea9c73
fix font
jgerigmeyer Aug 9, 2022
035adff
compiled webmention timestamp?
stacyk Aug 9, 2022
e80092a
add another @group init-colors to control order of heading and example
stacyk Aug 9, 2022
6038318
linted on save
stacyk Aug 9, 2022
8727442
lint
jgerigmeyer Aug 9, 2022
2ab4196
Show content-color names/values in herman example
mirisuzanne Aug 10, 2022
5d9427a
allow herman to show color values for now instead of previews
stacyk Aug 11, 2022
228667a
adjust headings
jgerigmeyer Aug 11, 2022
a759111
update sass comment sicne we arent compressing our css output
stacyk Aug 11, 2022
0309188
Merge branch 'sass-config' of https://github.com/oddbird/oddleventy i…
stacyk Aug 11, 2022
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
2 changes: 1 addition & 1 deletion .stylelintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ rules:
- message: 'Expected mixin to be kebab-case'
scss/at-rule-conditional-no-parentheses: null
scss/dollar-variable-pattern:
- '^([_|-]*[a-z][a-z0-9]*)(-[a-z0-9]+)*-*$'
- '^([_|-]*[a-z][a-z0-9]*)(-{1,2}[a-z0-9]+)*-*$'
- message: 'Expected variable to be kebab-case'

# Disable for Prettier
Expand Down
239 changes: 238 additions & 1 deletion src/mentions/webmentions.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/scss/components/_events.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@use '~accoutrement/sass/tools';
@use '../config';

.event {
margin-bottom: var(--newline);
}

.event-meta {
@include tools.font-family('alt');
@include config.font-family('alt');

font-size: var(--small);
}
Expand All @@ -15,7 +15,7 @@
}

.event-links {
@include tools.wrap-content('[' ']');
@include config.wrap-content('[' ']');

font-size: var(--small);
font-style: italic;
Expand Down
2 changes: 0 additions & 2 deletions src/scss/components/_logo-grid.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use '~accoutrement/sass/tools';

.logo-grid {
--column: content;
--fill: var(--feature);
Expand Down
8 changes: 4 additions & 4 deletions src/scss/components/_post.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '~accoutrement/sass/tools';
@use '../config';

[data-post] {
--post-margin: var(--gutter);
Expand Down Expand Up @@ -32,7 +32,7 @@
}

[data-post='link'] {
@include tools.transition('pop');
@include config.transition('pop');

--hero-height: var(--grid-hero);
--item-title: 1rem;
Expand All @@ -58,7 +58,7 @@
display: block;

&::after {
@include tools.z-index('bump');
@include config.z-index('bump');

content: '';
display: block;
Expand All @@ -77,7 +77,7 @@
// --------

.type-flag {
@include tools.font-family('alt');
@include config.font-family('alt');

background: var(--highlight);
color: var(--bg);
Expand Down
4 changes: 2 additions & 2 deletions src/scss/components/_resources.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '~accoutrement/sass/tools';
@use '../config';

// pagination

Expand All @@ -17,7 +17,7 @@
[title-end];
margin: var(--double-gutter) 0;

@include tools.above('wide-break') {
@include config.above('wide-break') {
--justify-nav: initial;

grid-template-columns:
Expand Down
6 changes: 3 additions & 3 deletions src/scss/components/_work-grid.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@use '~accoutrement/sass/tools';
@use '../config';

[data-work] {
--column: full;

[data-work='summary'] + & {
--pull-sample: var(--spacer);

@include tools.above('wide-break') {
@include config.above('wide-break') {
--pull-sample: calc(var(--spacer) * -1);
}
}
Expand Down Expand Up @@ -45,7 +45,7 @@
margin: var(--gutter) var(--page-margin);
max-width: var(--wide-page);

@include tools.above('wide-page') {
@include config.above('wide-page') {
grid-template-areas:
'desktop desktop2 desktop2'
'desktop mobile ..........'
Expand Down
2 changes: 1 addition & 1 deletion src/scss/config/_animation.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '~accoutrement/sass/tools' as *;
@use 'tools' as *;

/// # Animation Config
/// Accoutrement maps for storing global animation tokens.
Expand Down
150 changes: 0 additions & 150 deletions src/scss/config/_color.scss

This file was deleted.

4 changes: 2 additions & 2 deletions src/scss/config/_fonts.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '~accoutrement/sass/tools';
@use 'tools';
@use '~sassdoc-theme-herman/scss/utilities' as herman;
@use 'sass:meta';

Expand Down Expand Up @@ -67,7 +67,7 @@ $alt-font: (
/// @link https://www.oddbird.net/accoutrement/docs/type.html
/// Accoutrement Type
$code-font: (
'name': 'SourceCodePro',
'name': 'source-code-pro',
'stack': (
'Consolas',
'Menlo',
Expand Down
15 changes: 15 additions & 0 deletions src/scss/config/_index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
@forward 'tools';
@forward 'animation';
@forward 'color';
@forward 'focus';
@forward 'fonts';
@forward 'layout';
@forward 'scale';

@use 'tools';
@use 'sass:meta';
@use 'color/brand';
@use 'color/background';
@use 'color/ccs-defaults';
@use 'color/content';
@use 'color/config' as color-config;

@include tools.add-colors(meta.module-variables('brand'));
@include tools.add-colors(meta.module-variables('background'));
@include tools.add-colors(meta.module-variables('ccs-defaults'));
@include tools.add-colors(meta.module-variables('content'));
@include tools.add-colors(meta.module-variables('color-config'));
2 changes: 1 addition & 1 deletion src/scss/config/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '~accoutrement/sass/tools' as *;
@use 'tools' as *;

// Times
// -----
Expand Down
8 changes: 4 additions & 4 deletions src/scss/config/_scale.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '~accoutrement/sass/tools';
@use 'tools';
@use '~sassdoc-theme-herman/scss/utilities' as herman;
@use 'sass:map';

Expand All @@ -14,12 +14,12 @@
/// that adapts to context
/// @ratios
/// @group config-scale
$ratios: (
$text-ratios: (
'line-height': 1.4,
);

@include tools.add-ratios($ratios);
@include herman.add('ratios', 'ratios', $ratios);
@include tools.add-ratios($text-ratios);
@include herman.add('ratios', 'text-ratios', $text-ratios);

// Font Sizes
// ----------
Expand Down
3 changes: 3 additions & 0 deletions src/scss/config/_tools.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@forward '~accoutrement/sass/tools' with (
$color-var-prefix: ''
);
18 changes: 18 additions & 0 deletions src/scss/config/color/_background.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
$bg: var(--ccs-neutral--bg-full);
$bg-full: var(--ccs--bg-full);
$callout: hsl(var(--ccs-h--prime), var(--ccs-s--bg3), var(--ccs-l--bg5));
$callout-neutral: var(--ccs-neutral--bg5);
$callout-fade: hsla(
var(--ccs-h--prime),
var(--ccs-s--bg2),
var(--ccs-l--bg5),
var(--ccs-fade)
);
$callout-special: var(--ccs-special--bg5-fade);
$overlay: var(--ccs-neutral--bg6-fade);
$overlay-banner: hsla(
var(--ccs-h--neutral),
var(--ccs-s--bg6),
var(--ccs-l--bg6),
40%
);
12 changes: 12 additions & 0 deletions src/scss/config/color/_brand.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/// # Brand Colors
/// --------------
/// The brand is defined by our primary brand blue,
/// along with secondary pink and orange base colors.
/// These colors are rarely used directly,
/// but form the basis of our CSS color variables.
/// @colors brand-colors
/// @group config-color

$brand-blue: hsl(195deg, 52%, 31%);
$brand-orange: hsl(24deg, 100%, 62%);
$brand-pink: hsl(330deg, 100%, 45%);
3 changes: 3 additions & 0 deletions src/scss/config/color/_ccs-defaults.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
$ccs-neutral--theme: var(--ccs-h--prime);
$ccs-background: var(--bg);
$ccs-color: var(--text);
Loading