Repository: incubator-griffin Updated Branches: refs/heads/master 5c88d9ca4 -> de578bc88
Minor UI fixes "Back" button text alignment <img width="102" alt="screen shot 2018-09-21 at 6 02 19 pm" src="https://user-images.githubusercontent.com/867294/45912572-79de5680-bdd8-11e8-9acb-19670b7ca3d7.png"> <img width="86" alt="screen shot 2018-09-21 at 6 02 25 pm" src="https://user-images.githubusercontent.com/867294/45912573-7e0a7400-bdd8-11e8-9421-ef6dafc0d805.png"> footer line intersecting with content <img width="175" alt="screen shot 2018-09-21 at 7 38 27 pm" src="https://user-images.githubusercontent.com/867294/45912578-92e70780-bdd8-11e8-8b39-2485047b422d.png"> <img width="162" alt="screen shot 2018-09-21 at 7 36 47 pm" src="https://user-images.githubusercontent.com/867294/45912580-97abbb80-bdd8-11e8-9a08-2b27b92a272b.png"> title rendering on sidebar <img width="294" alt="screen shot 2018-09-21 at 7 29 53 pm" src="https://user-images.githubusercontent.com/867294/45912584-a4301400-bdd8-11e8-9ffe-e726dd912813.png"> <img width="323" alt="screen shot 2018-09-21 at 8 07 46 pm" src="https://user-images.githubusercontent.com/867294/45912670-0dfced80-bdda-11e8-87ae-b1985f55754e.png"> Author: Nikolay Sokolov <chemika...@gmail.com> Closes #422 from chemikadze/ui-fixes. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/de578bc8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/de578bc8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/de578bc8 Branch: refs/heads/master Commit: de578bc8820a2a9f7658adc9fae7be7b97716d82 Parents: 5c88d9c Author: Nikolay Sokolov <chemika...@gmail.com> Authored: Sat Sep 22 21:56:01 2018 +0800 Committer: William Guo <gu...@apache.org> Committed: Sat Sep 22 21:56:01 2018 +0800 ---------------------------------------------------------------------- ui/angular/src/app/app.component.html | 2 +- ui/angular/src/app/sidebar/sidebar.component.css | 2 ++ ui/angular/src/app/sidebar/sidebar.component.html | 8 ++++---- ui/angular/src/styles.css | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/de578bc8/ui/angular/src/app/app.component.html ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/app.component.html b/ui/angular/src/app/app.component.html index b0c7f39..b1e5476 100644 --- a/ui/angular/src/app/app.component.html +++ b/ui/angular/src/app/app.component.html @@ -73,7 +73,7 @@ under the License. spinner-on="false" style="padding-top:56px;padding-bottom:90px;height:100%;padding-right:0;" id="mainContent"> <div class="col-md-9 col-xs-12"> <button type="button" class="btn btn-primary btn-circle" - style="position: absolute; top: 0px; right: 30px; z-index:99" (click)="goback();"><span + style="position: absolute; top: 0px; right: 30px; z-index:99; padding: 4px 12px;" (click)="goback();"><span style="margin-bottom:20px;">Back</span></button> <!-- main content goes here--> <div id="mainWindow" (window:resize)="onResize($event)" class="row y-scrollable" ng-view http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/de578bc8/ui/angular/src/app/sidebar/sidebar.component.css ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/sidebar/sidebar.component.css b/ui/angular/src/app/sidebar/sidebar.component.css index 16482b7..7a52309 100644 --- a/ui/angular/src/app/sidebar/sidebar.component.css +++ b/ui/angular/src/app/sidebar/sidebar.component.css @@ -34,6 +34,7 @@ under the License. } .well { + margin-bottom: 0px; padding: 0px; background: transparent; border: 0px; @@ -53,6 +54,7 @@ under the License. position: relative; background: transparent; border-color: #262626; + border-top: 0px; } .side-bar-scroll { http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/de578bc8/ui/angular/src/app/sidebar/sidebar.component.html ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/sidebar/sidebar.component.html b/ui/angular/src/app/sidebar/sidebar.component.html index 0a445a1..f35b4d8 100644 --- a/ui/angular/src/app/sidebar/sidebar.component.html +++ b/ui/angular/src/app/sidebar/sidebar.component.html @@ -38,15 +38,15 @@ under the License. <div id="side-bar-metrics" class="row y-scrollable"> <div *ngFor="let outerItems of finalData;let parent=index"> <div class="well" *ngIf="outerItems.metrics.length != 0"> - <div class="col-sm-4 col-lg-4 col-md-4 "> + <div class="col-sm-4 col-lg-4 col-md-4 " style="width: fit-content"> <h4> <!-- <a routerLink="/metrics/{{outerItems.name}}"> {{outerItems.name}}</a> --> <a> {{outerItems.name}}</a> </h4> </div> - <div class="col-sm-3 col-lg-3 col-md-3 " style="display: flex;justify-content: center;height:46px;"> - <!-- <div [ngClass]="outerItems.dq >=90 ? 'led-green':'led-yellow'" style="align-self: center;"></div> --> - </div> + <!--<div class="col-sm-3 col-lg-3 col-md-3 " style="display: flex;justify-content: center;height:46px;">--> + <!--<div [ngClass]="outerItems.dq >=90 ? 'led-green':'led-yellow'" style="align-self: center;"></div> --> + <!--</div>--> <!-- <div class="col-sm-5 col-lg-5 col-md-5 " style="display: flex;justify-content: center;height:46px;"><a style="align-self: center;" class="btn btn-primary" href="https://github.com/eBay/DQSolution/issues" target="_blank">Report issue</a></div> --> </div> <br/> http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/de578bc8/ui/angular/src/styles.css ---------------------------------------------------------------------- diff --git a/ui/angular/src/styles.css b/ui/angular/src/styles.css index 4670fdf..e84cde3 100644 --- a/ui/angular/src/styles.css +++ b/ui/angular/src/styles.css @@ -939,7 +939,7 @@ a:hover { height: 20px; background: #1f1f1f; padding-top: 10px; - padding-bottom: 10px; + padding-bottom: 0px; border-top-style: solid; border-top-width: 8px; border-top-color: #1d1d1d;