From f1f3a978d6fecb1c4ad76e2b94229db7a50dab8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Tue, 30 Jul 2024 17:20:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9BCSS=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/brown-button.svg | 24 ++++++++++++++++ images/qrcode-solid.svg | 1 - multi.html | 4 +-- service-worker.js | 16 +++++------ solo.html | 4 +-- style.css | 63 ++++++++++++++++++++++++++++++----------- triple.html | 4 +-- 7 files changed, 85 insertions(+), 31 deletions(-) create mode 100644 images/brown-button.svg delete mode 100644 images/qrcode-solid.svg diff --git a/images/brown-button.svg b/images/brown-button.svg new file mode 100644 index 00000000..d38e9a0d --- /dev/null +++ b/images/brown-button.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/images/qrcode-solid.svg b/images/qrcode-solid.svg deleted file mode 100644 index c9084cca..00000000 --- a/images/qrcode-solid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/multi.html b/multi.html index d206b06d..341fe1ac 100644 --- a/multi.html +++ b/multi.html @@ -1333,12 +1333,12 @@ const teamsCount = 2; diff --git a/service-worker.js b/service-worker.js index 31921959..12c23293 100644 --- a/service-worker.js +++ b/service-worker.js @@ -32319,7 +32319,7 @@ const cachesMap = new Map([ ], [ "multi.html", - "bb15813a2d41f033c3fdb7025013c736" + "fd2b53625690be01261bfca3d51c8117" ], [ "script-custom_elements.js", @@ -32343,7 +32343,7 @@ const cachesMap = new Map([ ], [ "solo.html", - "2dcab635615804115b8e8957b8c08e53" + "6b624264a58a0e472b20a16665a52451" ], [ "style-fix-html2canvas.css", @@ -32355,7 +32355,7 @@ const cachesMap = new Map([ ], [ "style.css", - "0e204f36b14c7bc9f0888332e49de02e" + "6e0b1b09be269f87c1f79b9a0055f048" ], [ "temp.js", @@ -32363,7 +32363,7 @@ const cachesMap = new Map([ ], [ "triple.html", - "1e72d25c59a9caedcf697d11b034644b" + "3135d15a58be52158f3833aef9bb322a" ], [ "languages/en.css", @@ -32433,6 +32433,10 @@ const cachesMap = new Map([ "images/badge.png", "e99e7cbd977fce0f5c49339b15e3a25a" ], + [ + "images/brown-button.svg", + "ddc77250f71df8f5e7a17e348aa7140f" + ], [ "images/card-frame-any.png", "1f45308d1742b8c2f069fe4f417f5536" @@ -32565,10 +32569,6 @@ const cachesMap = new Map([ "images/icon.png", "5e6359d908e471761726c927a8376dbf" ], - [ - "images/qrcode-solid.svg", - "38557995b8cafaf50c16274030c8141d" - ], [ "images/slate.svg", "a849d2c4da127188ce892cea2b60cfee" diff --git a/solo.html b/solo.html index c76add26..59bb7b41 100644 --- a/solo.html +++ b/solo.html @@ -1071,12 +1071,12 @@ const teamsCount = 1; diff --git a/style.css b/style.css index 17fbf5e6..9a582540 100644 --- a/style.css +++ b/style.css @@ -449,21 +449,25 @@ ul{ } .brown-button { - display: inline-block; + display: inline-flex; + align-items: center; + align-content: center; + justify-items: center; + justify-content: center; box-sizing: border-box; min-width: 100px; padding: 5px; background-color: #956A42; background-image: url(images/slate.svg); background-size: 120px 120px; + background-clip: padding-box; border-style: solid; - border-width: 2px; - border-image: linear-gradient(to bottom,#C38E5F,#2F2008) 1; - border-radius: 5px; - clip-path: inset(0 round 5px); + border-radius: 3px; + border-width: 5px; + border-image-source: url(images/brown-button.svg); + border-image-slice: 15%; font-size: 1.5em; line-height: 1em; - vertical-align: middle; color: white; font-family: var(--game-font-family); text-shadow: black 2px 2px 0; @@ -1624,8 +1628,8 @@ body:not(.solo) .awoken-icon[data-awoken-icon="64"]::after #form-id-search, #form-string-search { box-sizing: border-box; - border: #000000AA solid 1px; - background-color: white; + border: rgba(0,0,0,0.5) solid 1px; + background-color: rgb(255,255,255); border-radius: 3px; display: grid; align-items: center; @@ -1651,11 +1655,35 @@ label[for="search-string"]::before { box-sizing: border-box; width: 100%; height: 100%; + grid-column: 1 / 3; + grid-row: 1; + padding-left: calc(1.5em); +} +label[for="card-id"] { + grid-column: 1; + grid-row: 1; + cursor: default; } #search-string{ background: none; border: none; box-sizing: border-box; + grid-column: 1 / 4; + grid-row: 1; + padding: 0 calc(1em + 6px); +} +label[for="search-string"] { + grid-column: 1; + grid-row: 1; + cursor: default; +} +#search-by-string{ + grid-column: 3; + grid-row: 1; + border-radius: 3px; +} +#form-string-search:focus { + outline: 4px dashed darkorange; } #search-by-string{ background: none; @@ -2125,9 +2153,6 @@ label[for="search-string"]::before { vertical-align: bottom; grid-gap: 1px; } -.selected-awokens-div .awoken-clear { - font-size: 1em; -} /*.search-box .awoken-div::before{ content: "觉醒"; }*/ @@ -2154,15 +2179,18 @@ label[for="search-string"]::before { background-position-y: 40px; padding: 0; vertical-align: bottom; + border-width: 3px; + font-size: 1em; + line-height: 1em; } .search-box :where( .rare-clear, .special-add, .special-clear, - .special-star + .special-star, + #attr-clear, + .awoken-clear, ) { - font-size: 1em; - line-height: 1em; } @keyframes awoken-appear { @@ -2355,9 +2383,13 @@ input[disabled]+.awoken-icon:active, margin-right: 3px; display: grid; gap: 2px; - grid-template-columns: minmax(100px, max-content) auto 35px 35px 35px 35px; + grid-template-columns: max-content minmax(100px, auto) max-content max-content max-content max-content; max-width: 100%; } +.special-filter-list>li:hover { + outline: #FFDA70 solid 2px; + border-radius: 3px; +} .special-filter-list :where(select, button) { font-size: 1em; } @@ -3118,7 +3150,6 @@ a.series-search::before { .edit-box .button-box .button-done{ box-sizing: border-box; font-size: 1.5em; - border-width: 4px; } .edit-box .button-box .button-cancel{ grid-column: 4 / 5; diff --git a/triple.html b/triple.html index a3591334..af1eeadc 100644 --- a/triple.html +++ b/triple.html @@ -2016,12 +2016,12 @@ const teamsCount = 3;