diff --git a/app/src/assets/scss/business/_history.scss b/app/src/assets/scss/business/_history.scss index a840f6539..8f8ef4fa8 100644 --- a/app/src/assets/scss/business/_history.scss +++ b/app/src/assets/scss/business/_history.scss @@ -17,13 +17,6 @@ box-sizing: border-box; border-radius: 0 0 4px 4px; overflow: hidden; - - .b3-chip--secondary { - padding: 0 8px; - font-size: 12px; - line-height: 16px; - margin-right: 8px; - } } &__repoheader { diff --git a/app/src/assets/scss/component/_chip.scss b/app/src/assets/scss/component/_chip.scss index d032378f0..85dec1489 100644 --- a/app/src/assets/scss/component/_chip.scss +++ b/app/src/assets/scss/component/_chip.scss @@ -3,18 +3,34 @@ a.b3-chip:hover { background-color: #ea4aaa; } +.b3-chips { + display: flex; + padding: 4px; + + .b3-chip { + margin: 4px; + } +} + .b3-chip { background-color: var(--b3-list-hover); color: var(--b3-theme-on-background); - line-height: 32px; + line-height: 16px; font-weight: 400; + font-size: 0.8125rem; display: inline-flex; align-items: center; box-sizing: border-box; - padding: 0 16px; + padding: 8px 12px; border-radius: 16px; transition: var(--b3-transition); + &--small { + padding: 0 8px; + font-size: 12px; + line-height: 16px; + } + &--secondary { background-color: var(--b3-theme-secondary); color: var(--b3-theme-on-secondary); @@ -26,9 +42,9 @@ a.b3-chip:hover { } svg { - margin-right: 4px; - margin-left: -4px; - height: 14px; - width: 14px; + margin-right: 6px; + margin-left: -5px; + height: 16px; + width: 16px; } } diff --git a/app/src/assets/scss/component/_select.scss b/app/src/assets/scss/component/_select.scss index f0f36a101..d12b88e65 100644 --- a/app/src/assets/scss/component/_select.scss +++ b/app/src/assets/scss/component/_select.scss @@ -1,9 +1,9 @@ .b3-select { border: 0; border-radius: 4px; - padding: 4px 8px; - line-height: 20px; + padding: 4px 26px 4px 8px; box-sizing: border-box; + line-height: 20px; color: var(--b3-theme-on-background); transition: box-shadow 120ms 0ms cubic-bezier(0, 0, 0.2, 1), background-color .2s cubic-bezier(0, 0, .2, 1) 0ms; min-width: 200px; diff --git a/app/src/config/account.ts b/app/src/config/account.ts index cf44d279b..ee1f31c76 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -45,9 +45,9 @@ ${window.siyuan.languages.account2} if (window.siyuan.user) { let userTitlesHTML = ""; if (window.siyuan.user.userTitles.length > 0) { - userTitlesHTML = '
'; + userTitlesHTML = '
'; window.siyuan.user.userTitles.forEach((item) => { - userTitlesHTML += `
${item.icon} ${item.name}
`; + userTitlesHTML += `
${item.icon} ${item.name}
`; }); userTitlesHTML += "
"; } diff --git a/app/src/history/history.ts b/app/src/history/history.ts index 3b56f7774..134d3a65e 100644 --- a/app/src/history/history.ts +++ b/app/src/history/history.ts @@ -102,7 +102,7 @@ const renderRepoItem = (response: IWebSocketData, element: Element, type: string repoHTML += `
  • ${escapeHtml(item.memo)} - ${item.tag} + ${item.tag}
    ${item.hCreated} @@ -116,7 +116,7 @@ const renderRepoItem = (response: IWebSocketData, element: Element, type: string
    ${escapeHtml(item.memo)} - ${item.tag} + ${item.tag}
    ${item.hCreated} diff --git a/app/src/mobile/util/menu.ts b/app/src/mobile/util/menu.ts index c3b27ce1f..fea3bfbfd 100644 --- a/app/src/mobile/util/menu.ts +++ b/app/src/mobile/util/menu.ts @@ -21,9 +21,9 @@ import {activeBlur, hideKeyboardToolbar} from "./keyboardToolbar"; const showAccountInfo = (modelElement: HTMLElement, modelMainElement: Element) => { let userTitlesHTML = ""; if (window.siyuan.user.userTitles.length > 0) { - userTitlesHTML = '
    '; + userTitlesHTML = '
    '; window.siyuan.user.userTitles.forEach((item) => { - userTitlesHTML += `
    ${item.icon} ${item.name}
    `; + userTitlesHTML += `
    ${item.icon} ${item.name}
    `; }); userTitlesHTML += "
    "; }