Skip to content

Commit

Permalink
fix #135
Browse files Browse the repository at this point in the history
  • Loading branch information
inc2734 committed Dec 17, 2021
1 parent 8c35988 commit b833fa7
Show file tree
Hide file tree
Showing 56 changed files with 1,408 additions and 1,696 deletions.
1 change: 0 additions & 1 deletion .browserslistrc
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
extends @wordpress/browserslist-config
IE 11
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
#Changelog

## December 17, 2021 16.0.0
* Drop IE support.
* Add new function: `_font-size()`.
* Add new function: `_line-height()`.
* Add new CSS custom property: `--_form-control-border-color`.
* Add new CSS custom property: `--_form-control-border-color-hover`.
* Add new CSS custom property: `--_form-control-border-color-focus`.
* Add new CSS custom property: `--_transition-duration`.
* Add new CSS custom property: `--_transition-function-timing`.
* Add new CSS custom property: `--_base-font-size-px`.

## November 8, 2021 15.0.3
* Support sub navigation hover effect on mobile device.

Expand Down
20 changes: 1 addition & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,26 +95,8 @@ https://cdn.jsdelivr.net/npm/sass-basis@latest/dist/
<a class="c-btn c-btn--block">Btn</a>
```

### Option

Support IE9 ( Not perfect )

```html
<!--[if lt IE 10]>
<link rel="stylesheet" href="node_modules/sass-basis/dist/css/plugin/basis-ie9/basis-ie9.min.css" />
<![endif]-->
```

And support IE8 ( Not perfect )

```html
<!--[if lt IE 9]>
<script src="node_modules/html5shiv/dist/html5shiv.js"></script>
<![endif]-->
```

## Browser support
Modern Browser and IE10+
Modern Browser only

## How to contribute

Expand Down
2,316 changes: 1,197 additions & 1,119 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 12 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,24 @@
"README.md"
],
"devDependencies": {
"@babel/core": "^7.15.0",
"@babel/preset-env": "^7.15.0",
"@babel/core": "^7.16.5",
"@babel/preset-env": "^7.16.5",
"@wordpress/browserslist-config": "^4.1.0",
"autoprefixer": "^10.3.3",
"babel-loader": "^8.2.2",
"browser-sync": "^2.27.5",
"autoprefixer": "^10.4.0",
"babel-loader": "^8.2.3",
"browser-sync": "^2.27.7",
"cpy-cli": "^3.1.1",
"cssnano": "^5.0.8",
"cssnano": "^5.0.13",
"node-aigis": "^1.4.1",
"node-sass": "^6.0.1",
"node-sass": "^7.0.0",
"normalize.css": "^8.0.1",
"npm-run-all": "^4.1.5",
"postcss": "^8.3.6",
"postcss-cli": "^8.3.1",
"postcss": "^8.4.5",
"postcss-cli": "^9.1.0",
"postcss-import": "^14.0.2",
"postcss-mq-optimize": "^1.1.0",
"webpack": "^5.51.1",
"webpack-cli": "^4.8.0"
"webpack": "^5.65.0",
"webpack-cli": "^4.9.1"
},
"scripts": {
"prepublish": "npm run cleanup:aigis && npm run build",
Expand All @@ -60,16 +60,14 @@
"cleanup:js": "rimraf dist/js && mkdir -p dist/js",
"cleanup:aigis": "rimraf public && mkdir -p public/aigis_assets",
"css:basis": "node-sass src/css/basis.scss dist/css/basis.min.css && postcss -r dist/css/basis.min.css -c=postcss.config.js",
"css:basis-ie9": "node-sass src/css/plugin/basis-ie9/basis-ie9.scss dist/css/plugin/basis-ie9/basis-ie9.min.css && postcss -r dist/css/plugin/basis-ie9/basis-ie9.min.css -c=postcss.config.js",
"css": "npm run cleanup:css && npm-run-all -p css:*",
"js:basis": "webpack ./src/js/basis.js -o ./dist/js/ --output-filename basis.min.js --config webpack.config.js",
"js": "npm run cleanup:js && npm-run-all -p js:*",
"aigis:css:sass": "node-sass src/aigis/assets/css/style.scss -o public/aigis_assets/css",
"aigis:css:postcss": "postcss public/aigis_assets/css/style.css -o public/aigis_assets/css/style.min.css -c=postcss.config.js",
"aigis:css": "npm-run-all -s aigis:css:*",
"aigis-ie9:css": "node-sass src/aigis/assets/css/basis-ie9.scss public/aigis_assets/css/basis-ie9.min.css && postcss -r public/aigis_assets/css/basis-ie9.min.css -c=postcss.config.js",
"aigis:js": "webpack ./src/aigis/assets/js/app.js -o ./public/aigis_assets/js/ --output-filename app.min.js --config webpack.config.js",
"aigis": "npm run cleanup:aigis && aigis run -c src/aigis/aigis_config.yml && npm-run-all -p aigis:css aigis-ie9:css aigis:js",
"aigis": "npm run cleanup:aigis && aigis run -c src/aigis/aigis_config.yml && npm-run-all -p aigis:css aigis:js",
"browsersync": "npm run aigis && browser-sync start -s 'public' -f 'public'",
"zip": "rimraf basis.zip && rsync -a --exclude '.*' --exclude '/basis/' --exclude '/node_modules/' --exclude '/bin/' ./ basis && cd basis && cd ../ && zip -9 -qmr basis.zip basis"
},
Expand Down
1 change: 0 additions & 1 deletion src/aigis/assets/css/basis-ie9.scss

This file was deleted.

6 changes: 3 additions & 3 deletions src/aigis/assets/css/foundation/_foundation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ body {
}

a {
transition: background-color $_transition-duration $_transition-function-timing,
color $_transition-duration $_transition-function-timing;
color: _dark($color-primary);
transition: background-color #{ _var-transition-duration() } #{ _var-transition-function-timing() },
color #{ _var-transition-duration() } #{ _var-transition-function-timing() };
color: _var-dark-color-primary();
}

.hljs, pre {
Expand Down
3 changes: 0 additions & 3 deletions src/aigis/assets/css/layout/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
.#{$_prefix}l-footer {
padding: ($_base-line-height * 2) 0 0;
background-color: _dark($_color-text); // For IE11
background-color: _var-dark-color-text();
color: $_color-white; // For IE11
color: _var-color-white();

a {
color: $_color-gray; // For IE11
color: _var-color-gray();
}
}
2 changes: 0 additions & 2 deletions src/aigis/assets/css/layout/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
overflow: hidden;

&, a {
color: $_color-white; // For IE11
color: _var-color-white();
text-decoration: none;
}
Expand All @@ -24,7 +23,6 @@
transform: translateY(-50%);

&__bar {
background-color: $_color-white; // For IE11
background-color: _var-color-white();
}
}
Expand Down
5 changes: 1 addition & 4 deletions src/aigis/assets/css/object/component/_btn.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@
}

&--ghost {
border: 1px solid transparent;
border-color: $_color-white; // For IE11
border-color: _var-color-white();
border: 1px solid _var-color-white();
background-color: transparent;
}

&--launch, &--download, &--buy {
background-color: $color-primary;
color: $_color-white; // For IE11
color: _var-color-white();

@include _hover(lg) {
Expand Down
1 change: 0 additions & 1 deletion src/aigis/assets/css/object/component/_copyright.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
@include _padding(1, 0, 2);

a {
color: $_color-gray; // For IE11
color: _var-color-gray();
}
}
3 changes: 1 addition & 2 deletions src/aigis/assets/css/object/component/_drawer.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.#{$_prefix}l-body > .#{$_prefix}c-drawer {
background-color: $_color-text;
background-color: _var-color-text();
@include _padding(.5);
color: $_color-white; // For IE11
color: _var-color-white();

a {
Expand Down
4 changes: 1 addition & 3 deletions src/aigis/assets/css/object/component/_entry.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@

.#{$_prefix}c-entry__title {
@include _padding(0, 0, .25);
border-bottom: 1px solid transparent;
border-bottom-color: _light($_color-gray); // For IE11
border-bottom-color: _var-light-color-gray();
border-bottom: 1px solid _var-light-color-gray();
@include _padding(0, 0, .25);
}

Expand Down
2 changes: 0 additions & 2 deletions src/aigis/assets/css/object/component/_label.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
.#{$_prefix}c-label {
display: inline-block;
background-color: $_color-gray; // For IE11
background-color: _var-color-gray();
border-radius: 2px;
color: $_color-white; // For IE11
color: _var-color-white();
font-size: ($_base-font-size-px - 2);
line-height: 1;
Expand Down
1 change: 0 additions & 1 deletion src/aigis/assets/css/object/component/_meta.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@include _font-size-line-height($_base-font-size-px - 2);

&, a {
color: $_color-gray; // For IE11
color: _var-color-gray();
}
}
2 changes: 0 additions & 2 deletions src/aigis/assets/css/object/project/_local-nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
}

a[href] {
color: _light($_color-text); // For IE11
color: _var-light-color-text();
text-decoration: none;

Expand All @@ -24,7 +23,6 @@
}

a:not([href]) {
color: _lightest($_color-text); // For IE11
color: _var-lightest-color-text();
cursor: text;
text-decoration: none;
Expand Down
1 change: 0 additions & 1 deletion src/aigis/assets/css/object/project/_media.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
&__lead {
margin: 0;
padding: 0;
color: $_color-gray; // For IE11
color: _var-color-gray();
}

Expand Down
1 change: 0 additions & 1 deletion src/aigis/assets/css/object/project/_scroll-top.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
@include _square(48px);
overflow: hidden;
background-color: rgba( 0, 0, 0, .8 );
color: $_color-white; // For IE11
color: _var-color-white();
position: relative;

Expand Down
9 changes: 2 additions & 7 deletions src/aigis/assets/css/object/project/_show-grid.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
.#{$_prefix}p-show-grid {
&__item {
background-color: #00DAE6;
border-left: 1px solid transparent;
border-bottom: 1px solid transparent;
border-left-color: $_color-white; // For IE11
border-left-color: _var-color-white();
border-bottom-color: $_color-white; // For IE11
border-bottom-color: _var-color-white();
color: $_color-white; // For IE11
border-left: 1px solid _var-color-white();
border-bottom: 1px solid _var-color-white();
color: _var-color-white();
padding: 16px;

Expand Down
6 changes: 2 additions & 4 deletions src/aigis/assets/css/object/project/_table-of-contents.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@
@include _padding(0, 1);
background-color: #fafafa;
border: 1px solid transparent;
border-color: _lighter($_color-gray); // For IE11
border-color: _var_lighter-color-gray();
border-radius: $_border-radius;
border-radius: _var-border-radius();

&__item {
border-bottom: 1px solid transparent;
border-bottom-color: _lighter($_color-gray); // For IE11
border-bottom-color: _var-lighter-color-gray();

&:last-child {
Expand All @@ -20,7 +18,7 @@
> a {
display: block;
@include _padding(.5, 0);
color: $_color-text;
color: inherit;
text-decoration: none;

@include _hover(lg) {
Expand Down
2 changes: 1 addition & 1 deletion src/aigis/assets/css/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ $_prefix: '';
min-height: 150px;
}

@for $i from 10 through 500 {
@for $i from 10 through 200 {
.font-size-#{ $i }px {
@include _font-size-line-height(_strip-unit($i / $_base-font-size-px));

Expand Down
3 changes: 0 additions & 3 deletions src/aigis/template_ejs/_layout/_head.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
<link rel="stylesheet" href="<%= root %>aigis_assets/css/style.min.css">
<link rel="stylesheet" href="<%= root %>aigis_assets/css/theme.css">
<link rel="stylesheet" href="<%= root %>aigis_assets/css/highlight/okadia.css">
<!--[if lt IE 10]>
<link rel="stylesheet" href="/aigis_assets/css/plugin/basis-ie9/basis-ie9.min.css" />
<![endif]-->
<link href="//fonts.googleapis.com/css?family=Noto+Sans" rel="stylesheet" type="text/css">
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400" rel="stylesheet">
<link rel="shortcut icon" href="<%= root %>/aigis_assets/images/favicon.ico">
Expand Down
4 changes: 3 additions & 1 deletion src/css/basis-core.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@
@import 'core/function/size-prefix';
@import 'core/function/space';
@import 'core/function/strip-unit';
@import 'core/function/typography';

@import 'core/variable/typography';
@import 'core/variable/transition';
@import 'core/variable/border-radius';
@import 'core/variable/color';
@import 'core/variable/media-query';
@import 'core/variable/container';
@import 'core/variable/form';
@import 'core/variable/page-effect';
@import 'core/variable/transition';

@import 'core/var/background-color';
@import 'core/var/border-radius';
Expand All @@ -35,6 +36,7 @@
@import 'core/var/margin-scale';
@import 'core/var/space';
@import 'core/var/typography';
@import 'core/var/transition';

@import 'core/mixin/animation';
@import 'core/mixin/background-image';
Expand Down
1 change: 0 additions & 1 deletion src/css/core/abstract/_breadcrumbs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ Abstract breadcrumbs component
display: inline-block;
height: .4em;
width: .4em;
border-color: $_color-text;
border-color: _var-color-text();
border-style: solid;
border-width: 1px 1px 0 0;
Expand Down
4 changes: 0 additions & 4 deletions src/css/core/abstract/_checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Abstract checkbox component
display: inline-block;
cursor: pointer;
@include _form-control-base-border();
background-color: $_color-white; // For IE11
background-color: _var-color-white();
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .035);
@include _square(16px);
Expand All @@ -49,7 +48,6 @@ Abstract checkbox component
height: 8px;
width: 6px;
border-style: solid;
border-color: $_color-white; // For IE11
border-color: _var-color-white();
border-width: 0 2px 2px 0;
visibility: hidden;
Expand All @@ -68,11 +66,9 @@ Abstract checkbox component
}

&:disabled {
background-color: _lightest($_color-gray); // For IE11
background-color: _var-lightest-color-gray();

&::before {
border-color: _dark($_color-gray); // For IE11
border-color: _var-dark-color-gray();
}
}
Expand Down
Loading

0 comments on commit b833fa7

Please sign in to comment.