Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit cf1eb4e

Browse files
ghillertghillert
committed
gh-321 CSS Polishing and Cleanup
1 parent 83e2e7a commit cf1eb4e

File tree

12 files changed

+96
-107
lines changed

12 files changed

+96
-107
lines changed

‎ui/src/app/about/about-details.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ <h2>Platform-specific Information of the Task Launcher</h2>
210210
</table>
211211

212212
<div class="row">
213-
<div class="col-md-12 text-right"><button id="back-button" type="button" class="btn btn-default" (click)="goBack()"><span class="glyphicon glyphicon-arrow-left"></span> Back</button></div>
214-
<div class="col-md-12 text-left"><button id="back-button"
213+
<div class="col-xs-12 text-right"><button id="back-button" type="button" class="btn btn-default" (click)="goBack()"><span class="glyphicon glyphicon-arrow-left"></span> <span class="hidden-xs">Back</span></button></div>
214+
<div class="col-xs-12 text-left"><button id="back-button"
215215
[ngxClipboard] [cbContent]="dataflowVersionInfo | json" (cbOnSuccess)="onCopyToClipboardSuccess($event);"
216-
type="button" class="btn btn-default"><span class="glyphicon glyphicon-copy"></span> Copy Details to Clipboard</button></div>
216+
type="button" class="btn btn-default"><span class="glyphicon glyphicon-copy"></span> <span class="hidden-xs">Copy Details to Clipboard</span></button></div>
217217
</div>
218218
</div>

‎ui/src/app/app.component.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<nav class="navbar navbar-inverse navbar-static-top">
22
<div class="container">
33
<div class="navbar-header">
4-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
4+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar"
5+
[attr.aria-expanded]="!isCollapsed" (click)="toggleCollapse()" [ngClass]="{'collapsed': isCollapsed}">
56
<span class="sr-only">Toggle navigation</span>
67
<span class="icon-bar"></span>
78
<span class="icon-bar"></span>
89
<span class="icon-bar"></span>
910
</button>
10-
<a class="navbar-brand" href="#"><span></span></a>
11+
<a class="navbar-brand" routerLink="apps"><span></span></a>
1112
</div>
12-
<div id="navbar" class="collapse navbar-collapse">
13-
<ul class="nav navbar-nav navbar-right">
13+
<div id="navbar" class="collapse navbar-collapse" [ngClass]="{'in': !isCollapsed}">
14+
<ul class="nav navbar-nav navbar-right" (click)="collapse()">
1415
<li routerLinkActive="active"><a routerLink="apps">Apps</a></li>
1516
<li routerLinkActive="active"><a routerLink="runtime/apps">Runtime</a></li>
1617
<li routerLinkActive="active"><a routerLink="streams">Streams</a></li>
@@ -19,9 +20,8 @@
1920
<li routerLinkActive="active"><a routerLink="analytics">Analytics</a></li>
2021
<li routerLinkActive="active"><a routerLink="about">About</a></li>
2122
</ul>
22-
</div><!--/.nav-collapse -->
23+
</div>
2324
</div>
24-
2525
</nav>
2626

2727
<div class="container dataflow-main-container">

‎ui/src/app/app.component.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,18 @@ export class AppComponent implements OnInit {
1515
this.toastyConfig.timeout = 3000;
1616
}
1717

18+
public isCollapsed = true;
19+
1820
ngOnInit() {
1921
}
2022

23+
public toggleCollapse(): void {
24+
this.isCollapsed = !this.isCollapsed;
25+
}
26+
27+
public collapse(): void {
28+
if (!this.isCollapsed) {
29+
this.isCollapsed = true;
30+
}
31+
}
2132
}

‎ui/src/app/apps/apps-bulk-import.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ <h2 class="text-center">OR</h2>
6767
</div>
6868

6969
<div class="row" style="margin-bottom: 2em;">
70-
<div class="col-md-12 text-right"><button id="back-button" type="button" class="btn btn-default" (click)="goBack()">Cancel</button></div>
71-
<div class="col-md-12 text-left"><button id="submit-button" type="submit" class="btn btn-primary" [disabled]="form.invalid"><span class="glyphicon glyphicon-import" aria-hidden="true"></span> Import</button></div>
70+
<div class="col-xs-12 text-right"><button id="back-button" type="button" class="btn btn-default" (click)="goBack()">Cancel</button></div>
71+
<div class="col-xs-12 text-left"><button id="submit-button" type="submit" class="btn btn-primary" [disabled]="form.invalid"><span class="glyphicon glyphicon-import" aria-hidden="true"></span> Import</button></div>
7272
</div>
7373
</form>
7474

‎ui/src/app/apps/apps-register/apps-register.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ <h1 [ngBusy]="busy">Register Applications</h1>
7575
</tbody>
7676
</table>
7777
<div class="row">
78-
<div class="col-md-12 text-right"><button id="back-button" type="button" class="btn btn-default" (click)="goBack()">Cancel</button></div>
79-
<div class="col-md-12 text-left"><button id="submit-button" type="submit" class="btn btn-primary" [disabled]="registerAppsForm.invalid">Register</button></div>
78+
<div class="col-xs-12 text-right"><button id="back-button" type="button" class="btn btn-default" (click)="goBack()">Cancel</button></div>
79+
<div class="col-xs-12 text-left"><button id="submit-button" type="submit" class="btn btn-primary" [disabled]="registerAppsForm.invalid">Register</button></div>
8080
</div>
8181
</form>
8282

‎ui/src/app/apps/apps.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h1 [ngBusy]="busy">Apps</h1>
66
<button id="showAboutDetailsButton" type="button" (click)="registerApps()"
77
class="btn btn-default"
88
><span class="glyphicon glyphicon-plus"></span>
9-
Register Application(s)
9+
<span class="hidden-xs">Register Application(s)</span>
1010
</button>
1111

1212
<app-tri-state-button *ngIf="appRegistrations?.items" class="toggle-all"
@@ -21,7 +21,7 @@ <h1 [ngBusy]="busy">Apps</h1>
2121
<button id="showAboutDetailsButton" type="button" (click)="bulkImportApps()"
2222
class="btn btn-default"
2323
><span class="glyphicon glyphicon-import"></span>
24-
Bulk Import Applications
24+
<span class="hidden-xs">Bulk Import Applications</span>
2525
</button>
2626
<label *ngIf="appRegistrations" class="control">
2727
<input type="text" class="input" placeholder="Filter items" [(ngModel)]="appRegistrations.filter" [disabled]="!appRegistrations || appRegistrations.items.length === 0">

‎ui/src/app/shared/components/tri-state-button.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { Selectable } from '../../shared/model/selectable';
1919
template:
2020
`<button #theButton name="topLevel" type="button" (click)="onClick()"
2121
class="btn btn-default"><span class="glyphicon glyphicon-trash"></span>
22-
{{label}}
22+
<span class="hidden-xs">{{label}}</span>
2323
</button>`
2424
})
2525
export class TriStateButtonComponent implements AfterViewInit, DoCheck {

‎ui/src/app/shared/directives/click-outside.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export class ClickOutsideDirective {
1414

1515
/**
1616
* Event emitter for sending events on when click is outside of element.
17-
* @type {EventEmitter<MouseEvent>}
17+
* @type {EventEmitter<MouseEvent>}
1818
*/
1919
@Output()
2020
public appClickOutside = new EventEmitter<MouseEvent>();

‎ui/src/app/shared/shared.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { KeyValuePipe } from './pipes/key-value-filter.pipe';
1818

1919
import { PropertyTableComponent } from './components/property-table/property-table.component';
2020
import { ModalModule } from 'ngx-bootstrap';
21-
import {TabComponent, TabsComponent} from './components/tabs.component';
21+
import { TabComponent, TabsComponent } from './components/tabs.component';
2222

2323
import { SharedAppsService } from '../shared/services/shared-apps.service';
2424

‎ui/src/app/streams/stream-definitions/stream-definitions.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<button type="button" (click)="expandPage()"
88
class="btn btn-default">
99
<span class="glyphicon glyphicon-collapse-down"></span>
10-
Expand All
10+
<span class="hidden-xs">Expand All</span>
1111
</button>
1212
<button type="button" (click)="collapsePage()"
1313
class="btn btn-default">
1414
<span class="glyphicon glyphicon-expand"></span>
15-
Collapse All
15+
<span class="hidden-xs">Collapse All</span>
1616
</button>
1717
</td>
1818
<td>

0 commit comments

Comments
 (0)