Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
N
Neos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Neos
Commits
17edc027
Commit
17edc027
authored
Jul 24, 2024
by
Chunchi Che
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/build_deck' into 'main'
Fix build deck styles See merge request
!396
parents
bfeee3f7
5cb76936
Pipeline
#28647
passed with stages
in 14 minutes and 23 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
11 deletions
+18
-11
package-lock.json
package-lock.json
+6
-6
src/ui/BuildDeck/index.tsx
src/ui/BuildDeck/index.tsx
+1
-1
src/ui/Duel/PlayMat/css.ts
src/ui/Duel/PlayMat/css.ts
+6
-4
src/ui/Layout/index.tsx
src/ui/Layout/index.tsx
+5
-0
No files found.
package-lock.json
View file @
17edc027
...
...
@@ -2794,9 +2794,9 @@
}
},
"node_modules/caniuse-lite"
:
{
"version"
:
"1.0.30001
587
"
,
"resolved"
:
"https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001
587
.tgz"
,
"integrity"
:
"sha512-
HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA
=="
,
"version"
:
"1.0.30001
643
"
,
"resolved"
:
"https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001
643
.tgz"
,
"integrity"
:
"sha512-
ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg
=="
,
"funding"
:
[
{
"type"
:
"opencollective"
,
...
...
@@ -9153,9 +9153,9 @@
"dev"
:
true
},
"caniuse-lite"
:
{
"version"
:
"1.0.30001
587
"
,
"resolved"
:
"https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001
587
.tgz"
,
"integrity"
:
"sha512-
HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA
=="
"version"
:
"1.0.30001
643
"
,
"resolved"
:
"https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001
643
.tgz"
,
"integrity"
:
"sha512-
ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg
=="
},
"chalk"
:
{
"version"
:
"4.1.2"
,
...
...
src/ui/BuildDeck/index.tsx
View file @
17edc027
...
...
@@ -242,7 +242,7 @@ export const DeckEditor: React.FC<{
<
Space
className=
{
styles
.
title
}
>
<
Input
placeholder=
{
i18n
(
"
EnterTheDeckName
"
)
}
bordered=
{
false
}
variant=
"borderless"
prefix=
{
<
EditOutlined
/>
}
style=
{
{
width
:
"
8.8rem
"
}
}
onChange=
{
(
e
)
=>
setDeckName
(
e
.
target
.
value
)
}
...
...
src/ui/Duel/PlayMat/css.ts
View file @
17edc027
...
...
@@ -67,6 +67,12 @@ const matConfigWithUnit = Object.entries(_matConfigWithUnit).map(
([
k
,
[
value
,
unit
]])
=>
[
k
,
pxTransform
(
value
,
unit
)
as
[
number
,
UNIT
]],
)
satisfies
CSSConfig
;
export
function
setCssProperties
()
{
toCssProperties
(
matConfigWithUnit
).
forEach
(([
k
,
v
])
=>
{
document
.
body
.
style
.
setProperty
(
k
,
v
);
});
}
export
const
matConfig
=
matConfigWithUnit
.
reduce
(
(
prev
,
[
key
,
value
])
=>
({
...
prev
,
...
...
@@ -75,7 +81,3 @@ export const matConfig = matConfigWithUnit.reduce(
}),
{}
as
Record
<
keyof
typeof
_matConfigWithUnit
,
number
>
,
);
toCssProperties
(
matConfigWithUnit
).
forEach
(([
k
,
v
])
=>
{
document
.
body
.
style
.
setProperty
(
k
,
v
);
});
src/ui/Layout/index.tsx
View file @
17edc027
...
...
@@ -40,6 +40,7 @@ import {
initSuper
,
initWASM
,
}
from
"
./utils
"
;
import
{
setCssProperties
}
from
"
../Duel/PlayMat/css
"
;
const
NeosConfig
=
useConfig
();
...
...
@@ -51,6 +52,10 @@ export const loader: LoaderFunction = async () => {
initForbidden
();
initI18N
();
initSuper
();
// set some styles
setCssProperties
();
return
null
;
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment