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

背景色を持つ親要素やテキストカラーを持つ要素のtext-decoration-colorを修正 #1130

Merged
merged 8 commits into from
May 15, 2024
Merged

背景色を持つ親要素やテキストカラーを持つ要素のtext-decoration-colorを修正 #1130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a1ae02
背景色を持つ親要素やテキストカラーを持つ要素のtext-decoration-colorを修正
goutetsuguma Apr 1, 2024
c5df8f9
readme追加
goutetsuguma Apr 1, 2024
7d2336e
Merge branch 'master' into fix/has_text-decoration-color
kurudrive Apr 2, 2024
365f3a8
ビルドがうまくいかないので各種調整
kurudrive Apr 2, 2024
a9bfe5d
Merge pull request #1134 from vektor-inc/fix/build-version
kurudrive Apr 2, 2024
5f405df
Merge branch 'master' into fix/has_text-decoration-color
kurudrive May 15, 2024
50d4492
buupdate readme
kurudrive May 15, 2024
643e242
build
kurudrive May 15, 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
2 changes: 1 addition & 1 deletion _g2/assets/css/common.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _g2/assets/css/common_editor.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _g2/design-skin/origin/css/editor.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _g2/design-skin/origin/css/style.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _g2/library/bootstrap-4/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _g2/plugin-support/woocommerce/css/woo.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions _g3/assets/_scss/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ a {
text-decoration: none;
}
}
// `has-black-background-color` クラスを持つ親要素、または `has-text-color` クラスを持つ要素の場合
.has-black-background-color &, .has-text-color & {
text-decoration-color: currentColor;
}
}

p {
Expand Down
2 changes: 1 addition & 1 deletion _g3/assets/_scss/style-theme-json.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "../css/style";
@import "style";
@import "common-theme-json";
16 changes: 8 additions & 8 deletions _g3/assets/_scss/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@import "@bootstrap/functions";
@import "../../../node_modules/bootstrap/scss/functions";
@import "bootstrap_variables";
@import "@bootstrap/mixins";
@import "@bootstrap/utilities";
@import "@bootstrap/grid";
@import "@bootstrap/buttons";
@import "@bootstrap/card";
@import "@bootstrap/alert";
@import "@bootstrap/media";
@import "../../../node_modules/bootstrap/scss/mixins";
@import "../../../node_modules/bootstrap/scss/utilities";
@import "../../../node_modules/bootstrap/scss/grid";
@import "../../../node_modules/bootstrap/scss/buttons";
@import "../../../node_modules/bootstrap/scss/card";
@import "../../../node_modules/bootstrap/scss/alert";
@import "../../../node_modules/bootstrap/scss/media";
@import "../../inc/vk-components/package/_scss/vk-components.scss";
@import "variables";
@import "common";
Expand Down
2 changes: 1 addition & 1 deletion _g3/assets/css/editor.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _g3/assets/css/style-theme-json.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _g3/assets/css/style.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _g3/plugin-support/woocommerce/css/woo.css
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions gulpfile.js → gulpfile.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
const gulp = require('gulp')

const replace = require('gulp-replace')

import gulp from 'gulp';
import replace from 'gulp-replace';
// ファイルリネーム（.min作成用）
const rename = require('gulp-rename')

import rename from 'gulp-rename';
// エラーでも監視を続行させる
const plumber = require('gulp-plumber')
const sass = require('gulp-sass')(require('sass'));
const autoprefixer = require('gulp-autoprefixer')
const cleanCss = require('gulp-clean-css')
const cmq = require('gulp-merge-media-queries')
var sourcemaps = require('gulp-sourcemaps');
const aliases = require('gulp-style-aliases')
import plumber from 'gulp-plumber';
import sassModule from 'gulp-sass';
import autoprefixer from 'gulp-autoprefixer';
import cleanCss from 'gulp-clean-css';
import cmq from 'gulp-merge-media-queries';
import sourcemaps from 'gulp-sourcemaps';
import aliases from 'gulp-style-aliases';
import nodeSass from 'sass';

const sass = sassModule(nodeSass);

let error_stop = true

Expand Down
Loading
Loading