Skip to content

Various style tweaks #13418

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 2 commits into from
Nov 5, 2020
Merged

Various style tweaks #13418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fac67f1
Various style tweaks
silverwind Nov 3, 2020
b653b5a
Merge branch 'master' into csstweaks4
techknowlogick Nov 5, 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
4 changes: 2 additions & 2 deletions templates/repo/diff/box.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@
{{else}}
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}"></span></td>
<td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td>
<td class="lines-code lines-code-old halfwidth">{{if and $.SignedUserID $line.CanComment $.PageIsPullFiles (not (eq .GetType 2))}}<a class="ui green button add-code-comment add-code-comment-left" data-path="{{$file.Name}}" data-side="left" data-idx="{{$line.LeftIdx}}" data-type-marker="+"></a>{{end}}<code class="code-inner">{{if $line.LeftIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></td>
<td class="lines-code lines-code-old halfwidth">{{if and $.SignedUserID $line.CanComment $.PageIsPullFiles (not (eq .GetType 2))}}<a class="ui primary button add-code-comment add-code-comment-left" data-path="{{$file.Name}}" data-side="left" data-idx="{{$line.LeftIdx}}">{{svg "octicon-plus"}}</a>{{end}}<code class="code-inner">{{if $line.LeftIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></td>
<td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}"></span></td>
<td class="lines-type-marker lines-type-marker-new">{{if $line.RightIdx}}<span class="mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td>
<td class="lines-code lines-code-new halfwidth">{{if and $.SignedUserID $line.CanComment $.PageIsPullFiles (not (eq .GetType 3))}}<a class="ui green button add-code-comment add-code-comment-right" data-path="{{$file.Name}}" data-side="right" data-idx="{{$line.RightIdx}}" data-type-marker="+"></a>{{end}}<code class="code-inner">{{if $line.RightIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></td>
<td class="lines-code lines-code-new halfwidth">{{if and $.SignedUserID $line.CanComment $.PageIsPullFiles (not (eq .GetType 3))}}<a class="ui primary button add-code-comment add-code-comment-right" data-path="{{$file.Name}}" data-side="right" data-idx="{{$line.RightIdx}}">{{svg "octicon-plus"}}</a>{{end}}<code class="code-inner">{{if $line.RightIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></td>
{{end}}
</tr>
{{if gt (len $line.Comments) 0}}
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/diff/section_unified.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{{if eq .GetType 4}}
<td class="chroma lines-code blob-hunk"><code class="code-inner">{{$section.GetComputedInlineDiffFor $line}}</code></td>
{{else}}
<td class="chroma lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}">{{if and $.root.SignedUserID $line.CanComment $.root.PageIsPullFiles}}<a class="ui green button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}" data-path="{{$file.Name}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}" data-type-marker="+"></a>{{end}}<code class="code-inner">{{$section.GetComputedInlineDiffFor $line}}</code></td>
<td class="chroma lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}">{{if and $.root.SignedUserID $line.CanComment $.root.PageIsPullFiles}}<a class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}" data-path="{{$file.Name}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">{{svg "octicon-plus"}}</a>{{end}}<code class="code-inner">{{$section.GetComputedInlineDiffFor $line}}</code></td>
{{end}}
</tr>
{{if gt (len $line.Comments) 0}}
Expand Down
8 changes: 8 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 @@ -99,6 +99,8 @@ h5,
.ui.form input[type="text"],
.ui.form input[type="time"],
.ui.form input[type="url"],
.ui.input textarea,
.ui.form textarea,
.ui.header,
.ui.items > .item > .content > .header,
.ui.list .list > .item .header,
Expand Down Expand Up @@ -166,6 +168,12 @@ table {
color: #fff !important;
}

::placeholder,
.CodeMirror-placeholder {
color: #aaa !important;
opacity: 1 !important;
}

a,
.ui.breadcrumb a {
color: var(--color-primary);
Expand Down
21 changes: 7 additions & 14 deletions web_src/less/_review.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
.ui.button.add-code-comment {
font-size: 14px;
height: 16px;
line-height: 12px !important;
padding: 0;
position: relative;
width: 16px;
padding: 2px;
position: absolute;
margin-left: -22px;
z-index: 5;
float: left;
margin: 2px -10px 2px -20px;
opacity: 0;
transition: transform .1s ease-in-out;
transform: scale(1, 1);
transform: scale(1);
box-shadow: none !important;
border: none !important;

&:hover {
transform: scale(1.2, 1.2);
transform: scale(1.1);
}
}

Expand Down Expand Up @@ -71,10 +68,6 @@
cursor: pointer;
}

.ui.form textarea {
border: 0;
}

.ui.active.tab {
padding: .5em;

Expand Down
86 changes: 39 additions & 47 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 @@ -351,7 +351,7 @@
/* GenericEmph */

.chroma .ge {
font-style: italic;
color: #ef5;
}
/* GenericError */

Expand Down Expand Up @@ -441,8 +441,9 @@ body {
color: #a5a5a8;
}

::placeholder {
color: #7f7f7f !important;
::placeholder,
.CodeMirror-placeholder {
color: #6a737d !important;
}

[data-tooltip]::before,
Expand Down Expand Up @@ -746,7 +747,7 @@ a.ui.basic.green.label:hover {
.ui.form input[type="url"],
.ui.selection.dropdown {
color: #a5a5a8;
background: var(--color-secondary);
background: #2e323e;
border: 1px solid var(--color-secondary);
}

Expand All @@ -764,8 +765,8 @@ a.ui.basic.green.label:hover {
.ui.form input[type="time"]:hover,
.ui.form input[type="url"]:hover,
.ui.selection.dropdown:hover {
background: var(--color-secondary);
border: 1px solid var(--color-secondary);
background: #2e323e;
border: 1px solid #505667;
color: #dbdbdb;
}

Expand All @@ -783,7 +784,7 @@ a.ui.basic.green.label:hover {
.ui.form input[type="time"]:focus,
.ui.form input[type="url"]:focus,
.ui.selection.dropdown:focus {
background: var(--color-secondary);
background: #2e323e;
border: 1px solid #6a737d;
color: #dbdbdb;
}
Expand Down Expand Up @@ -1449,55 +1450,54 @@ input {
color: #dbdbdb !important;
}

.ui.checkbox .box:before,
.ui.checkbox label:before {
background: #2e323e;
border: 1px solid var(--color-secondary);
}

.ui.checkbox .box:hover:before,
.ui.checkbox label:hover:before,
.ui.checkbox .box:active:before,
.ui.checkbox label:active:before {
background: #2e323e;
border-color: #6a737d;
}

.ui.checkbox input:focus ~ .box:before,
.ui.checkbox input:focus ~ label:before,
.ui.checkbox input:checked:focus ~ .box:before,
.ui.checkbox input:checked:focus ~ label:before {
background: #2e323e;
border-color: #6a737d;
}

.ui.checkbox input:checked ~ .box:after,
.ui.checkbox input:checked ~ label:after {
color: #dbdbdb;
}

.ui.checkbox input:checked ~ .box:before,
.ui.checkbox input:checked ~ label:before {
background: var(--color-secondary);
background: #2e323e;
opacity: 1;
color: #dbdbdb;
border-color: #505667;
}

.ui.checkbox .box:before,
.ui.checkbox label:before {
background: var(--color-secondary);
border: 1px solid #505667;
}

.ui.checkbox .box:hover::before,
.ui.checkbox label:hover::before {
background: var(--color-secondary);
border-color: #505667;
}

.ui.checkbox .box:active::before,
.ui.checkbox label:active::before {
background: var(--color-secondary);
border-color: #6a737d;
}

.ui.checkbox input:focus ~ .box:before,
.ui.checkbox input:focus ~ label:before {
background: var(--color-secondary);
border-color: #6a737d;
}

.ui.checkbox input:checked:focus ~ .box:before,
.ui.checkbox input:checked:focus ~ label:before,
.ui.checkbox input:not([type="radio"]):indeterminate:focus ~ .box:before,
.ui.checkbox input:not([type="radio"]):indeterminate:focus ~ label:before {
background: #2e323e;
border-color: #6a737d;
background: var(--color-secondary);
}

.ui.checkbox input:checked:focus ~ .box:after,
.ui.checkbox input:checked:focus ~ label:after,
.ui.checkbox input:not([type="radio"]):indeterminate:focus ~ .box:after,
.ui.checkbox input:not([type="radio"]):indeterminate:focus ~ label:after {
background: #2e323e;
color: #dbdbdb;
}

Expand Down Expand Up @@ -1838,20 +1838,8 @@ a.ui.labels .label:hover {
border: 0;
}

.ui.active.tab {
&:not(.markdown) {
textarea:focus {
border: none;
}

background: var(--color-secondary);
}

border-color: var(--color-secondary);
}

.footer {
border-top-color: #5a5a5a;
border-top-color: var(--color-secondary);

.markdown-info {
color: inherit;
Expand All @@ -1861,7 +1849,7 @@ a.ui.labels .label:hover {
}

.add-comment-left.add-comment-right .ui.attached.header {
border-color: #5d5c5c;
border-color: var(--color-secondary);
border-right: none;
}

Expand Down Expand Up @@ -2039,6 +2027,10 @@ a.ui.labels .label:hover {
border-color: var(--color-secondary);
}

.ui.popup:before {
box-shadow: 1px 1px 0 0 var(--color-secondary);
}

.ui.popup.top:before,
.ui.popup.bottom:before {
background-color: #383c4a;
Expand Down