Skip to content

Commit

Permalink
Reaction improvements (go-gitea#15836)
Browse files Browse the repository at this point in the history
- Add some spacing to inline reactions
- Adjust colors and add variables
  • Loading branch information
silverwind authored and AbdulrhmnGhanem committed Aug 10, 2021
1 parent be00273 commit 0c0cb64
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
4 changes: 3 additions & 1 deletion web_src/less/_base.less
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
--color-input-border: #dedede;
--color-input-border-hover: #cecece;
--color-navbar: #f8f8f8;
--color-light: #00000004;
--color-light: #00000006;
--color-light-border: #0000001d;
--color-hover: #0000000f;
--color-active: #00000014;
Expand All @@ -113,6 +113,8 @@
--color-editor-line-highlight: var(--color-primary-light-6);
--color-project-board-bg: var(--color-secondary-light-4);
--color-caret: var(--color-text-dark);
--color-reaction-bg: #0000000a;
--color-reaction-active-bg: var(--color-primary-alpha-20);
/* backgrounds */
--checkbox-mask-checked: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-1 -1 18 18" width="16" height="16"><path fill-rule="evenodd" d="M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z"></path></svg>');
--checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M2 7.75A.75.75 0 012.75 7h10a.75.75 0 010 1.5h-10A.75.75 0 012 7.75z"></path></svg>');
Expand Down
14 changes: 12 additions & 2 deletions web_src/less/_repository.less
Original file line number Diff line number Diff line change
Expand Up @@ -1088,12 +1088,21 @@

.comment-code-cloud {
.segment.reactions {
margin-top: 16px !important;
margin-bottom: -8px !important;
border-top: none !important;

.ui.label {
border: 1px solid;
padding: 6px !important;
padding: 6px 10px !important;
margin: 0 2px;
border-radius: var(--border-radius);
border-color: var(--color-secondary-dark-1) !important;
}

.ui.label.basic.blue {
background-color: var(--color-reaction-active-bg) !important;
border-color: var(--color-primary-alpha-80) !important;
}
}

Expand Down Expand Up @@ -2316,6 +2325,7 @@
font-size: 14px;
font-weight: normal;
border-color: var(--color-secondary) !important;
background: var(--color-reaction-bg);

&.disabled {
cursor: default;
Expand All @@ -2328,7 +2338,7 @@
}

.ui.label.basic.blue {
background-color: var(--color-primary-alpha-20) !important;
background-color: var(--color-reaction-active-bg) !important;
border-color: var(--color-secondary) !important;
}

Expand Down
6 changes: 2 additions & 4 deletions web_src/less/themes/theme-arc-green.less
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@
--color-editor-line-highlight: var(--color-primary-light-5);
--color-project-board-bg: var(--color-secondary-light-2);
--color-caret: var(--color-text); /* should ideally be --color-text-dark, see #15651 */
--color-reaction-bg: #ffffff12;
--color-reaction-active-bg: var(--color-primary-alpha-40);
}

::-webkit-calendar-picker-indicator {
Expand All @@ -119,10 +121,6 @@
background-color: #383c4a;
}

.repository .segment.reactions .ui.label.basic.blue {
background: var(--color-primary-alpha-20) !important;
}

[data-tooltip]::before,
[data-tooltip]::after {
background: #1b1c1d !important; /* .ui.inverted.popup */
Expand Down

0 comments on commit 0c0cb64

Please sign in to comment.