From 02ce9d53411566de695265ea8efb41092fc7bb45 Mon Sep 17 00:00:00 2001 From: rickcole Date: Thu, 30 Jul 2020 11:45:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96=E3=80=81?= =?UTF-8?q?=E5=85=B6=E4=BB=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/components/Doc.tsx | 4 ++-- examples/components/SchemaRender.jsx | 1 + examples/style.scss | 17 ++++++++++++----- scss/_variables.scss | 1 + scss/components/_page.scss | 3 ++- scss/components/form/_group.scss | 4 ++++ 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/examples/components/Doc.tsx b/examples/components/Doc.tsx index 854ed45ef..587c70247 100644 --- a/examples/components/Doc.tsx +++ b/examples/components/Doc.tsx @@ -652,9 +652,9 @@ export const docs = [ }, { label: 'Cards 卡片组', - path: '/docs/components/component', + path: '/docs/components/cards', getComponent: (location, cb) => - require(['../../docs/components/component.md'], doc => { + require(['../../docs/components/cards.md'], doc => { cb(null, makeMarkdownRenderer(doc)); }) }, diff --git a/examples/components/SchemaRender.jsx b/examples/components/SchemaRender.jsx index e417fe586..3ee20e2d2 100644 --- a/examples/components/SchemaRender.jsx +++ b/examples/components/SchemaRender.jsx @@ -187,6 +187,7 @@ export default function (schema) {
{showCode !== false ? ( a { // font-size: 16px; - // font-weight: 700; + font-weight: 700; font-size: 14px; color: #666; padding-left: 0; @@ -310,7 +310,7 @@ body { display: block; position: absolute; right: 20px; - top: 10px; + top: 5px; // color: #666; // &:hover { @@ -497,7 +497,7 @@ body { > .a-Page, > .cxd-Page, > .dark-Page { - padding: 0 45px; + padding: 0 35px; } } } @@ -580,10 +580,17 @@ body { &.visible { opacity: 1; z-index: 0; + z-index: 1; } } @include media-breakpoint-up(lg) { + // .a-Layout--boxed, + // .cxd-Layout--boxed, + // .dark-Layout--boxed { + // width: 75.75rem; + // } + .Doc { display: flex; flex-direction: row; diff --git a/scss/_variables.scss b/scss/_variables.scss index 866b368ba..2274fe574 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1335,6 +1335,7 @@ $Wizard-steps-bg--isComplete: #f1f5f9 !default; // Page $Page-aside-width: px2rem(200px) !default; +$Page-aside-maxWidth: px2rem(300px) !default; $Page-aside-bg: desaturate(darken($light, 3%), 2.5%) !default; $Page-content-paddingY: 0 !default; $Page-content-paddingX: 0 !default; diff --git a/scss/components/_page.scss b/scss/components/_page.scss index dd9b2d519..249108bfa 100644 --- a/scss/components/_page.scss +++ b/scss/components/_page.scss @@ -81,7 +81,8 @@ border: inherit; } - width: $Page-aside-width; + min-width: $Page-aside-width; + max-width: $Page-aside-maxWidth; border-right: $borderWidth solid $borderColor; } diff --git a/scss/components/form/_group.scss b/scss/components/form/_group.scss index a96da2451..9be525c86 100644 --- a/scss/components/form/_group.scss +++ b/scss/components/form/_group.scss @@ -91,6 +91,10 @@ width: 0; max-width: 100%; margin-bottom: 0; + + .#{$ns}TextControl { + min-width: unset; + } } @for $i from (1) through $Form--horizontal-columns {