diff options
author | silverwind <me@silverwind.io> | 2023-05-29 10:55:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-29 16:55:23 +0800 |
commit | 245f2c08db34e535576633748fc143bb09097ca8 (patch) | |
tree | 35147879ba07bc7f2aca5a657685ca2e49d29d22 | |
parent | 28077e66c0a5593f001e89ef1ff02627dbe029a1 (diff) | |
download | gitea-245f2c08db34e535576633748fc143bb09097ca8.tar.gz gitea-245f2c08db34e535576633748fc143bb09097ca8.zip |
Repo list improvements, fix bold helper classes (#24935)
- Fix bold helper classes that were broken because of CSS syntax error
- Refined the repo list CSS and layout
- Removing bold
- Downsize the mirror icon to fit
- Fix icon positions
- Adapted the org list to match
- Center the '+' icon and mute it
<img width="385" alt="Screenshot 2023-05-25 at 18 38 31"
src="https://github.com/go-gitea/gitea/assets/115237/ac8d6efb-5751-4845-a4ab-db1ddaf36ec3">
<img width="384" alt="Screenshot 2023-05-25 at 18 30 29"
src="https://github.com/go-gitea/gitea/assets/115237/bbd39ae7-da9d-4c6f-bfe3-42f28b7a74c3">
-rw-r--r-- | web_src/css/dashboard.css | 36 | ||||
-rw-r--r-- | web_src/css/helpers.css | 10 | ||||
-rw-r--r-- | web_src/js/components/DashboardRepoList.vue | 80 |
3 files changed, 63 insertions, 63 deletions
diff --git a/web_src/css/dashboard.css b/web_src/css/dashboard.css index 6048c0cdad..863dc51dbf 100644 --- a/web_src/css/dashboard.css +++ b/web_src/css/dashboard.css @@ -160,39 +160,3 @@ .feeds .news:last-of-type .divider { display: none !important; } - -.feeds .list ul { - list-style: none; - margin: 0; - padding-left: 0; -} - -.feeds .list ul li:not(:last-child) { - border-bottom: 1px solid var(--color-secondary); -} - -.feeds .list ul li .repo-list-link { - padding: 6px 1em; - display: block; -} - -.feeds .list ul li .repo-list-link .svg { - color: var(--color-text-light-2); -} - -.feeds .list ul li .repo-list-link .star-num { - font-size: 12px; -} - -.feeds .list #privateFilterCheckbox .svg { - color: var(--color-grey); - margin-right: 0.25rem; -} - -.feeds .list .repo-owner-name-list .item-name { - min-width: 0; -} - -.feeds .list .repo-owner-name-list .item-name svg { - min-width: 16px; -} diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index 73829dbca8..cfd2151100 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -86,11 +86,11 @@ Gitea's private styles use `g-` prefix. .gt-float-left { float: left !important; } .gt-float-right { float: right !important; } -.gt-font-light { font-weight: var(--font-weight-light) !important }; -.gt-font-normal { font-weight: var(--font-weight-normal) !important }; -.gt-font-medium { font-weight: var(--font-weight-medium) !important }; -.gt-font-semibold { font-weight: var(--font-weight-semibold) !important }; -.gt-font-bold { font-weight: var(--font-weight-bold) !important }; +.gt-font-light { font-weight: var(--font-weight-light) !important; } +.gt-font-normal { font-weight: var(--font-weight-normal) !important; } +.gt-font-medium { font-weight: var(--font-weight-medium) !important; } +.gt-font-semibold { font-weight: var(--font-weight-semibold) !important; } +.gt-font-bold { font-weight: var(--font-weight-bold) !important; } .gt-rounded { border-radius: var(--border-radius) !important; } .gt-rounded-top { border-radius: var(--border-radius) var(--border-radius) 0 0 !important; } diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index 0fd22ca9b6..42396d36cb 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -10,7 +10,7 @@ {{ textMyRepos }} <span class="ui grey label gt-ml-3">{{ reposTotalCount }}</span> </div> - <a :href="subUrl + '/repo/create' + (isOrganization ? '?org=' + organizationId : '')" :data-tooltip-content="textNewRepo"> + <a class="gt-df gt-ac muted" :href="subUrl + '/repo/create' + (isOrganization ? '?org=' + organizationId : '')" :data-tooltip-content="textNewRepo"> <svg-icon name="octicon-plus"/> <span class="sr-only">{{ textNewRepo }}</span> </a> @@ -70,18 +70,16 @@ </div> <div v-if="repos.length" class="ui attached table segment gt-rounded-bottom"> <ul class="repo-owner-name-list"> - <li v-for="repo in repos" :key="repo.id"> - <a class="repo-list-link muted gt-df gt-ac gt-sb" :href="repo.link"> - <div class="item-name gt-df gt-ac gt-f1"> - <svg-icon :name="repoIcon(repo)" :size="16" class-name="gt-mr-2"/> - <div class="text gt-font-semibold truncate gt-ml-1">{{ repo.full_name }}</div> - <span v-if="repo.archived"> - <svg-icon name="octicon-archive" :size="16" class-name="gt-ml-2"/> - </span> + <li class="gt-df gt-ac" v-for="repo in repos" :key="repo.id"> + <a class="repo-list-link muted gt-df gt-ac gt-f1" :href="repo.link"> + <svg-icon :name="repoIcon(repo)" :size="16" class-name="repo-list-icon"/> + <div class="text truncate">{{ repo.full_name }}</div> + <div v-if="repo.archived"> + <svg-icon name="octicon-archive" :size="16"/> </div> - <!-- the commit status icon logic is taken from templates/repo/commit_status.tmpl --> - <svg-icon v-if="repo.latest_commit_status_state" :name="statusIcon(repo.latest_commit_status_state)" :class-name="'commit-status icon text ' + statusColor(repo.latest_commit_status_state)" :size="16"/> </a> + <!-- the commit status icon logic is taken from templates/repo/commit_status.tmpl --> + <svg-icon v-if="repo.latest_commit_status_state" :name="statusIcon(repo.latest_commit_status_state)" :class-name="'gt-ml-3 commit-status icon text ' + statusColor(repo.latest_commit_status_state)" :size="16"/> </li> </ul> <div v-if="showMoreReposLink" class="center gt-py-3 gt-border-secondary-top"> @@ -121,27 +119,27 @@ {{ textMyOrgs }} <span class="ui grey label gt-ml-3">{{ organizationsTotalCount }}</span> </div> - <a v-if="canCreateOrganization" :href="subUrl + '/org/create'" :data-tooltip-content="textNewOrg"> + <a class="gt-df gt-ac muted" v-if="canCreateOrganization" :href="subUrl + '/org/create'" :data-tooltip-content="textNewOrg"> <svg-icon name="octicon-plus"/> <span class="sr-only">{{ textNewOrg }}</span> </a> </h4> <div v-if="organizations.length" class="ui attached table segment gt-rounded-bottom"> <ul class="repo-owner-name-list"> - <li v-for="org in organizations" :key="org.name"> - <a class="repo-list-link gt-df gt-ac gt-sb" :href="subUrl + '/' + encodeURIComponent(org.name)"> - <div class="text truncate item-name gt-f1"> - <svg-icon name="octicon-organization" :size="16" class-name="gt-mr-2"/> - <strong>{{ org.name }}</strong> - <span class="ui tiny basic label gt-ml-3" v-if="org.org_visibility !== 'public'"> + <li class="gt-df gt-ac" v-for="org in organizations" :key="org.name"> + <a class="repo-list-link muted gt-df gt-ac gt-f1" :href="subUrl + '/' + encodeURIComponent(org.name)"> + <svg-icon name="octicon-organization" :size="16" class-name="repo-list-icon"/> + <div class="text truncate">{{ org.name }}</div> + <div><!-- div to prevent underline of label on hover --> + <span class="ui tiny basic label" v-if="org.org_visibility !== 'public'"> {{ org.org_visibility === 'limited' ? textOrgVisibilityLimited: textOrgVisibilityPrivate }} </span> </div> - <div class="text light grey gt-df gt-ac"> - {{ org.num_repos }} - <svg-icon name="octicon-repo" :size="16" class-name="gt-ml-2 gt-mt-1"/> - </div> </a> + <div class="text light grey gt-df gt-ac gt-ml-3"> + {{ org.num_repos }} + <svg-icon name="octicon-repo" :size="16" class-name="gt-ml-2 gt-mt-1"/> + </div> </li> </ul> </div> @@ -445,3 +443,41 @@ export function initDashboardRepoList() { export default sfc; // activate the IDE's Vue plugin </script> +<style scoped> +ul { + list-style: none; + margin: 0; + padding-left: 0; +} + +ul li { + padding: 0 10px; +} + +ul li:not(:last-child) { + border-bottom: 1px solid var(--color-secondary); +} + +.repo-list-link { + padding: 6px 0; + gap: 6px; + min-width: 0; /* for text truncation */ +} + +.repo-list-link .svg { + color: var(--color-text-light-2); +} + +.repo-list-icon { + min-width: 16px; + margin-right: 2px; +} + +/* octicon-mirror has no padding inside the SVG */ +.repo-list-icon.octicon-mirror { + width: 14px; + min-width: 14px; + margin-left: 1px; + margin-right: 3px; +} +</style> |