Skip to content

Improve basic button and label styles #14119

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Dec 27, 2020
Merged

Improve basic button and label styles #14119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
392c6d3
Improve disabled styles for repo buttons
silverwind Dec 22, 2020
a972c72
restore clickability on label
silverwind Dec 22, 2020
9a8a09a
color tweaks and remove arc-green style
silverwind Dec 22, 2020
cd42c06
slightly reduce button size
silverwind Dec 23, 2020
4a46231
consolidate vars
silverwind Dec 24, 2020
678bb27
also cover active class
silverwind Dec 24, 2020
8023490
slightly more distinct active class
silverwind Dec 24, 2020
0714ff7
remove useless rule
silverwind Dec 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions templates/repo/header.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<form method="post" action="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}un{{end}}watch?redirect_to={{$.Link}}">
{{$.CsrfTokenHtml}}
<div class="ui labeled button{{if not $.IsSigned}} poping up{{end}}" tabindex="0"{{if not $.IsSigned}} data-content="{{$.i18n.Tr "repo.watch_guest_user" }}" data-position="top center" data-variation="tiny"{{end}}>
<button type="submit" class="ui compact basic button"{{if not $.IsSigned}} disabled{{end}}>
<button type="submit" class="ui compact small basic button"{{if not $.IsSigned}} disabled{{end}}>
{{if $.IsWatchingRepo}}{{svg "octicon-eye-closed" 16}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{svg "octicon-eye"}}{{$.i18n.Tr "repo.watch"}}{{end}}
</button>
<a class="ui basic label" href="{{.Link}}/watchers">
Expand All @@ -56,7 +56,7 @@
<form method="post" action="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star?redirect_to={{$.Link}}">
{{$.CsrfTokenHtml}}
<div class="ui labeled button{{if not $.IsSigned}} poping up{{end}}" tabindex="0"{{if not $.IsSigned}} data-content="{{$.i18n.Tr "repo.star_guest_user" }}" data-position="top center" data-variation="tiny"{{end}}>
<button type="submit" class="ui compact basic button"{{if not $.IsSigned}} disabled{{end}}>
<button type="submit" class="ui compact small basic button"{{if not $.IsSigned}} disabled{{end}}>
{{if $.IsStaringRepo}}{{svg "octicon-star-fill"}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{svg "octicon-star"}}{{$.i18n.Tr "repo.star"}}{{end}}
</button>
<a class="ui basic label" href="{{.Link}}/stars">
Expand All @@ -65,8 +65,8 @@
</div>
</form>
{{if and (not .IsEmpty) ($.Permission.CanRead $.UnitTypeCode)}}
<div class="ui labeled button {{if and ($.IsSigned) (not $.CanSignedUserFork)}}disabled-repo-button{{end}}" tabindex="0">
<a class="ui compact basic button {{if or (not $.IsSigned) (not $.CanSignedUserFork)}}poping up{{end}}" {{if $.CanSignedUserFork}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{else if $.IsSigned}} data-content="{{$.i18n.Tr "repo.fork_from_self"}}" {{ else }} data-content="{{$.i18n.Tr "repo.fork_guest_user" }}" rel="nofollow" href="{{AppSubUrl}}/user/login?redirect_to={{AppSubUrl}}/repo/fork/{{.ID}}" {{end}} data-position="top center" data-variation="tiny">
<div class="ui labeled button" tabindex="0">
<a class="ui compact small basic button {{if or (not $.IsSigned) (not $.CanSignedUserFork)}}poping up{{end}}" {{if $.CanSignedUserFork}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{else if $.IsSigned}} data-content="{{$.i18n.Tr "repo.fork_from_self"}}" {{ else }} data-content="{{$.i18n.Tr "repo.fork_guest_user" }}" rel="nofollow" href="{{AppSubUrl}}/user/login?redirect_to={{AppSubUrl}}/repo/fork/{{.ID}}" {{end}} data-position="top center" data-variation="tiny">
{{svg "octicon-repo-forked"}}{{$.i18n.Tr "repo.fork"}}
</a>
<a class="ui basic label" href="{{.Link}}/forks">
Expand Down
1 change: 1 addition & 0 deletions web_src/fomantic/_site/globals/site.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
@pageFont: var(--fonts-regular);
@bold: 500;
@useCustomScrollbars: false;
@disabledOpacity: var(--opacity-disabled);
24 changes: 12 additions & 12 deletions web_src/fomantic/build/semantic.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
.ui.disabled.button:hover,
.ui.disabled.active.button {
cursor: default;
opacity: 0.45 !important;
opacity: var(--opacity-disabled) !important;
background-image: none;
box-shadow: none;
pointer-events: none !important;
Expand Down Expand Up @@ -9202,7 +9202,7 @@ select.ui.dropdown {

.ui.active.search.dropdown input.search:focus + .text i.icon,
.ui.active.search.dropdown input.search:focus + .text .flag {
opacity: 0.45;
opacity: var(--opacity-disabled);
}

.ui.active.search.dropdown input.search:focus + .text {
Expand Down Expand Up @@ -9734,7 +9734,7 @@ select.ui.dropdown {
.ui.dropdown .menu > .disabled.item {
cursor: default;
pointer-events: none;
opacity: 0.45;
opacity: var(--opacity-disabled);
}

/*******************************
Expand Down Expand Up @@ -12013,12 +12013,12 @@ select.ui.dropdown {
.ui.form .disabled.field,
.ui.form .field :disabled {
pointer-events: none;
opacity: 0.45;
opacity: var(--opacity-disabled);
}

.ui.form .field.disabled > label,
.ui.form .fields.disabled > label {
opacity: 0.45;
opacity: var(--opacity-disabled);
}

.ui.form .field.disabled :disabled {
Expand Down Expand Up @@ -15101,7 +15101,7 @@ h6.ui.header .sub.header {
*******************************/

.ui.disabled.header {
opacity: 0.45;
opacity: var(--opacity-disabled);
}

/*******************************
Expand Down Expand Up @@ -15768,7 +15768,7 @@ i.emphasized.icons:not(.disabled) {

i.disabled.icon,
i.disabled.icons {
opacity: 0.45;
opacity: var(--opacity-disabled);
cursor: default;
pointer-events: none;
}
Expand Down Expand Up @@ -24650,7 +24650,7 @@ img.ui.image {
.ui.disabled.images,
.ui.disabled.image {
cursor: default;
opacity: 0.45;
opacity: var(--opacity-disabled);
}

/*******************************
Expand Down Expand Up @@ -25008,7 +25008,7 @@ img.ui.bordered.image {

.ui.disabled.input,
.ui.input:not(.disabled) input[disabled] {
opacity: 0.45;
opacity: var(--opacity-disabled);
}

.ui.disabled.input > input,
Expand Down Expand Up @@ -37183,7 +37183,7 @@ template {
.ui.disabled.search {
cursor: default;
pointer-events: none;
opacity: 0.45;
opacity: var(--opacity-disabled);
}

/*******************************
Expand Down Expand Up @@ -37984,7 +37984,7 @@ template {
---------------*/

.ui.disabled.segment {
opacity: 0.45;
opacity: var(--opacity-disabled);
color: rgba(40, 40, 40, 0.3);
}

Expand Down Expand Up @@ -41783,7 +41783,7 @@ span.ui.warning.text {
}

span.ui.disabled.text {
opacity: 0.45;
opacity: var(--opacity-disabled);
}

/* Sizes */
Expand Down
56 changes: 41 additions & 15 deletions web_src/less/_base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/* other variables */
--fonts-regular: var(--fonts-proportional), var(--fonts-emoji);
--border-radius: .28571429rem;
--opacity-disabled: .55;
--color-primary: #4183c4;
--color-primary-dark-1: #3876b3;
--color-primary-dark-2: #31699f;
Expand Down Expand Up @@ -96,13 +97,10 @@
--color-input-border: #dedede;
--color-input-border-hover: #cecece;
--color-navbar: #f8f8f8;
--color-label: #00000010;
--color-label-hover: #00000015;
--color-label-basic: #00000008;
--color-label-basic-hover: #00000015;
--color-label-border: #00000018;
--color-hover: #0000000a;
--color-active: #00000010;
--color-light: #00000004;
--color-light-border: #0000001d;
--color-hover: #0000000d;
--color-active: #00000012;
--color-menu: #ffffff;
--color-card: #ffffff;
--color-markdown-table-row: #00000008;
Expand Down Expand Up @@ -1382,13 +1380,13 @@ i.icon.centerlock {

.ui.label {
padding: .3em .5em;
background: var(--color-label);
background: var(--color-light);
color: var(--color-text-light);
}

.ui.labels a.label:hover,
a.ui.label:hover {
background: var(--color-label-hover);
background: var(--color-hover);
color: var(--color-text);
}

Expand Down Expand Up @@ -1556,7 +1554,7 @@ a.ui.label:hover {

.ui.button {
background: var(--color-button);
border: 1px solid var(--color-secondary);
border: 1px solid var(--color-light-border);
box-shadow: none !important;
color: var(--color-text);
}
Expand All @@ -1578,6 +1576,34 @@ a.ui.label:hover {
border-left: none;
}

.ui.basic.buttons .button,
.ui.basic.button {
color: var(--color-text-light);
background: var(--color-light);
}

.ui.basic.buttons .button:hover,
.ui.basic.button:hover {
color: var(--color-text);
background: var(--color-hover);
}

.ui.basic.buttons .button:focus,
.ui.basic.button:focus,
.ui.basic.buttons .button:active,
.ui.basic.button:active,
.ui.basic.buttons .active.button,
.ui.basic.active.button,
.ui.basic.buttons .active.button:hover,
.ui.basic.active.button:hover {
color: var(--color-text);
background: var(--color-active);
}

.ui.labeled.button > .label {
border-color: var(--color-light-border);
}

.ui.blue.button,
.ui.blue.buttons .button,
.ui.primary.button,
Expand Down Expand Up @@ -1640,16 +1666,16 @@ a.ui.label:hover {

.ui.basic.labels .label,
.ui.basic.label {
background: var(--color-label-basic);
border-color: var(--color-label-border);
color: var(--color-text);
background: var(--color-light);
border-color: var(--color-light-border);
color: var(--color-text-light);
}

.ui.basic.labels a.label:hover,
a.ui.basic.label:hover {
color: var(--color-text);
border-color: var(--color-label-border);
background: var(--color-label-basic-hover);
border-color: var(--color-light-border);
background: var(--color-hover);
}

.ui.label > img {
Expand Down
26 changes: 8 additions & 18 deletions web_src/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@
.shabox {
.sha.label {
margin: 0;
border: 1px solid #bbbbbb;
border: 1px solid var(--color-light-border);

&.isSigned.isWarning {
border: 1px solid #db2828;
Expand Down Expand Up @@ -1301,7 +1301,7 @@
#repo-files-table .sha.label,
#rev-list .sha.label,
.timeline-item.commits-list .singular-commit .sha.label {
border: 1px solid #bbbbbb;
border: 1px solid var(--color-light-border);

.ui.signature.avatar {
height: 16px;
Expand All @@ -1310,10 +1310,10 @@
}

.detail.icon {
background: #fafafa;
background: var(--color-light);
margin: -6px -10px -4px 0;
padding: 5px 4px 5px 6px;
border-left: 1px solid #bbbbbb;
border-left: 1px solid var(--color-light-border);
border-top: 0;
border-right: 0;
border-bottom: 0;
Expand Down Expand Up @@ -2780,24 +2780,14 @@ tbody.commit-list {
word-break: break-all;
}

.repo-header .repo-buttons {
.repo-buttons {
display: flex;
align-items: center;
}

.repo-buttons .disabled-repo-button .label {
opacity: .5;
}

.repo-buttons .disabled-repo-button a.button {
opacity: .5;
cursor: not-allowed;
}

.repo-buttons .disabled-repo-button a.button:hover {
background: none !important;
color: rgba(0, 0, 0, .6) !important;
box-shadow: 0 0 0 1px var(--color-secondary) inset !important;
.repo-buttons button[disabled],
.repo-buttons button[disabled] ~ .label {
opacity: var(--opacity-disabled);
}

.repo-buttons .ui.labeled.button > .label {
Expand Down
58 changes: 4 additions & 54 deletions web_src/less/themes/theme-arc-green.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,10 @@
--color-input-border: #454a57;
--color-input-border-hover: #505667;
--color-navbar: #2a2e3a;
--color-label: #ffffff0d;
--color-label-hover: #ffffff20;
--color-label-basic: #00000030;
--color-label-basic-hover: #40404030;
--color-label-border: #ffffff28;
--color-hover: #ffffff0d;
--color-active: #ffffff14;
--color-light: #00000028;
--color-light-border: #ffffff28;
--color-hover: #60606020;
--color-active: #60606040;
--color-menu: #2e323e;
--color-card: #2e323e;
--color-markdown-table-row: #ffffff06;
Expand Down Expand Up @@ -271,34 +268,6 @@ a.ui.basic.green.label:hover {
background-color: #a0cc75;
}

.ui.basic.button,
.ui.basic.buttons .button {
color: var(--color-secondary-dark-6);
background: rgba(0, 0, 0, .1);
box-shadow: none;
}

.ui.basic.button:focus,
.ui.basic.button:hover,
.ui.basic.buttons .button:focus,
.ui.basic.buttons .button:hover {
color: #dbdbdb;
background: rgba(255, 255, 255, .08);
box-shadow: none;
}

.ui.labeled.button:not([class*="left labeled"]) > .label,
.ui[class*="left labeled"].button > .button {
background: var(--color-secondary);
border: 1px solid var(--color-secondary);
color: #87ab63;
}

.ui.button:hover {
background-color: var(--color-secondary);
color: #dbdbdb;
}

.ui.search > .results {
background: #383c4a;
border-color: var(--color-secondary);
Expand Down Expand Up @@ -521,25 +490,6 @@ td.blob-excerpt {
color: #dbdbdb;
}

.sha.label,
.repository #repo-files-table .sha.label,
.repository #commits-table td.sha .sha.label,
#rev-list .sha.label,
.repository .timeline-item.commits-list .singular-commit .sha.label,
.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label {
border-color: #505667;
}

.sha.label.isSigned .detail.icon,
.repository #commits-table td.sha .sha.label.isSigned .detail.icon,
#rev-list .sha.label.isSigned .detail.icon,
.repository #repo-files-table .sha.label.isSigned .detail.icon,
.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned .detail.icon,
.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned .detail.icon {
background: none;
border-left-color: #888;
}

.repository .ui.attached.message.isSigned.isVerified {
background-color: #394829;
color: var(--color-secondary-dark-6);
Expand Down