Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(1.1): update markdown editor style #763

Merged
merged 5 commits into from
Jul 28, 2021

Conversation

laojun
Copy link
Contributor

@laojun laojun commented Jul 27, 2021

What this PR does / why we need it:

fix(1.1): update markdown editor style

Does this PR introduce a user interface change?

✅ Yes(screenshot is required)

Kapture 2021-07-27 at 23 07 31

ChangeLog

Language Changelog
🇺🇸 English update markdown editor style
🇨🇳 中文 修改markdown编辑器样式

Which versions should be patched?

/cherry-pick release/1.1

Which issue(s) this PR fixes:

Fixes #

@laojun laojun added dop DevOps platform bugfix Used in pr labels Jul 27, 2021
@daskyrk
Copy link
Contributor

daskyrk commented Jul 28, 2021

/approve

@erda-bot erda-bot added the approved Auto tagged by robot label Jul 28, 2021
@erda-bot erda-bot merged commit bbe91c4 into erda-project:master Jul 28, 2021
@daskyrk
Copy link
Contributor

daskyrk commented Jul 28, 2021

/cherry-pick release/1.1

@erda-bot
Copy link
Member

Automated cherry pick failed, please resolve the confilcts and create PR manually.
Details:

Auto-merging shell/app/modules/application/pages/settings/components/app-notify/notify-config.tsx
CONFLICT (content): Merge conflict in shell/app/modules/application/pages/settings/components/app-notify/notify-config.tsx
Auto-merging shell/app/common/components/edit-field.tsx
diff --cc shell/app/modules/application/pages/settings/components/app-notify/notify-config.tsx
index 49f6d6a6,4c1523e5..00000000
--- a/shell/app/modules/application/pages/settings/components/app-notify/notify-config.tsx
+++ b/shell/app/modules/application/pages/settings/components/app-notify/notify-config.tsx
@@@ -218,9 -218,10 +218,14 @@@ export const NotifyConfig = ({ commonPa
        dataIndex: ['notifyGroup', 'targets'],
        ellipsis: true,
        className: 'notify-info',
 -      width: 200,
        render: (targets) => (
++<<<<<<< HEAD
 +        <div className="flex-box">
 +          <ListTargets targets={targets} roleMap={roleMap} />
++=======
+         <div className="flex-box truncate">
+           <ListTargets targets={targets || []} roleMap={roleMap} />
++>>>>>>> bbe91c4a (fix(1.1): update markdown editor style (#763))
          </div>
        ),
      },

@laojun laojun deleted the hotfix/zxj-refactor-md-editor branch August 11, 2021 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Auto tagged by robot bugfix Used in pr dop DevOps platform
Development

Successfully merging this pull request may close these issues.

3 participants