Skip to content

Commit

Permalink
fix(ui): change style of expand logs button (#3458)
Browse files Browse the repository at this point in the history
Signed-off-by: Benjamin Coenen <[email protected]>
  • Loading branch information
bnjjj authored Oct 12, 2018
1 parent 6beb13a commit c9398dd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ export class WorkflowStepLogComponent implements OnInit, OnDestroy {
this.loadingMore = true;
setTimeout(() => {
this.limitFrom = null;
if (this.splittedLogs.length > 3000) {
if (this.splittedLogs.length > 3500) {
this.basicView = true;
}
this.splittedLogsToDisplay = this.splittedLogs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
<td class="number yellow right aligned pointing" (click)="generateLink(logLine.lineNumber)">{{logLine.lineNumber}}</td>
<td [innerHTML]="logLine.value"></td>
</tr>
<tr *ngIf="logLine.lineNumber === limitFrom" valign="middle" align="center" class="fold-log pointing" (click)="showAllLogs()">
<td colspan="2"><hr class="mb20"><a *ngIf="!loadingMore"><i class="resize vertical icon"></i>{{'workflow_logs_all' | translate}}</a><div class="ui active centered inline loader" *ngIf="loadingMore"></div><hr></td>
<tr *ngIf="logLine.lineNumber === limitFrom" valign="middle" class="fold-log pointing" (click)="showAllLogs()">
<td colspan="2"><hr class="mb25"><a *ngIf="!loadingMore"><i class="resize vertical icon"></i>{{'workflow_logs_all' | translate}}</a><div class="ui active centered inline loader" *ngIf="loadingMore"></div><hr></td>
</tr>
</ng-container>
</tbody>
</table></pre>
<pre *ngIf="basicView && logs" class="ml10">{{logs.val}}</pre>
<pre *ngIf="basicView && logs" class="ml50">{{logs.val}}</pre>
<textarea class="fakeInput" name="fakeInput" #logsContent></textarea>
<div class="ui active centered inline loader" *ngIf="loading"></div>
</div>
Expand Down
11 changes: 6 additions & 5 deletions ui/src/app/views/workflow/run/node/pipeline/step/step.log.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

$squareSize: 32px;
$yellowLogs: #FFFF91;
.mb20 {
margin-bottom: 20px;
.mb25 {
margin-bottom: 25px;
}
.ml10 {
margin-left: 10px;
.ml50 {
margin-left: 50px;
}

.logHeader {
Expand Down Expand Up @@ -105,9 +105,10 @@ $yellowLogs: #FFFF91;
padding-bottom: 1px;
hr {
width: 50%;
margin-left: 0;
border: 0;
height: 1px;
background-image: linear-gradient(to right, rgba(255, 255, 145, 0), rgba(255, 255, 145, 0.75), rgba(255, 255, 145, 0));
background-image: linear-gradient(to right, rgba(255, 255, 145, 1), rgba(255, 255, 145, 0.75), rgba(255, 255, 145, 0));
}
&.number {
width: 40px;
Expand Down

0 comments on commit c9398dd

Please sign in to comment.