From 0e24af6951fa65d5094ab6da0f182697aab2a6f0 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 17 Jul 2020 17:15:12 +0200 Subject: Update Octicons to v10 (#12240) * Update Octicons to v10 Besides a few renames, these icons are no longer present in v10 that we've used, so had to change: file-symlink-directory -> file-submodule internal-repo -> repo repo-force-push -> repo-push repo-template-private -> repo-template Fixes: https://github.com/go-gitea/gitea/issues/11889 Ref: https://github.com/primer/octicons/releases/tag/v10.0.0 * add custom sliders svg for removed octicon-settings * apply suggestion * fix triangles and use play on admin dashboard * add custom mirror svg * add missing build files * unify custom svgs * move to octicon-repo-clone to gitea-mirror * use octicon-x on conflicts * tweak timeline icons * tweak comment buttons * update settings icon to octicons v1 * switch to octicon-mirror and octicon-tools * replace two wiki buttons with octicons * remove whitespace in svg sources * Fix filepath basename on Windows for SVG bindata (#12241) * move octicons to devDependencies * move back to dependencies * move svgo to devDependencies again Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> Co-authored-by: techknowlogick --- web_src/less/_repository.less | 21 +++++++++------------ web_src/less/_svg.less | 8 -------- web_src/less/themes/theme-arc-green.less | 2 +- 3 files changed, 10 insertions(+), 21 deletions(-) (limited to 'web_src/less') diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 7bb7d81bab..2277b794c9 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -338,8 +338,7 @@ } &.octicon-file-directory, - &.octicon-file-submodule, - &.octicon-file-symlink-directory { + &.octicon-file-submodule { color: #1e70bf; } } @@ -788,9 +787,7 @@ .badge.badge-commit { border-color: transparent; - background: radial-gradient(white 60%, transparent 60%) no-repeat; - height: 10px; - margin-top: 11px; + background: radial-gradient(white 40%, transparent 40%) no-repeat; } .badge { @@ -805,19 +802,18 @@ margin-right: 8px; color: #444; align-items: center; + justify-content: center; .svg { - width: 28px; - height: 28px; - text-align: center; - line-height: 28px; - padding: 4px; + width: 24px; + height: 24px; + padding: 3px; &.octicon-circle-slash { color: #bd2c00; } - &.octicon-primitive-dot { + &.octicon-dot-fill { color: #6cc644; } @@ -959,7 +955,8 @@ &.action { margin-top: 6px; - margin-left: 10px; + padding-left: 10px; + padding-right: 3px; } } } diff --git a/web_src/less/_svg.less b/web_src/less/_svg.less index 1d58e239df..b17b9a8b32 100644 --- a/web_src/less/_svg.less +++ b/web_src/less/_svg.less @@ -6,12 +6,4 @@ .middle & { vertical-align: middle; } - - // https://github.com/go-gitea/gitea/pull/11771 - // https://github.com/go-gitea/gitea/pull/11801 - // https://bugzilla.mozilla.org/show_bug.cgi?id=608812 - &.octicon-internal-repo { - // via https://bugzilla.mozilla.org/show_bug.cgi?id=1165282#c3 - shape-rendering: crispEdges; - } } diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index ee294d3fac..49d9821cdd 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -1015,7 +1015,7 @@ a.ui.basic.green.label:hover { } .repository.view.issue .comment-list .timeline-item .badge.badge-commit { - background: radial-gradient(#383c4a 60%, transparent 60%) no-repeat; + background: radial-gradient(#383c4a 40%, transparent 40%) no-repeat; } .repository .comment.form .content .form:after { -- cgit v1.2.3