Skip to content

Commit

Permalink
Merge branch 'master' into akb-keyboard
Browse files Browse the repository at this point in the history
  • Loading branch information
srish authored Oct 2, 2024
2 parents e753ceb + 5fbbe17 commit 847a86c
Show file tree
Hide file tree
Showing 42 changed files with 4,941 additions and 2,109 deletions.
6 changes: 3 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
"extends": [
"wikimedia/client",
"wikimedia/jquery",
"wikimedia/jsduck"
"wikimedia/jsdoc"
],
"globals": {
"jQuery": "readonly",
"$": "off"
},
"rules": {
"camelcase": [ "error", { "allow": [ "patterns_x", "patterns_shift" ] } ],
"comma-spacing": "off",
"indent": "off",
"max-len": "off"
"max-len": "off",
"no-var": "off"
}
}
2 changes: 1 addition & 1 deletion .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
node-version: [12.x, 14.x, 16.x, 17.x]
node-version: [16.x, 17.x, 18.x]

steps:
- uses: actions/checkout@v2
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
node_modules/
dist/
.eslintcache
rules/jv/jv-transliteration - Copy.js
31 changes: 11 additions & 20 deletions css/jquery.ime.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
.imeselector {
position: absolute;
/* @embed */
background: url( ../images/ime-active.png ) no-repeat left center;
/* @embed */
background-image: -webkit-linear-gradient( transparent, transparent ), url( ../images/ime-active.svg );
/* @embed */
background-image: linear-gradient( transparent, transparent ), url( ../images/ime-active.svg );
background-image: url( ../images/ime-active.svg );
background-color: rgba( 255, 255, 255, 0.75 );
background-position: left 3px center;
background-repeat: no-repeat;
min-height: 15px;
font-size: small;
padding: 2px 2px 1px 20px;
Expand Down Expand Up @@ -85,8 +82,6 @@ span.ime-disable-shortcut {

.imeselector-menu {
background-color: #fff;
-webkit-background-clip: padding-box;
-moz-background-clip: padding-box;
background-clip: padding-box;
position: absolute;
top: 14px;
Expand All @@ -98,8 +93,6 @@ span.ime-disable-shortcut {
padding: 0;
border: 1px solid #a2a9b1;
border-radius: 2px;
-webkit-box-shadow: 0 5px 10px rgba( 0, 0, 0, 0.2 );
-moz-box-shadow: 0 5px 10px rgba( 0, 0, 0, 0.2 );
box-shadow: 0 5px 10px rgba( 0, 0, 0, 0.2 );
text-align: left;
}
Expand All @@ -116,7 +109,7 @@ span.ime-disable-shortcut {
}

/* The triangle shaped callout */
.imeselector-menu:before {
.imeselector-menu::before {
border-bottom: 7px solid #a2a9b1;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
Expand All @@ -127,12 +120,12 @@ span.ime-disable-shortcut {
top: -7px;
}

.imeselector-menu.ime-right:before {
.imeselector-menu.ime-right::before {
right: auto;
left: 9px;
}

.imeselector-menu:after {
.imeselector-menu::after {
border-bottom: 6px solid #fff;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
Expand All @@ -143,19 +136,19 @@ span.ime-disable-shortcut {
top: -6px;
}

.imeselector-menu.ime-right:after {
.imeselector-menu.ime-right::after {
right: auto;
left: 10px;
}

.imeselector-menu.ime-position-top:before {
.imeselector-menu.ime-position-top::before {
border-bottom: 0;
border-top: 7px solid #a2a9b1;
top: auto;
bottom: -7px;
}

.imeselector-menu.ime-position-top:after {
.imeselector-menu.ime-position-top::after {
border-bottom: 0;
border-top: 6px solid #fff;
top: auto;
Expand All @@ -164,11 +157,9 @@ span.ime-disable-shortcut {

.imeselector-menu .ime-checked {
/* @embed */
background: url( ../images/tick.png ) no-repeat left 4px center;
/* @embed */
background-image: -webkit-linear-gradient( transparent, transparent ), url( ../images/tick.svg );
/* @embed */
background-image: linear-gradient( transparent, transparent ), url( ../images/tick.svg );
background-image: url( ../images/tick.svg );
background-position: left 4px center;
background-repeat: no-repeat;
}

.imeselector-menu .ime-help-link {
Expand Down
Binary file removed images/ime-active.png
Binary file not shown.
Binary file removed images/tick.png
Binary file not shown.
Loading

0 comments on commit 847a86c

Please sign in to comment.