Browse Source

Style and template tweaks (#13828)

* Style and template tweaks

- Get red and green buttons on arc green closer to base theme
- EasyMDE adjustments, toolbar and focus border
- Fix header on 404 repo page
- Tweaks to frontpage search, add 'Create Repo' button
- Fix misaligned box headers
- Fix pagination on arc-green
- Fix background and footer on explore and repo search

* better fix for header button alignment

* add label hover for reactions
mj-v1.14.3
silverwind 2 years ago
committed by GitHub
parent
commit
bb50ab2861
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      templates/explore/code.tmpl
  2. 2
      templates/repo/issue/new_form.tmpl
  3. 2
      templates/repo/issue/view_content/add_reaction.tmpl
  4. 2
      templates/repo/issue/view_content/context_menu.tmpl
  5. 2
      templates/repo/issue/view_title.tmpl
  6. 10
      templates/repo/search.tmpl
  7. 6
      templates/repo/settings/lfs.tmpl
  8. 12
      templates/shared/searchbottom.tmpl
  9. 2
      templates/status/404.tmpl
  10. 2
      templates/status/500.tmpl
  11. 2
      templates/user/dashboard/issues.tmpl
  12. 60
      templates/user/dashboard/repolist.tmpl
  13. 39
      web_src/less/_base.less
  14. 7
      web_src/less/_chroma.less
  15. 3
      web_src/less/_dashboard.less
  16. 14
      web_src/less/_editor.less
  17. 3
      web_src/less/helpers.less
  18. 80
      web_src/less/themes/theme-arc-green.less

10
templates/explore/code.tmpl

@ -49,15 +49,7 @@
</table>
</div>
</div>
<div class="ui bottom attached table segment">
{{if $result.Language}}
<i class="color-icon" style="background-color: {{$result.Color}}"></i>{{$result.Language}}
{{end}}
&nbsp;
{{if not $result.UpdatedUnix.IsZero}}
<span class="ui small grey text pull right">{{$.i18n.Tr "explore.code_last_indexed_at" (TimeSinceUnix $result.UpdatedUnix $.i18n.Lang) | Safe}} &nbsp;</span>
{{end}}
</div>
{{template "shared/searchbottom" dict "root" $ "result" .}}
</div>
{{end}}
</div>

2
templates/repo/issue/new_form.tmpl

@ -13,7 +13,7 @@
</a>
<div class="ui segment content">
<div class="field">
<input name="title" id="issue_title" placeholder="{{.i18n.Tr "repo.milestones.title"}}" value="{{if .TitleQuery}}{{.TitleQuery}}{{else if .IssueTemplateTitle}}{{.IssueTemplateTitle}}{{else}}{{.title}}{{end}}" tabindex="3" autofocus required maxlength="255">
<input name="title" id="issue_title" placeholder="{{.i18n.Tr "repo.milestones.title"}}" value="{{if .TitleQuery}}{{.TitleQuery}}{{else if .IssueTemplateTitle}}{{.IssueTemplateTitle}}{{else}}{{.title}}{{end}}" tabindex="3" autofocus required maxlength="255" autocomplete="off">
{{if .PageIsComparePull}}
<div class="title_wip_desc" data-wip-prefixes="{{Json .PullRequestWorkInProgressPrefixes}}">{{.i18n.Tr "repo.pulls.title_wip_desc" (index .PullRequestWorkInProgressPrefixes 0| Escape) | Safe}}</div>
{{end}}

2
templates/repo/issue/view_content/add_reaction.tmpl

@ -1,5 +1,5 @@
{{if .ctx.IsSigned}}
<div class="item action ui pointing top right select-reaction dropdown" data-action-url="{{ .ActionURL }}">
<div class="item action ui pointing select-reaction dropdown" data-action-url="{{ .ActionURL }}">
<a class="add-reaction">
{{svg "octicon-smiley"}}
</a>

2
templates/repo/issue/view_content/context_menu.tmpl

@ -1,5 +1,5 @@
{{if .ctx.IsSigned}}
<div class="item action ui pointing top right custom dropdown context-dropdown">
<div class="item action ui pointing custom dropdown context-dropdown">
<a class="context-menu">
{{svg "octicon-kebab-horizontal"}}
</a>

2
templates/repo/issue/view_title.tmpl

@ -9,7 +9,7 @@
<span id="issue-title">{{RenderIssueTitle .Issue.Title $.RepoLink $.Repository.ComposeMetas}}</span>
<span class="index">#{{.Issue.Index}}</span>
<div id="edit-title-input" class="ui input" style="display: none">
<input value="{{.Issue.Title}}" maxlength="255">
<input value="{{.Issue.Title}}" maxlength="255" autocomplete="off">
</div>
</h1>
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}

10
templates/repo/search.tmpl

@ -48,15 +48,7 @@
</table>
</div>
</div>
<div class="ui bottom attached table segment">
{{if $result.Language}}
<i class="color-icon" style="background-color: {{$result.Color}}"></i>{{$result.Language}}
{{end}}
&nbsp;
{{if not $result.UpdatedUnix.IsZero}}
<span class="ui small grey text pull right">{{$.i18n.Tr "explore.code_last_indexed_at" (TimeSinceUnix $result.UpdatedUnix $.i18n.Lang) | Safe}} &nbsp;</span>
{{end}}
</div>
{{template "shared/searchbottom" dict "root" $ "result" .}}
</div>
{{end}}
</div>

6
templates/repo/settings/lfs.tmpl

@ -7,8 +7,8 @@
<h4 class="ui top attached header">
{{.i18n.Tr "repo.settings.lfs_filelist"}} ({{.i18n.Tr "admin.total" .Total}})
<div class="ui right">
<a class="ui black tiny show-panel button" href="{{.Link}}/locks"><span class="octicon-tiny">{{svg "octicon-lock"}}</span>{{.i18n.Tr "repo.settings.lfs_locks"}}</a>
<a class="ui blue tiny show-panel button" href="{{.Link}}/pointers"><span class="octicon-tiny">{{svg "octicon-search"}}</span>&nbsp;{{.i18n.Tr "repo.settings.lfs_findpointerfiles"}}</a>
<a class="ui tiny show-panel button" href="{{.Link}}/locks"><span class="octicon-tiny">{{svg "octicon-lock"}}</span>{{.i18n.Tr "repo.settings.lfs_locks"}}</a>
<a class="ui primary tiny show-panel button" href="{{.Link}}/pointers"><span class="octicon-tiny">{{svg "octicon-search"}}</span>&nbsp;{{.i18n.Tr "repo.settings.lfs_findpointerfiles"}}</a>
</div>
</h4>
<table id="lfs-files-table" class="ui attached segment single line table">
@ -25,7 +25,7 @@
<td>{{FileSize .Size}}</td>
<td>{{TimeSince .CreatedUnix.AsTime $.Lang}}</td>
<td class="right aligned">
<a class="ui blue show-panel button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.i18n.Tr "repo.settings.lfs_findcommits"}}</a>
<a class="ui primary show-panel button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.i18n.Tr "repo.settings.lfs_findcommits"}}</a>
<button class="ui basic show-modal icon button" data-modal="#delete-{{.Oid}}">
<span class="btn-octicon btn-octicon-danger poping up" data-content="{{$.i18n.Tr "repo.editor.delete_this_file"}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-trashcan"}}</span>
</button>

12
templates/shared/searchbottom.tmpl

@ -0,0 +1,12 @@
<div class="ui bottom attached table segment df ac sb">
<div class="ml-3">
{{if .result.Language}}
<i class="color-icon" style="background-color: {{.result.Color}}"></i>{{.result.Language}}
{{end}}
</div>
<div class="mr-3">
{{if not .result.UpdatedUnix.IsZero}}
<span class="ui grey text">{{.root.i18n.Tr "explore.code_last_indexed_at" (TimeSinceUnix .result.UpdatedUnix .root.i18n.Lang) | Safe}}</span>
{{end}}
</div>
</div>

2
templates/status/404.tmpl

@ -1,5 +1,5 @@
{{template "base/head" .}}
<div class="page-content ui container center {{if .IsRepo}}repository{{end}}">
<div class="page-content ui container center full-screen-width {{if .IsRepo}}repository{{end}}">
{{if .IsRepo}}{{template "repo/header" .}}{{end}}
<div class="ui container center">
<p style="margin-top: 100px"><img class="ui centered image" src="{{StaticUrlPrefix}}/img/404.png" alt="404"/></p>

2
templates/status/500.tmpl

@ -1,5 +1,5 @@
{{template "base/head" .}}
<div class="page-content ui container center">
<div class="page-content ui container full-screen-width center">
<p style="margin-top: 100px"><img class="ui centered image" src="{{StaticUrlPrefix}}/img/500.png" alt="500"/></p>
<div class="ui divider"></div>
<br>

2
templates/user/dashboard/issues.tmpl

@ -77,7 +77,7 @@
</div>
</form>
</div>
<div class="column right aligned">
<div class="column right aligned df ac je">
<!-- Sort -->
<div class="ui dropdown type jump item">
<span class="text">

60
templates/user/dashboard/repolist.tmpl

@ -23,8 +23,15 @@
<a :class="{item: true, active: tab === 'organizations'}" @click="changeTab('organizations')">{{.i18n.Tr "organization"}}</a>
</div>
<div v-show="tab === 'repos'" class="ui tab active list dashboard-repos">
<h4 class="ui top attached header">
{{.i18n.Tr "home.my_repos"}} <span class="ui grey label">${reposTotalCount}</span>
<h4 class="ui top attached header df ac">
<div class="f1 df ac">
{{.i18n.Tr "home.my_repos"}}
<span class="ui grey label ml-3">${reposTotalCount}</span>
</div>
<a class="poping up" :href="suburl + '/repo/create'" data-content="{{.i18n.Tr "new_repo"}}" data-variation="tiny inverted" data-position="left center">
{{svg "octicon-plus"}}
<span class="sr-only">{{.i18n.Tr "new_repo"}}</span>
</a>
</h4>
<div class="ui attached secondary segment repos-search">
<div class="ui fluid right action left icon input" :class="{loading: isLoading}">
@ -94,13 +101,16 @@
<div v-if="repos.length" class="ui attached table segment rounded-bottom">
<ul class="repo-owner-name-list">
<li v-for="repo in repos" :class="{'private': repo.private || repo.internal}">
<a :href="suburl + '/' + repo.full_name">
<component v-bind:is="repoIcon(repo)" size="16"></component>
<strong class="text truncate item-name">${repo.full_name}</strong>
<i v-if="repo.archived" class="archive icon archived-icon"></i>
<span class="ui right text light grey">
${repo.stars_count} <span class="rear">{{svg "octicon-star"}}</span>
</span>
<a class="df ac sb" :href="suburl + '/' + repo.full_name">
<div class="f1 df ac">
<component v-bind:is="repoIcon(repo)" size="16"></component>
<strong class="text truncate item-name">${repo.full_name}</strong>
<i v-if="repo.archived" class="archive icon archived-icon"></i>
</div>
<div class="text light grey df ac">
${repo.stars_count}
{{svg "octicon-star" 16 "rear ml-2"}}
</div>
</a>
</li>
<li v-if="showMoreReposLink">
@ -129,25 +139,29 @@
</ul>
</div>
</div>
<div v-if="!isOrganization" v-show="tab === 'organizations'" class="ui tab active list">
<h4 class="ui top attached header">
{{.i18n.Tr "home.my_orgs"}} <span class="ui grey label">${organizationsTotalCount}</span>
<div v-if="canCreateOrganization" class="ui right">
<a class="poping up" :href="suburl + '/org/create'" data-content="{{.i18n.Tr "new_org"}}" data-variation="tiny inverted" data-position="left center">
<i class="plus icon"></i>
<span class="sr-only">{{.i18n.Tr "new_org"}}</span>
</a>
<div v-if="!isOrganization" v-show="tab === 'organizations'" class="ui tab active list dashboard-orgs">
<h4 class="ui top attached header df ac">
<div class="f1 df ac">
{{.i18n.Tr "home.my_orgs"}}
<span class="ui grey label ml-3">${organizationsTotalCount}</span>
</div>
<a v-if="canCreateOrganization" class="poping up" :href="suburl + '/org/create'" data-content="{{.i18n.Tr "new_org"}}" data-variation="tiny inverted" data-position="left center">
{{svg "octicon-plus"}}
<span class="sr-only">{{.i18n.Tr "new_org"}}</span>
</a>
</h4>
<div v-if="organizations.length" class="ui attached table segment rounded-bottom">
<ul class="repo-owner-name-list">
<li v-for="org in organizations">
<a :href="suburl + '/' + org.name">
{{svg "octicon-organization"}}
<strong class="text truncate item-name">${org.name}</strong>
<span class="ui right text light grey">
${org.num_repos} <span class="rear">{{svg "octicon-repo"}}</span>
</span>
<a class="df ac sb" :href="suburl + '/' + org.name">
<div class="f1">
{{svg "octicon-organization" 16 "mr-2"}}
<strong class="text truncate item-name">${org.name}</strong>
</div>
<div class="text light grey df ac">
${org.num_repos}
{{svg "octicon-repo" 16 "rear ml-2 mt-1"}}
</div>
</a>
</li>
</ul>

39
web_src/less/_base.less

@ -69,7 +69,7 @@
--color-purple: #a333c8;
--color-pink: #e03997;
--color-brown: #a5673f;
--color-grey: #767676;
--color-grey: #888888;
--color-black: #1b1c1d;
--color-gold: #a1882b;
--color-white: #ffffff;
@ -97,6 +97,7 @@
--color-markdown-table-row: #00000008;
--color-markdown-code-block: #00000010;
--color-button: #ffffff;
--color-code-bg: #ffffff;
}
:root:lang(ja) {
@ -253,6 +254,10 @@ a.muted:hover,
border-color: var(--color-primary);
}
.CodeMirror-focused {
border-color: var(--color-primary) !important;
}
.ui.action.input:not([class*="left action"]) > input:focus {
border-right-color: var(--color-primary);
}
@ -288,6 +293,10 @@ a.muted:hover,
background: none;
}
.ui.ui.menu .item.disabled {
color: var(--color-text-light-2);
}
.ui.dropdown .menu {
background: var(--color-menu);
border-color: var(--color-secondary);
@ -307,6 +316,8 @@ a.muted:hover,
}
.ui.dropdown .menu .active.item {
color: var(--color-text);
background: var(--color-active);
font-weight: normal;
}
@ -523,17 +534,15 @@ a.muted:hover,
flex-direction: inherit;
}
.ui.dropdown:not(.labeled) > .dropdown.icon {
height: 14px;
vertical-align: bottom;
margin-bottom: -2px;
margin-left: .5rem;
}
.ui.dropdown .menu {
border-color: var(--color-secondary);
}
.ui.pagination.menu .active.item {
color: var(--color-text);
background: var(--color-active);
}
.ui.form .field > .selection.dropdown > .dropdown.icon {
height: auto;
}
@ -1266,6 +1275,11 @@ a.ui.label:hover {
color: var(--color-text);
}
.ui.basic.labels a.label:hover,
a.ui.basic.label:hover {
background: var(--color-label-hover);
}
.ui.label > .detail .icons {
margin-right: .25em;
}
@ -1597,6 +1611,7 @@ a.ui.label:hover {
}
.ui.attached.header {
position: relative;
background: var(--color-box-header);
border-color: var(--color-secondary);
@ -1606,6 +1621,14 @@ a.ui.label:hover {
}
}
/* fix misaligned right buttons on box headers */
.ui.attached.header .right {
position: absolute;
right: .78571429rem;
top: 50%;
transform: translateY(-50%);
}
/* https://github.com/go-gitea/gitea/issues/10210 */
.ui.attached.segment ~ .ui.top.attached.header {
margin-top: 1rem;

7
web_src/less/_chroma.less

@ -1,7 +1,6 @@
/* Background */
.chroma {
background-color: #ffffff;
.chroma,
.lines-code {
background-color: var(--color-code-bg);
}
/* LineTableTD */

3
web_src/less/_dashboard.less

@ -63,7 +63,8 @@
}
}
.dashboard-repos {
.dashboard-repos,
.dashboard-orgs {
margin: 0 1px; /* Accomodate for Semantic's 1px hacks on .attached elements */
}

14
web_src/less/_editor.less

@ -37,12 +37,26 @@
border-color: var(--color-secondary);
}
.editor-toolbar button {
border: none !important;
color: var(--color-text-light);
}
.editor-toolbar button:not(:hover) {
background-color: transparent !important;
}
.editor-toolbar i.separator {
border-left: none;
border-right-color: var(--color-secondary);
}
.editor-toolbar button:hover {
background: var(--color-hover);
}
.editor-toolbar button.active {
background: var(--color-active);
}
.editor-loading {

3
web_src/less/helpers.less

@ -20,6 +20,9 @@
word-break: break-all !important;
}
.full-screen-width { width: 100vw !important; }
.full-screen-height { height: 100vw !important; }
.rounded { border-radius: var(--border-radius) !important; }
.rounded-top { border-radius: var(--border-radius) var(--border-radius) 0 0 !important; }
.rounded-bottom { border-radius: 0 0 var(--border-radius) var(--border-radius) !important; }

80
web_src/less/themes/theme-arc-green.less

@ -64,8 +64,8 @@
--color-purple: #a333c8;
--color-pink: #e03997;
--color-brown: #a5673f;
--color-grey: #767676;
--color-black: #1b1c1d;
--color-grey: #767a85;
--color-black: #1e222e;
--color-gold: #a1882b;
--color-white: #ffffff;
/* target-based colors */
@ -73,8 +73,8 @@
--color-box-header: #454a57;
--color-box-body: #353945;
--color-text: #bbc0ca;
--color-text-light: #969aa5;
--color-text-light-2: #767a85;
--color-text-light: #a6aab5;
--color-text-light-2: #868a95;
--color-footer: #2e323e;
--color-timeline: #4a505c;
--color-input-text: #d5dbe6;
@ -92,13 +92,9 @@
--color-markdown-table-row: #ffffff06;
--color-markdown-code-block: #2a2e3a;
--color-button: #353846;
--color-code-bg: #2a2e3a;
}
/* Background */
.chroma {
background-color: #2a2e3a;
}
/* LineTableTD */
.chroma .lntd {
@ -563,12 +559,6 @@ a.ui.basic.green.label:hover {
color: #fff !important;
}
.ui.basic.red.active.button,
.ui.basic.red.buttons .active.button {
box-shadow: 0 0 0 1px #b75252 inset !important;
color: #b75252 !important;
}
.ui.divider:not(.vertical):not(.horizontal) {
border-bottom-color: var(--color-secondary);
border-top-color: transparent;
@ -771,19 +761,6 @@ a.ui.basic.green.label:hover {
border-color: transparent !important;
}
.ui.basic.green.active.button,
.ui.basic.green.buttons .active.button {
color: #87ab63 !important;
box-shadow: 0 0 0 1px #87ab63 inset !important;
}
.ui.green.buttons .active.button,
.ui.green.buttons .active.button:active,
.ui.green.active.button,
.ui.green.button .active.button:active {
background: #87ab63;
}
.ui .info.segment.top {
background-color: var(--color-secondary) !important;
}
@ -840,23 +817,6 @@ td.blob-hunk {
background: #353945;
}
.ui.vertical.menu .active.item {
background: #4b5162;
}
.ui.vertical.menu .item {
background: #353945;
}
.ui.vertical.menu .header.item {
background: var(--color-secondary);
}
.ui.vertical.menu {
background: #353945;
border: 1px solid #333640;
}
.ui.card,
.ui.cards > .card {
background: #353945;
@ -966,12 +926,6 @@ td.blob-hunk {
color: rgba(158, 158, 158, 1);
}
.ui.basic.red.button,
.ui.basic.red.buttons .button {
box-shadow: 0 0 0 1px #a04141 inset !important;
color: #a04141 !important;
}
.ui.list .list > .item .header,
.ui.list > .item .header {
color: #dedede;
@ -1183,30 +1137,11 @@ a.blob-excerpt:hover {
filter: invert(100%);
}
.editor-toolbar {
background-color: var(--color-secondary);
border-color: var(--color-secondary);
}
.edit-diff > div > .ui.table {
border-left-color: var(--color-secondary) !important;
border-right-color: var(--color-secondary) !important;
}
.editor-toolbar button {
color: #87ab63 !important;
}
.editor-toolbar button.active,
.editor-toolbar button:hover {
background: #2a2e3a;
border-color: transparent;
}
.editor-toolbar i.separator {
border-right-color: #87ab63;
}
.repository .diff-detail-box {
background-color: #383c4a;
@ -1232,11 +1167,6 @@ a.blob-excerpt:hover {
}
}
.add-comment-left.add-comment-right .ui.attached.header {
border-color: var(--color-secondary);
border-right: none;
}
.file-comment {
color: var(--color-secondary-dark-6);
}

Loading…
Cancel
Save