diff --git a/LICENSE b/LICENSE index 6eff6372..e76f0161 100644 --- a/LICENSE +++ b/LICENSE @@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/package/component/package.json b/package/component/package.json index 8d4a5237..87554c26 100644 --- a/package/component/package.json +++ b/package/component/package.json @@ -1,6 +1,6 @@ { "name": "@layui/layui-vue", - "version": "1.0.5-dev.8", + "version": "1.0.5-alpha.1", "author": "就眠儀式", "license": "MIT", "description": "a component library for Vue 3 base on layui-vue", diff --git a/package/component/src/component/table/index.vue b/package/component/src/component/table/index.vue index 98962385..ead74b2b 100644 --- a/package/component/src/component/table/index.vue +++ b/package/component/src/component/table/index.vue @@ -271,9 +271,8 @@ onMounted(() => { @@ -337,9 +336,8 @@ onMounted(() => { @@ -355,9 +353,8 @@ onMounted(() => { v-if="column.key == key" class="layui-table-cell" :style="{ - width: column.width, textAlign: column.align, - flex: column.width ? '0 0 auto' : '1', + flex: column.width ? '0 0 ' + column.width : '1', }" > {{ value }} diff --git a/package/document/src/assets/css/code.css b/package/document/src/assets/css/code.css index 70dc5f4a..7550dd72 100644 --- a/package/document/src/assets/css/code.css +++ b/package/document/src/assets/css/code.css @@ -2,10 +2,9 @@ code { margin: 0; border-radius: 3px; padding: 0.25rem 0.5rem; - font-family: var(--code-font-family); font-size: 0.85em; color: var(--c-text-light); - background-color: var(--code-inline-bg-color); + background-color: rgba(27, 31, 35, 0.05); } code .token.deleted { @@ -78,8 +77,8 @@ li > div[class*='language-'] { [class*='language-'] code { padding: 0; - line-height: var(--code-line-height); - font-size: var(--code-font-size); + line-height: 24px; + font-size: 14px; color: #000; background-color: #fafafa; } @@ -92,9 +91,8 @@ li > div[class*='language-'] { left: 0; padding: 1.25rem 0; width: 100%; - line-height: var(--code-line-height); - font-family: var(--code-font-family); - font-size: var(--code-font-size); + line-height: 24px; + font-size: 14px; user-select: none; overflow: hidden; } @@ -118,9 +116,8 @@ div[class*='language-'].line-numbers-mode { padding: 1.25rem 0; width: 3.5rem; text-align: center; - line-height: var(--code-line-height); - font-family: var(--code-font-family); - font-size: var(--code-font-size); + line-height: 24px; + font-size: 14px; color: #888; } diff --git a/package/document/src/assets/css/index.css b/package/document/src/assets/css/index.css index 9d3a638b..9f561255 100644 --- a/package/document/src/assets/css/index.css +++ b/package/document/src/assets/css/index.css @@ -1,6 +1,5 @@ @import './code.css'; @import './markdown.css'; -@import './vars.css'; .layui-menu-lg li { line-height: 32px; diff --git a/package/document/src/assets/css/vars.css b/package/document/src/assets/css/vars.css deleted file mode 100644 index 1db908c8..00000000 --- a/package/document/src/assets/css/vars.css +++ /dev/null @@ -1,12 +0,0 @@ -:root { - --c-white: #ffffff; - --c-black: #000000; -} - -:root { - --code-line-height: 24px; - --code-font-family: var(--font-family-mono); - --code-font-size: 14px; - --code-inline-bg-color: rgba(27, 31, 35, 0.05); - --code-bg-color: #282c34; -} \ No newline at end of file diff --git a/package/document/src/components/LayCode.vue b/package/document/src/components/LayCode.vue index e89aad88..a9900fa8 100644 --- a/package/document/src/components/LayCode.vue +++ b/package/document/src/components/LayCode.vue @@ -176,7 +176,7 @@ function handleScroll() { margin: 0 4px; height: 18px; border-radius: 2px; - background-color: var(--code-inline-bg-color); + background-color:rgba(27, 31, 35, 0.05); font-size: 12px; line-height: 18px; color: var(--c-text-light);