valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add word wrap for git stdout/stderr pre elements

This commit is contained in:
Andrew Dolgov 2021-03-03 19:18:43 +03:00
parent cb7f322f09
commit dfdb746a76
7 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/PrefHelpers.js
View File

@ -401,8 +401,9 @@ const Helpers = {
container.innerHTML = ` container.innerHTML = `
<li> <li>
<h3 style="margin-top: 0">${plugin}</h3> <h3 style="margin-top: 0">${plugin}</h3>
${reply.stderr ? `<pre class="small text-error">${reply.stderr}</pre>` : ''} <div class='text-error'>${reply.result}</div>
${reply.stdour ? `<pre class="small text-success">${reply.stdout}</pre>` : ''} ${reply.stderr ? `<pre class="small text-error pre-wrap">${reply.stderr}</pre>` : ''}
${reply.stdour ? `<pre class="small text-success pre-wrap">${reply.stdout}</pre>` : ''}
<p class="small"> <p class="small">
${App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", reply.git_status)} ${App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", reply.git_status)}
</p> </p>
@ -502,8 +503,8 @@ const Helpers = {
container.innerHTML += container.innerHTML +=
` `
<li><h3 style="margin-top: 0">${p.plugin}</h3> <li><h3 style="margin-top: 0">${p.plugin}</h3>
${p.rv.e ? `<pre class="small text-error">${p.rv.e}</pre>` : ''} ${p.rv.e ? `<pre class="small text-error pre-wrap">${p.rv.e}</pre>` : ''}
${p.rv.o ? `<pre class="small text-success">${p.rv.o}</pre>` : ''} ${p.rv.o ? `<pre class="small text-success pre-wrap">${p.rv.o}</pre>` : ''}
<p class="small"> <p class="small">
${p.rv.s ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.s) : ${p.rv.s ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.s) :
App.FormFields.icon("check") + " " + __("Update done.")} App.FormFields.icon("check") + " " + __("Update done.")}
@ -551,8 +552,8 @@ const Helpers = {
container.innerHTML += container.innerHTML +=
` `
<li><h3 style="margin-top: 0">${p.plugin}</h3> <li><h3 style="margin-top: 0">${p.plugin}</h3>
${p.rv.e ? `<pre class="small text-error">${p.rv.e}</pre>` : ''} ${p.rv.e ? `<pre class="small text-error pre-wrap">${p.rv.e}</pre>` : ''}
${p.rv.o ? `<pre class="small text-success">${p.rv.o}</pre>` : ''} ${p.rv.o ? `<pre class="small text-success pre-wrap">${p.rv.o}</pre>` : ''}
<p class="small"> <p class="small">
${p.rv.s ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.s) : ${p.rv.s ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.s) :
App.FormFields.icon("check") + " " + __("Ready to update")} App.FormFields.icon("check") + " " + __("Ready to update")}

4
themes/compact.css
View File

@ -1034,6 +1034,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left { body.ttrss_utility .pull-left {
float: left; float: left;
} }
body.ttrss_main .pre-wrap,
body.ttrss_utility .pre-wrap {
white-space: pre-wrap;
}
body.ttrss_main .text-error, body.ttrss_main .text-error,
body.ttrss_utility .text-error { body.ttrss_utility .text-error {
color: #b94a48; color: #b94a48;

4
themes/compact_night.css
View File

@ -1034,6 +1034,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left { body.ttrss_utility .pull-left {
float: left; float: left;
} }
body.ttrss_main .pre-wrap,
body.ttrss_utility .pre-wrap {
white-space: pre-wrap;
}
body.ttrss_main .text-error, body.ttrss_main .text-error,
body.ttrss_utility .text-error { body.ttrss_utility .text-error {
color: #b94a48; color: #b94a48;

4
themes/light.css
View File

@ -1034,6 +1034,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left { body.ttrss_utility .pull-left {
float: left; float: left;
} }
body.ttrss_main .pre-wrap,
body.ttrss_utility .pre-wrap {
white-space: pre-wrap;
}
body.ttrss_main .text-error, body.ttrss_main .text-error,
body.ttrss_utility .text-error { body.ttrss_utility .text-error {
color: #b94a48; color: #b94a48;

4
themes/light/tt-rss.less
View File

@ -1229,6 +1229,10 @@ body.ttrss_main, body.ttrss_utility {
float : left; float : left;
} }
.pre-wrap {
white-space : pre-wrap;
}
.text-error { .text-error {
color: #b94a48; color: #b94a48;
} }

4
themes/night.css
View File

@ -1035,6 +1035,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left { body.ttrss_utility .pull-left {
float: left; float: left;
} }
body.ttrss_main .pre-wrap,
body.ttrss_utility .pre-wrap {
white-space: pre-wrap;
}
body.ttrss_main .text-error, body.ttrss_main .text-error,
body.ttrss_utility .text-error { body.ttrss_utility .text-error {
color: #b94a48; color: #b94a48;

4
themes/night_blue.css
View File

@ -1035,6 +1035,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left { body.ttrss_utility .pull-left {
float: left; float: left;
} }
body.ttrss_main .pre-wrap,
body.ttrss_utility .pre-wrap {
white-space: pre-wrap;
}
body.ttrss_main .text-error, body.ttrss_main .text-error,
body.ttrss_utility .text-error { body.ttrss_utility .text-error {
color: #b94a48; color: #b94a48;