Skip to content
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

Jump to bottom

Various style fixes #13534

Merged
merged 3 commits into from
Nov 13, 2020
Merged

Various style fixes #13534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5791c07
Various style fixes
silverwind Nov 12, 2020
030b8ea
proper fix for close icon
silverwind Nov 12, 2020
ac28d5a
Merge branch 'master' into csstweaks8
lafriks Nov 12, 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
2 changes: 1 addition & 1 deletion templates/admin/notice.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</div>

<div class="ui modal admin" id="detail-modal">
<i class="close icon"></i>
<i class="close icon inside"></i>
<div class="header">{{$.i18n.Tr "admin.notices.view_detail_header"}}</div>
<div class="content">
<div class="sub header"></div>
Expand Down
4 changes: 3 additions & 1 deletion web_src/less/_admin.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.admin {
padding-top: 15px;
&.notice {
padding-top: 15px;
}

.table.segment {
padding: 0;
Expand Down
23 changes: 23 additions & 0 deletions web_src/less/_base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,29 @@ a:hover,
border-color: var(--color-secondary);
}

.ui.table {
color: var(--color-text);
}

.ui.ui.selectable.table > tbody > tr:hover,
.ui.table tbody tr td.selectable:hover {
color: var(--color-text);
background-color: var(--color-secondary-alpha-40);
}

.ui.modal {
background: var(--color-body);
}

.ui.modal > .close.inside,
.ui.fullscreen.modal > .close {
color: var(--body-color);
}

.ui.basic.table > tbody > tr {
border-color: var(--color-secondary);
}

.dont-break-out {
overflow-wrap: break-word;
word-wrap: break-word;
Expand Down
12 changes: 2 additions & 10 deletions web_src/less/_explore.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
padding-bottom: 25px;

&:not(:first-child) {
border-top: 1px solid #eeeeee;
border-top: 1px solid var(--color-secondary);
padding-top: 25px;
}

Expand Down Expand Up @@ -83,7 +83,7 @@
padding-bottom: 25px;

&:not(:first-child) {
border-top: 1px solid #eeeeee;
border-top: 1px solid var(--color-secondary);
padding-top: 25px;
}

Expand All @@ -98,14 +98,6 @@
.svg:not(:first-child) {
margin-left: 5px;
}

a {
color: #333333;

&:hover {
text-decoration: underline;
}
}
}
}
}
12 changes: 6 additions & 6 deletions web_src/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,10 +1070,10 @@
margin: 5px;
padding: 5px;
height: 150px;
border: solid 1px #eeeeee;
border: solid 1px var(--color-secondary);
border-radius: 3px;
max-width: 150px;
background-color: #ffffff;
background-color: var(--color-body);

&::before {
content: ' ';
Expand Down Expand Up @@ -1962,14 +1962,14 @@

.list {
padding-left: 0;
border-top: 1px solid #eeeeee;
border-top: 1px solid var(--color-secondary);

li {
list-style: none;
display: block;
padding-top: 8px;
padding-bottom: 8px;
border-bottom: 1px solid #eeeeee;
border-bottom: 1px solid var(--color-secondary);

a > .text.right {
margin-right: 5px;
Expand Down Expand Up @@ -2177,7 +2177,7 @@
}

.item {
border: 1px solid #eaeaea;
border: 1px solid var(--color-secondary);
padding: 10px 15px;

&:not(:last-child) {
Expand Down Expand Up @@ -2748,7 +2748,7 @@
}

&:not(:first-child) {
border-top: 1px solid #eaeaea;
border-top: 1px solid var(--color-secondary);
padding: 1rem;
margin: 15px -1rem -1rem;
}
Expand Down
2 changes: 1 addition & 1 deletion web_src/less/_user.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
list-style: none;

&:not(:last-child) {
border-bottom: 1px solid #eaeaea;
border-bottom: 1px solid var(--color-secondary);
}

.svg,
Expand Down
41 changes: 2 additions & 39 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 @@ -710,7 +710,7 @@ a.ui.basic.green.label:hover {
}

.ui.pagination.menu .active.item {
color: #dbdbdb;
color: #fff;
background-color: #87ab63;
}

Expand Down Expand Up @@ -870,7 +870,6 @@ a.ui.basic.green.label:hover {
}

.ui.table {
color: #a5a5a5 !important;
border-color: var(--color-secondary);
background: #353945;
}
Expand Down Expand Up @@ -1020,10 +1019,6 @@ a.ui.basic.green.label:hover {
.repository.view.issue .comment-list .comment .content {
> .bottom.segment {
background: #353945;
a {
border-color: var(--color-secondary);
background-color: #353945;
}
}

.header {
Expand Down Expand Up @@ -1180,10 +1175,6 @@ td.blob-hunk {
border: 1px solid #333640;
}

.ui.repository.list .item:not(:first-child) {
border-top: 1px solid var(--color-secondary);
}

.ui.selection.active.dropdown,
.ui.selection.active.dropdown:hover,
.ui.selection.active.dropdown .menu,
Expand Down Expand Up @@ -1236,10 +1227,6 @@ td.blob-hunk {
color: #dbdbdb;
}

.ui.user.list .item:not(:first-child) {
border-top: 1px solid var(--color-secondary);
}

.ui.secondary.pointing.menu .active.item:hover {
color: #dbdbdb;
}
Expand All @@ -1254,10 +1241,6 @@ td.blob-hunk {
background: #2c303a;
}

.user.settings .email.list .item:not(:first-child) {
border-top: 1px solid #3f4451;
}

.explore .navbar {
background-color: #2a2e3a !important;
}
Expand All @@ -1273,10 +1256,6 @@ td.blob-hunk {
}
}

.settings .key.list .item:not(:first-child) {
border-top: 1px solid var(--color-secondary);
}

.ui.attached.info.message,
.ui.info.message {
box-shadow: 0 0 0 1px #4b5e71 inset, 0 0 0 0 transparent;
Expand Down Expand Up @@ -1358,10 +1337,6 @@ td.blob-hunk {
box-shadow: 0 0 0 1px rgba(121, 71, 66, .5) inset, 0 0 0 0 transparent;
}

.user.profile .ui.card .extra.content ul li:not(:last-child) {
border-bottom: 1px solid var(--color-secondary);
}

.ui.form .dropzone {
border: 1px dashed var(--color-secondary);
background-color: #2e323e;
Expand Down Expand Up @@ -1391,10 +1366,6 @@ td.blob-hunk {
color: var(--color-secondary-dark-6);
}

.ui.user.list .item .description a {
color: #668cb1;
}

.repository.file.list #repo-files-table tbody .svg.octicon-file-directory,
.repository.file.list #repo-files-table tbody .svg.octicon-file-submodule {
color: #7c9b5e;
Expand Down Expand Up @@ -1600,7 +1571,7 @@ a.ui.labels .label:hover {

.ui.modal > .actions {
background: var(--color-secondary);
border-top: 1px solid var(--color-secondary);
border-color: var(--color-secondary);
}

.ui.modal > .content {
Expand Down Expand Up @@ -1834,14 +1805,6 @@ footer .container .links > * {
border-color: #383c4a;
}

.repository.release #release-list > li .detail .download .list {
border-top-color: var(--color-secondary);
}

.repository.release #release-list > li .detail .download .list li {
border-bottom-color: var(--color-secondary);
}

.board-column {
background-color: rgba(0, 0, 0, .2) !important;
}
Expand Down