Skip to content

Commit

Permalink
19.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
inc2734 committed Jul 31, 2024
1 parent c1be0c0 commit 82d4a16
Show file tree
Hide file tree
Showing 26 changed files with 679 additions and 2,463 deletions.
2 changes: 1 addition & 1 deletion ejs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "18.2.4",
"version": "19.0.0",
"css": "/assets/css",
"js": "/assets/js",
"images": "/assets/images"
Expand Down
2,812 changes: 525 additions & 2,287 deletions package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"volta": {
"node": "20.11.1"
},
"version": "18.2.4",
"version": "19.0.0",
"main": "index.html",
"author": "inc2734",
"license": "MIT",
Expand All @@ -16,42 +16,42 @@
"url": "https://github.com/sass-basis/sass-basis.github.io"
},
"devDependencies": {
"@babel/core": "^7.24.9",
"@babel/preset-env": "^7.24.8",
"@wordpress/browserslist-config": "^6.3.0",
"@babel/core": "^7.25.2",
"@babel/preset-env": "^7.25.2",
"@wordpress/browserslist-config": "^6.4.0",
"autoprefixer": "^10.4.19",
"babel-loader": "^9.1.3",
"browser-sync": "^3.0.2",
"cpy-cli": "^5.0.0",
"cssnano": "^7.0.4",
"ejs-cli": "^2.2.3",
"node-sass": "^9.0.0",
"normalize.css": "^8.0.1",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.39",
"postcss": "^8.4.40",
"postcss-cli": "^11.0.0",
"postcss-import": "^16.1.0",
"rimraf": "^6.0.1",
"sass": "^1.77.8",
"webpack": "^5.93.0",
"webpack-cli": "^5.1.4"
},
"dependencies": {
"jquery": "^3.7.1",
"sass-basis": "^18.2.4",
"sass-basis-layout": "^8.0.4"
"sass-basis": "^19.0.0",
"sass-basis-layout": "^9.0.0"
},
"scripts": {
"clean:css": "rimraf public/assets/css && mkdir -p public/assets/css",
"clean:js": "rimraf public/assets/js && mkdir -p public/assets/js",
"clean:img": "rimraf public/assets/images && mkdir -p public/assets/images",
"clean:favicon": "rimraf public/favicon.ico",
"clean:ejs": "rimraf public/*.html",
"css:style": "node-sass src/css/style.scss public/assets/css/style.min.css && postcss -r public/assets/css/style.min.css -c=postcss.config.js",
"css:style": "sass src/css/style.scss public/assets/css/style.min.css && postcss -r public/assets/css/style.min.css -c=postcss.config.js",
"css": "npm run clean:css && npm-run-all -p css:*",
"js:app": "webpack ./src/js/app.js -o ./public/assets/js/ --output-filename app.min.js --config webpack.config.js",
"js": "npm run clean:js && npm-run-all -p js:*",
"img": "npm run clean:img && cpy '**' '../../public/assets/images' --cwd=src/images --parents",
"favicon": "npm run clean:favicon && cpy 'src/favicon.ico' 'public'",
"img": "npm run clean:img && cpy 'src/images/**' 'public/assets/images'",
"favicon": "npm run clean:favicon && cpy 'src/*.ico' 'public'",
"ejs": "ejs-cli --base-dir src/ejs '*.ejs' --out public/ --options ejs.json",
"build": "npm-run-all -p css js img favicon ejs",
"browsersync": "npm run build && browser-sync start -s 'public' -f 'public'"
Expand Down
2 changes: 1 addition & 1 deletion src/css/core/mixin/_mixin.scss
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import 'font-basis';
@forward 'font-basis';
10 changes: 8 additions & 2 deletions src/css/foundation/_foundation.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
@use '../../../node_modules/sass-basis/src/css/core';

body {
letter-spacing: 1px;
}

a {
@include _transition(background-color, color);
color: _dark($color-primary);
@include core.transition(background-color, color);
color: color-mix(in srgb, var(--color-primary), #000 20%);
}

.hljs, pre {
background-color: #15191d;
}

.hljs {
padding: var(--_padding1);
}

pre {
border: none;
}
10 changes: 5 additions & 5 deletions src/css/layout/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.#{$_prefix}l-footer {
padding: ($_base-line-height * 2) 0 0;
background-color: _var-dark-color-text();
color: _var-color-white();
.l-footer {
padding: var(--_padding2) 0 0;
background-color: var(--_dark-color-text);
color: white;

a {
color: _var-color-gray();
color: var(--_color-gray);
}
}
22 changes: 12 additions & 10 deletions src/css/layout/_header.scss
Original file line number Diff line number Diff line change
@@ -1,42 +1,44 @@
.#{$_prefix}l-header {
@include _transition(background-color, color);
@use '../../../node_modules/sass-basis/src/css/core';

.l-header {
@include core.transition(background-color, color);
z-index: 1;
background-color: transparent;
color: _var-color-white();
color: white;

[data-scrolled="true"] & {
background-color: _var-dark-color-text();
background-color: var(--_dark-color-text);
}

a {
color: inherit;
text-decoration: none;
}

> .#{$_prefix}c-container {
> .c-container {
position: relative;
}

.p-site-branding {
padding: ($_base-line-height / 2) 0;
padding: var(--_padding-1) 0;
}

.p-global-nav {
color: _var-color-white();
color: white;

a {
color: inherit;
}
}

.#{$_prefix}c-hamburger-btn {
.c-hamburger-btn {
position: absolute;
top: 50%;
right: $_base-line-height;
right: var(--_global--line-height);
transform: translateY(-50%);

&__bar {
background-color: _var-color-white();
background-color: white;
}
}
}
14 changes: 7 additions & 7 deletions src/css/layout/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
@import '../../../node_modules/sass-basis-layout/src/css/layout/container';
@use '../../../node_modules/sass-basis-layout/src/css/layout/container';

@import 'header';
@import 'footer';
@forward 'header';
@forward 'footer';

.#{$_prefix}l-container {
background-color: _var-color-white();
.l-container {
background-color: white;
overflow: hidden;
}

.#{$_prefix}l-sub {
@include _padding-top(2);
.l-sub {
padding-top: var(--_padding2);
}
16 changes: 9 additions & 7 deletions src/css/object/component/_btn.scss
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
@use '../../../../node_modules/sass-basis/src/css/core';

.c-btn {
@include _transition(all);
@include core.transition(all);
border: none;
border-radius: 3px;
@include _padding(.5, 1);
padding: var(--_padding-1) var(--_padding1);

&--block {
display: block;
}

&--ghost {
border: 1px solid _var-color-white();
background-color: _var-background-color();
border: 1px solid white;
background-color: transparent;
}

&--launch, &--download, &--buy {
background-color: $color-primary;
color: _var-color-white();
background-color: var(--color-primary);
color: white;

@include _hover() {
@include core.hover() {
opacity: .8;
}

Expand Down
8 changes: 4 additions & 4 deletions src/css/object/component/_component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'btn';
@import 'copyright';
@import 'drawer';
@import 'section';
@forward 'btn';
@forward 'copyright';
@forward 'drawer';
@forward 'section';
8 changes: 5 additions & 3 deletions src/css/object/component/_copyright.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
@use '../../../../node_modules/sass-basis/src/css/core';

.c-copyright {
@include _font-size-line-height(14px);
@include _padding(1, 0, 2);
color: _var-color-gray();
@include core.set-font-size-level(-1);
padding: var(--_padding1) 0 var(--_padding2);
color: var(--_color-gray);

a {
color: inherit;
Expand Down
23 changes: 13 additions & 10 deletions src/css/object/component/_drawer.scss
Original file line number Diff line number Diff line change
@@ -1,38 +1,41 @@
.#{$_prefix}c-drawer {
@use '../../../../node_modules/sass-basis/src/css/core';

.c-drawer {
$item-padding-coefficient: 1;

background-color: _var-color-black();
color: _var-color-white();
background-color: var(--_color-black);
color: white;

a {
color: inherit;
}

&__menu {
@include _list-unstyled();
@include core.list-unstyled();
}

&__item, &__subitem {
position: relative;
}

&__item {
@include _padding(.5, $item-padding-coefficient, 0);
padding: var(--_padding-1) var(--_padding1) 0;
}

&__submenu {
@include _list-unstyled();
@include _margin(0, ($item-padding-coefficient * -1), 0, 0);
@include core.list-unstyled();
margin: 0 calc(var(--_padding1) * -1) 0 0;
padding-left: 1em;
}

&__subitem {
@include _padding(.5, $item-padding-coefficient, 0, 0);
padding: var(--_padding-1) var(--_padding1) 0 0;
}

&__toggle {
@include _position(absolute, _space(.5), 5px, 0);
@include _square($_base-line-height);
position: absolute;
inset: var(--_s-1) 5px 0 auto;
@include core.square(var(--_global--line-height));
display: flex;
align-items: center;
justify-content: center;
Expand Down
36 changes: 19 additions & 17 deletions src/css/object/component/_section.scss
Original file line number Diff line number Diff line change
@@ -1,41 +1,43 @@
@use '../../../../node_modules/sass-basis/src/css/core';

.c-section {
@include _content();
@include _padding(3, 0);
padding: var(--_padding3) 0;
@include core.set-content-level(1);

> .#{$_prefix}c-container {
@include _content();
> .c-container {
@include core.set-content-level(1);
}

&--bg {
background-color: _var-lightest-color-gray();
border-top: 1px solid _var-lighter-color-gray();
border-bottom: 1px solid _var-lighter-color-gray();
background-color: var(--_lightest-color-gray);
border-top: 1px solid var(--_lighter-color-gray);
border-bottom: 1px solid var(--_lighter-color-gray);
}

&__title {
@include _font-size-line-height(2);
@include _margin(0, 0, 2);
@include core.set-font-size-level(4);
margin: 0 0 var(--_margin2);
font-weight: normal;
text-align: center;
}

&--border {
border-bottom: 1px solid _var-lighter-color-gray();
@include _padding(2, 0);
border-bottom: 1px solid var(--_lighter-color-gray);
padding: var(--_padding2) 0;

.c-section__h1 {
@include _margin(0, 0, 1.5);
@include _font-size-line-height(2.5rem);
margin: 0 0 var(--_margin2);
@include core.set-font-size-level(3);
}

.c-section__h2 {
@include _margin(1.5, 0, 1);
@include _font-size-line-height(2rem);
margin: var(--_margin2) 0 var(--_margin1);
@include core.set-font-size-level(2);
}

.c-section__h3 {
@include _margin(1.5, 0, 1);
@include _font-size-line-height(1.5rem);
margin: var(--_margin2) 0 var(--_margin1);
@include core.set-font-size-level(2);
}
}
}
6 changes: 4 additions & 2 deletions src/css/object/project/_footer-nav.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@use '../../../../node_modules/sass-basis/src/css/core';

.p-footer-nav {
@include _font-size-line-height(14px);
@include core.set-font-size-level(-1);

&__list {
list-style: none;
Expand All @@ -9,7 +11,7 @@

&__item {
margin: 0;
@include _padding(0, 0, .5);
padding: 0 0 var(--_padding-1);

a {
text-decoration: none;
Expand Down
8 changes: 5 additions & 3 deletions src/css/object/project/_global-nav.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
@use '../../../../node_modules/sass-basis/src/css/core';

.p-global-nav {
@include _font-size-line-height(14px);
@include core.set-font-size-level(-1);

.#{$_prefix}c-navbar__item a {
@include _padding(.25, .5);
.c-navbar__item a {
padding: var(--_padding-2) var(--_padding-1);
}
}
Loading

0 comments on commit 82d4a16

Please sign in to comment.