homelab/traefik
1
0
Fork 0
Code Activity

Merge 'v1.6.2' into master

Browse source
This commit is contained in:
Fernandez Ludovic 2018-05-22 19:14:34 +02:00
commit e2a5d4f83e
49 changed files with 630 additions and 500 deletions
Download patch file Download diff file Expand all files Collapse all files

3
webui/src/app/charts/bar-chart/bar-chart.component.ts
View file

@ -1,5 +1,6 @@
import { Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
import { axisBottom, axisLeft, easeLinear, max, min, scaleBand, scaleLinear, select } from 'd3';
import { format } from 'd3-format';
import * as _ from 'lodash';
import { WindowService } from '../../services/window.service';
@ -93,7 +94,7 @@ export class BarChartComponent implements OnInit, OnChanges {
.call(axisBottom(this.x));
this.g.select('.axis--y')
.call(axisLeft(this.y).tickSize(-this.width));
.call(axisLeft(this.y).tickFormat(format('~s')).tickSize(-this.width));
// Clean previous graph
this.g.selectAll('.bar').remove();

6
webui/src/app/components/providers/providers.component.html
View file

@ -51,7 +51,7 @@
<div>
<h2>Route Rule</h2>
</div>
<table class="table is-fullwidth is-hoverable">
<table class="table is-fullwidth is-hoverable table-fixed-break">
<tbody>
<tr *ngFor="let route of p.routes">
<td><code class="has-text-grey" [title]="route.id">{{ route.rule }}</code></td>
@ -569,7 +569,7 @@
<div class="field is-grouped is-grouped-multiline">
<div class="control">
<div class="tags has-addons">
<span class="tag is-light">Men</span>
<span class="tag is-light">Mem</span>
<span class="tag is-info">{{ p.buffering.memRequestBodyBytes }}</span>
</div>
</div>
@ -592,7 +592,7 @@
<div class="field is-grouped is-grouped-multiline">
<div class="control">
<div class="tags has-addons">
<span class="tag is-light">Men</span>
<span class="tag is-light">Mem</span>
<span class="tag is-info">{{ p.buffering.memResponseBodyBytes }}</span>
</div>
</div>

27
webui/src/styles/app.sass
View file

@ -1,27 +0,0 @@
@charset "utf-8"
@import 'typography'
@import 'variables'
@import 'colors'
@import '~bulma/sass/utilities/all'
@import '~bulma/sass/base/all'
@import '~bulma/sass/grid/all'
@import '~bulma/sass/elements/container'
@import '~bulma/sass/elements/tag'
@import '~bulma/sass/elements/other'
@import '~bulma/sass/elements/box'
@import '~bulma/sass/elements/form'
@import '~bulma/sass/elements/table'
@import '~bulma/sass/components/navbar'
@import '~bulma/sass/components/tabs'
@import '~bulma/sass/elements/notification'
@import 'nav'
@import 'content'
@import 'message'
@import 'charts'
@import 'helper'
html
font-family: $open-sans
height: 100%
background: $background