[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/web-mode cdbd74b5e7: fix css fontifying issue
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/web-mode cdbd74b5e7: fix css fontifying issue |
|
Date: |
Tue, 31 May 2022 02:59:18 -0400 (EDT) |
branch: elpa/web-mode
commit cdbd74b5e71d78ca7cb0768771f38e7b764fa0ac
Author: fxbois <fxbois@gmail.com>
Commit: fxbois <fxbois@gmail.com>
fix css fontifying issue
#1243
---
issues/1238.css.html | 149 +++++++++++++++++++++++++++++++++++++++
issues/1238.html | 149 ---------------------------------------
issues/1243.vue | 194 +++++++++++++++++++++++++++++++++++++++++++++++++++
web-mode.el | 9 +--
4 files changed, 348 insertions(+), 153 deletions(-)
diff --git a/issues/1238.css.html b/issues/1238.css.html
new file mode 100644
index 0000000000..e61bd347f9
--- /dev/null
+++ b/issues/1238.css.html
@@ -0,0 +1,149 @@
+<style>
+ .black { color: #000000 }
+ .silver { color: #c0c0c0 }
+ .gray { color: #808080 }
+ .white { color: #ffffff }
+ .maroon { color: #800000 }
+ .red { color: #ff0000 }
+ .purple { color: #800080 }
+ .fuchsia { color: #ff00ff }
+ .green { color: #008000 }
+ .lime { color: #00ff00 }
+ .olive { color: #808000 }
+ .yellow { color: #ffff00 }
+ .navy { color: #000080 }
+ .blue { color: #0000ff }
+ .teal { color: #008080 }
+ .aqua { color: #00ffff }
+ .orange { color: #ffa500 }
+ .aliceblue { color: #f0f8ff }
+ .antiquewhite { color: #faebd7 }
+ .aquamarine { color: #7fffd4 }
+ .azure { color: #f0ffff }
+ .beige { color: #f5f5dc }
+ .bisque { color: #ffe4c4 }
+ .blanchedalmond { color: #ffebcd }
+ .blueviolet { color: #8a2be2 }
+ .brown { color: #a52a2a }
+ .burlywood { color: #deb887 }
+ .cadetblue { color: #5f9ea0 }
+ .chartreuse { color: #7fff00 }
+ .chocolate { color: #d2691e }
+ .coral { color: #ff7f50 }
+ .cornflowerblue { color: #6495ed }
+ .cornsilk { color: #fff8dc }
+ .crimson { color: #dc143c }
+ .cyan { color: #00ffff }
+ .darkblue { color: #00008b }
+ .darkcyan { color: #008b8b }
+ .darkgoldenrod { color: #b8860b }
+ .darkgray { color: #a9a9a9 }
+ .darkgreen { color: #006400 }
+ .darkgrey { color: #a9a9a9 }
+ .darkkhaki { color: #bdb76b }
+ .darkmagenta { color: #8b008b }
+ .darkolivegreen { color: #556b2f }
+ .darkorange { color: #ff8c00 }
+ .darkorchid { color: #9932cc }
+ .darkred { color: #8b0000 }
+ .darksalmon { color: #e9967a }
+ .darkseagreen { color: #8fbc8f }
+ .darkslateblue { color: #483d8b }
+ .darkslategray { color: #2f4f4f }
+ .darkslategrey { color: #2f4f4f }
+ .darkturquoise { color: #00ced1 }
+ .darkviolet { color: #9400d3 }
+ .deeppink { color: #ff1493 }
+ .deepskyblue { color: #00bfff }
+ .dimgray { color: #696969 }
+ .dimgrey { color: #696969 }
+ .dodgerblue { color: #1e90ff }
+ .firebrick { color: #b22222 }
+ .floralwhite { color: #fffaf0 }
+ .forestgreen { color: #228b22 }
+ .gainsboro { color: #dcdcdc }
+ .ghostwhite { color: #f8f8ff }
+ .gold { color: #ffd700 }
+ .goldenrod { color: #daa520 }
+ .greenyellow { color: #adff2f }
+ .grey { color: #808080 }
+ .honeydew { color: #f0fff0 }
+ .hotpink { color: #ff69b4 }
+ .indianred { color: #cd5c5c }
+ .indigo { color: #4b0082 }
+ .ivory { color: #fffff0 }
+ .khaki { color: #f0e68c }
+ .lavender { color: #e6e6fa }
+ .lavenderblush { color: #fff0f5 }
+ .lawngreen { color: #7cfc00 }
+ .lemonchiffon { color: #fffacd }
+ .lightblue { color: #add8e6 }
+ .lightcoral { color: #f08080 }
+ .lightcyan { color: #e0ffff }
+ .lightgoldenrodyellow { color: #fafad2 }
+ .lightgray { color: #d3d3d3 }
+ .lightgreen { color: #90ee90 }
+ .lightgrey { color: #d3d3d3 }
+ .lightpink { color: #ffb6c1 }
+ .lightsalmon { color: #ffa07a }
+ .lightseagreen { color: #20b2aa }
+ .lightskyblue { color: #87cefa }
+ .lightslategray { color: #778899 }
+ .lightslategrey { color: #778899 }
+ .lightsteelblue { color: #b0c4de }
+ .lightyellow { color: #ffffe0 }
+ .limegreen { color: #32cd32 }
+ .linen { color: #faf0e6 }
+ .magenta { color: #ff00ff }
+ .mediumaquamarine { color: #66cdaa }
+ .mediumblue { color: #0000cd }
+ .mediumorchid { color: #ba55d3 }
+ .mediumpurple { color: #9370db }
+ .mediumseagreen { color: #3cb371 }
+ .mediumslateblue { color: #7b68ee }
+ .mediumspringgreen { color: #00fa9a }
+ .mediumturquoise { color: #48d1cc }
+ .mediumvioletred { color: #c71585 }
+ .midnightblue { color: #191970 }
+ .mintcream { color: #f5fffa }
+ .mistyrose { color: #ffe4e1 }
+ .moccasin { color: #ffe4b5 }
+ .navajowhite { color: #ffdead }
+ .oldlace { color: #fdf5e6 }
+ .olivedrab { color: #6b8e23 }
+ .orangered { color: #ff4500 }
+ .orchid { color: #da70d6 }
+ .palegoldenrod { color: #eee8aa }
+ .palegreen { color: #98fb98 }
+ .paleturquoise { color: #afeeee }
+ .palevioletred { color: #db7093 }
+ .papayawhip { color: #ffefd5 }
+ .peachpuff { color: #ffdab9 }
+ .peru { color: #cd853f }
+ .pink { color: #ffc0cb }
+ .plum { color: #dda0dd }
+ .powderblue { color: #b0e0e6 }
+ .rosybrown { color: #bc8f8f }
+ .royalblue { color: #4169e1 }
+ .saddlebrown { color: #8b4513 }
+ .salmon { color: #fa8072 }
+ .sandybrown { color: #f4a460 }
+ .seagreen { color: #2e8b57 }
+ .seashell { color: #fff5ee }
+ .sienna { color: #a0522d }
+ .skyblue { color: #87ceeb }
+ .slateblue { color: #6a5acd }
+ .slategray { color: #708090 }
+ .slategrey { color: #708090 }
+ .snow { color: #fffafa }
+ .springgreen { color: #00ff7f }
+ .steelblue { color: #4682b4 }
+ .tan { color: #d2b48c }
+ .thistle { color: #d8bfd8 }
+ .tomato { color: #ff6347 }
+ .turquoise { color: #40e0d0 }
+ .violet { color: #ee82ee }
+ .wheat { color: #f5deb3 }
+ .whitesmoke { color: #f5f5f5 }
+ .yellowgreen { color: #9acd32 }
+</style>
diff --git a/issues/1238.html b/issues/1238.html
deleted file mode 100644
index 9215e619d1..0000000000
--- a/issues/1238.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<style>
- .black { color: #000000 }
- .silver { color: #c0c0c0 }
- .gray { color: #808080 }
- .white { color: #ffffff }
- .maroon { color: #800000 }
- .red { color: #ff0000 }
- .purple { color: #800080 }
- .fuchsia { color: #ff00ff }
- .green { color: #008000 }
- .lime { color: #00ff00 }
- .olive { color: #808000 }
- .yellow { color: #ffff00 }
- .navy { color: #000080 }
- .blue { color: #0000ff }
- .teal { color: #008080 }
- .aqua { color: #00ffff }
- .orange { color: #ffa500 }
- .aliceblue { color: #f0f8ff }
- .antiquewhite { color: #faebd7 }
- .aquamarine { color: #7fffd4 }
- .azure { color: #f0ffff }
- .beige { color: #f5f5dc }
- .bisque { color: #ffe4c4 }
- .blanchedalmond { color: #ffebcd }
- .blueviolet { color: #8a2be2 }
- .brown { color: #a52a2a }
- .burlywood { color: #deb887 }
- .cadetblue { color: #5f9ea0 }
- .chartreuse { color: #7fff00 }
- .chocolate { color: #d2691e }
- .coral { color: #ff7f50 }
- .cornflowerblue { color: #6495ed }
- .cornsilk { color: #fff8dc }
- .crimson { color: #dc143c }
- .cyan { color: #00ffff }
- .darkblue { color: #00008b }
- .darkcyan { color: #008b8b }
- .darkgoldenrod { color: #b8860b }
- .darkgray { color: #a9a9a9 }
- .darkgreen { color: #006400 }
- .darkgrey { color: #a9a9a9 }
- .darkkhaki { color: #bdb76b }
- .darkmagenta { color: #8b008b }
- .darkolivegreen { color: #556b2f }
- .darkorange { color: #ff8c00 }
- .darkorchid { color: #9932cc }
- .darkred { color: #8b0000 }
- .darksalmon { color: #e9967a }
- .darkseagreen { color: #8fbc8f }
- .darkslateblue { color: #483d8b }
- .darkslategray { color: #2f4f4f }
- .darkslategrey { color: #2f4f4f }
- .darkturquoise { color: #00ced1 }
- .darkviolet { color: #9400d3 }
- .deeppink { color: #ff1493 }
- .deepskyblue { color: #00bfff }
- .dimgray { color: #696969 }
- .dimgrey { color: #696969 }
- .dodgerblue { color: #1e90ff }
- .firebrick { color: #b22222 }
- .floralwhite { color: #fffaf0 }
- .forestgreen { color: #228b22 }
- .gainsboro { color: #dcdcdc }
- .ghostwhite { color: #f8f8ff }
- .gold { color: #ffd700 }
- .goldenrod { color: #daa520 }
- .greenyellow { color: #adff2f }
- .grey { color: #808080 }
- .honeydew { color: #f0fff0 }
- .hotpink { color: #ff69b4 }
- .indianred { color: #cd5c5c }
- .indigo { color: #4b0082 }
- .ivory { color: #fffff0 }
- .khaki { color: #f0e68c }
- .lavender { color: #e6e6fa }
- .lavenderblush { color: #fff0f5 }
- .lawngreen { color: #7cfc00 }
- .lemonchiffon { color: #fffacd }
- .lightblue { color: #add8e6 }
- .lightcoral { color: #f08080 }
- .lightcyan { color: #e0ffff }
- .lightgoldenrodyellow { color: #fafad2 }
- .lightgray { color: #d3d3d3 }
- .lightgreen { color: #90ee90 }
- .lightgrey { color: #d3d3d3 }
- .lightpink { color: #ffb6c1 }
- .lightsalmon { color: #ffa07a }
- .lightseagreen { color: #20b2aa }
- .lightskyblue { color: #87cefa }
- .lightslategray { color: #778899 }
- .lightslategrey { color: #778899 }
- .lightsteelblue { color: #b0c4de }
- .lightyellow { color: #ffffe0 }
- .limegreen { color: #32cd32 }
- .linen { color: #faf0e6 }
- .magenta { color: #ff00ff }
- .mediumaquamarine { color: #66cdaa }
- .mediumblue { color: #0000cd }
- .mediumorchid { color: #ba55d3 }
- .mediumpurple { color: #9370db }
- .mediumseagreen { color: #3cb371 }
- .mediumslateblue { color: #7b68ee }
- .mediumspringgreen { color: #00fa9a }
- .mediumturquoise { color: #48d1cc }
- .mediumvioletred { color: #c71585 }
- .midnightblue { color: #191970 }
- .mintcream { color: #f5fffa }
- .mistyrose { color: #ffe4e1 }
- .moccasin { color: #ffe4b5 }
- .navajowhite { color: #ffdead }
- .oldlace { color: #fdf5e6 }
- .olivedrab { color: #6b8e23 }
- .orangered { color: #ff4500 }
- .orchid { color: #da70d6 }
- .palegoldenrod { color: #eee8aa }
- .palegreen { color: #98fb98 }
- .paleturquoise { color: #afeeee }
- .palevioletred { color: #db7093 }
- .papayawhip { color: #ffefd5 }
- .peachpuff { color: #ffdab9 }
- .peru { color: #cd853f }
- .pink { color: #ffc0cb }
- .plum { color: #dda0dd }
- .powderblue { color: #b0e0e6 }
- .rosybrown { color: #bc8f8f }
- .royalblue { color: #4169e1 }
- .saddlebrown { color: #8b4513 }
- .salmon { color: #fa8072 }
- .sandybrown { color: #f4a460 }
- .seagreen { color: #2e8b57 }
- .seashell { color: #fff5ee }
- .sienna { color: #a0522d }
- .skyblue { color: #87ceeb }
- .slateblue { color: #6a5acd }
- .slategray { color: #708090 }
- .slategrey { color: #708090 }
- .snow { color: #fffafa }
- .springgreen { color: #00ff7f }
- .steelblue { color: #4682b4 }
- .tan { color: #d2b48c }
- .thistle { color: #d8bfd8 }
- .tomato { color: #ff6347 }
- .turquoise { color: #40e0d0 }
- .violet { color: #ee82ee }
- .wheat { color: #f5deb3 }
- .whitesmoke { color: #f5f5f5 }
- .yellowgreen { color: #9acd32 }
-</style>
diff --git a/issues/1243.vue b/issues/1243.vue
new file mode 100644
index 0000000000..96c6feabaf
--- /dev/null
+++ b/issues/1243.vue
@@ -0,0 +1,194 @@
+<script lang="ts">
+import { defineComponent, computed } from "vue";
+import useSignupStore from "../../stores/signup";
+import { TgInput, TgTitle } from "../common";
+
+export default defineComponent({
+ name: "SignupForm",
+ components: { TgInput, TgTitle },
+ setup() {
+ const store = useSignupStore();
+
+ const email = computed({
+ get(): string {
+ return store.email;
+ },
+ set(email: string): void {
+ store.email = email;
+ },
+ });
+
+ const firstName = computed({
+ get(): string {
+ return store.firstName;
+ },
+ set(firstName: string): void {
+ store.firstName = firstName;
+ },
+ });
+
+ const lastName = computed({
+ get(): string {
+ return store.lastName;
+ },
+ set(lastName: string): void {
+ store.lastName = lastName;
+ },
+ });
+
+ const password = computed({
+ get(): string {
+ return store.password;
+ },
+ set(password: string): void {
+ store.password = password;
+ },
+ });
+
+ const passwordConfirm = computed({
+ get(): string {
+ return store.passwordConfirm;
+ },
+ set(password: string): void {
+ store.passwordConfirm = password;
+ },
+ });
+
+ const errors = computed(() => store.errors);
+
+ const loading = computed(() => store.loading);
+
+ async function registerUser(): Promise<any> {
+ await store.signup();
+ }
+
+ return {
+ email,
+ firstName,
+ lastName,
+ password,
+ passwordConfirm,
+ loading,
+ errors,
+ registerUser,
+ };
+ },
+});
+</script>
+
+<template>
+ <div class="block login-page__signup" data-cy="signup">
+ <TgTitle size="2" color="info-light" data-cy="signup__title">Sign
up</TgTitle>
+ <div class="block">
+ <form @submit.prevent="registerUser">
+ <TgInput
+ v-model="firstName"
+ name="first-name"
+ :class-name="'tg-signup-form'"
+ color="primary-dark"
+ required
+ placeholder="Jane"
+ data-cy="signup__first-name"
+ label="First name"
+ />
+ <TgInput
+ v-model="lastName"
+ name="last-name"
+ :class-name="'tg-signup-form'"
+ color="primary-dark"
+ required
+ placeholder="Doe"
+ label="Last name"
+ data-cy="signup__last-name"
+ />
+ <TgInput
+ v-model="email"
+ name="email"
+ :class-name="'tg-signup-form'"
+ color="primary-dark"
+ input-type="email"
+ required
+ placeholder="email@address.com"
+ :error-text="errors.email"
+ data-cy="signup__email"
+ label="Email"
+ />
+ <TgInput
+ v-model="password"
+ name="password"
+ color="primary-dark"
+ :class-name="'tg-signup-form'"
+ input-type="password"
+ required
+ placeholder="************"
+ label="Password"
+ :error-text="errors.password"
+ data-cy="signup__password"
+ />
+ <TgInput
+ v-model="passwordConfirm"
+ name="password-confirm"
+ :class-name="'tg-signup-form'"
+ color="primary-dark"
+ input-type="password"
+ required
+ placeholder="************"
+ label="Confirm password"
+ :error-text="errors.passwordConfirm"
+ data-cy="signup__password-confirm"
+ />
+ <div class="field">
+ <div class="control">
+ <button
+ class="button is-success is-fullwidth"
+ :class="{ 'is-loading': loading }"
+ :disabled="loading"
+ data-cy="signup__submit"
+ >
+ Sign up
+ </button>
+ </div>
+ </div>
+ </form>
+ </div>
+ <div class="block">
+ <p class="has-text-info-light" data-cy="signup__login">
+ Already have an account?
+ <router-link :to="{ name: 'login' }" class="has-text-success
login-page__signup"> Sign in </router-link>
+ </p>
+ </div>
+ </div>
+</template>
+
+<style lang="scss" scoped>
+@import "../../scss/fonts";
+@import "../../scss/colors";
+.tg-input {
+ &:deep(.tg-input__label) {
+ color: $white-ice;
+ }
+ &:deep(.input) {
+ color: $white-ice;
+ &:focus {
+ border-color: $green-atomic;
+ ~ .icon {
+ color: $white-ice !important;
+ }
+ }
+ }
+ &:deep(.has-background-primary-dark) {
+ border: 0.5px solid $grey-light;
+ &:focus {
+ color: $white-ice;
+ }
+ &::placeholder {
+ color: $white-ice;
+ opacity: 70%;
+ }
+ }
+}
+.button {
+ font-family: $family-medium;
+ font-weight: 800;
+}
+</style>
diff --git a/web-mode.el b/web-mode.el
index 82529991f5..6c2ff5c561 100644
--- a/web-mode.el
+++ b/web-mode.el
@@ -2,7 +2,7 @@
;; Copyright 2011-2022 François-Xavier Bois
-;; Version: 17.2.1
+;; Version: 17.2.2
;; Author: François-Xavier Bois
;; Maintainer: François-Xavier Bois <fxbois@gmail.com>
;; Package-Requires: ((emacs "23.1"))
@@ -23,7 +23,7 @@
;;---- CONSTS
------------------------------------------------------------------
-(defconst web-mode-version "17.2.1"
+(defconst web-mode-version "17.2.2"
"Web Mode version.")
;;---- GROUPS
------------------------------------------------------------------
@@ -6983,9 +6983,10 @@ Also return non-nil if it is the command
`self-insert-command' is remapped to."
(when (and dec-beg dec-end)
(goto-char dec-beg)
(while (and web-mode-enable-css-colorization
- (re-search-forward
"black\\|silver\\|gray\\|white\\|maroon\\|red\\|purple\\|fuchsia\\|green\\|lime\\|olive\\|yellow\\|navy\\|blue\\|teal\\|aqua\\|orange\\|aliceblue\\|antiquewhite\\|aquamarine\\|azure\\|beige\\|bisque\\|blanchedalmond\\|blueviolet\\|brown\\|burlywood\\|cadetblue\\|chartreuse\\|chocolate\\|coral\\|cornflowerblue\\|cornsilk\\|crimson\\|cyan\\|darkblue\\|darkcyan\\|darkgoldenrod\\|darkgray\\|darkgreen\\|darkgrey\\|darkkhaki\\|darkmagenta\\|darkolivegreen\\
[...]
+ (re-search-forward "\\([:
]\\(black\\|silver\\|gray\\|white\\|maroon\\|red\\|purple\\|fuchsia\\|green\\|lime\\|olive\\|yellow\\|navy\\|blue\\|teal\\|aqua\\|orange\\|aliceblue\\|antiquewhite\\|aquamarine\\|azure\\|beige\\|bisque\\|blanchedalmond\\|blueviolet\\|brown\\|burlywood\\|cadetblue\\|chartreuse\\|chocolate\\|coral\\|cornflowerblue\\|cornsilk\\|crimson\\|cyan\\|darkblue\\|darkcyan\\|darkgoldenrod\\|darkgray\\|darkgreen\\|darkgrey\\|darkkhaki\\|darkmagenta\\|darkol
[...]
;;(progn (message "%S %S" end (point)) t)
(<= (point) dec-end))
+ ;;(message "web-mode-colorize beg=%S end=%S match=%S" (match-beginning
0) (match-end 0) (buffer-substring-no-properties (match-beginning 0) (match-end
0)))
(web-mode-colorize (match-beginning 0) (match-end 0))
) ;while
) ;when
@@ -7008,7 +7009,7 @@ Also return non-nil if it is the command
`self-insert-command' is remapped to."
((string= (substring str 0 1) "#")
(setq plist (list :background str
:foreground (web-mode-colorize-foreground str))))
- ((or (string= (substring str 0 4) "rgb(") (string= (substring str 0 5)
"rgba("))
+ ((and (>= (length str) 5) (or (string= (substring str 0 4) "rgb(")
(string= (substring str 0 5) "rgba(")))
(setq str (format "#%02X%02X%02X"
(string-to-number (match-string-no-properties 1))
(string-to-number (match-string-no-properties 2))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [nongnu] elpa/web-mode cdbd74b5e7: fix css fontifying issue,
ELPA Syncer <=