From ee91ec2a858ccdabbf5fc2171397601890f9efa4 Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Wed, 22 Nov 2017 15:23:04 -0800 Subject: [PATCH 01/10] move breadcrumb in header --- app/app.layout.html | 10 ++--- .../breadcrumbs/breadcrumb-group.component.ts | 2 + .../base/breadcrumbs/breadcrumb-group.scss} | 39 +++++++------------ .../base/breadcrumbs/breadcrumb-models.ts | 2 +- .../base/breadcrumbs/breadcrumb.component.ts | 4 ++ .../base/breadcrumbs/breadcrumb.html | 6 +-- .../list-and-show-layout.html | 4 -- .../pool/details/pool-details.component.ts | 1 + app/styles/main.scss | 1 - app/styles/partials/header.scss | 27 +++++-------- 10 files changed, 38 insertions(+), 58 deletions(-) rename app/{styles/base/breadcrumbs.scss => components/base/breadcrumbs/breadcrumb-group.scss} (76%) diff --git a/app/app.layout.html b/app/app.layout.html index 6d5090b000..10bb660dc7 100644 --- a/app/app.layout.html +++ b/app/app.layout.html @@ -9,11 +9,11 @@ -
- -
+ + +
diff --git a/app/components/base/breadcrumbs/breadcrumb-group.component.ts b/app/components/base/breadcrumbs/breadcrumb-group.component.ts index 3068b85e0c..0f7a3a61b2 100644 --- a/app/components/base/breadcrumbs/breadcrumb-group.component.ts +++ b/app/components/base/breadcrumbs/breadcrumb-group.component.ts @@ -4,6 +4,8 @@ import { Subscription } from "rxjs"; import { Breadcrumb } from "./breadcrumb-models"; import { BreadcrumbService } from "./breadcrumb.service"; +import "./breadcrumb-group.scss"; + // Max number of breadcrumb to display without expanding const expandableCount = 4; @Component({ diff --git a/app/styles/base/breadcrumbs.scss b/app/components/base/breadcrumbs/breadcrumb-group.scss similarity index 76% rename from app/styles/base/breadcrumbs.scss rename to app/components/base/breadcrumbs/breadcrumb-group.scss index 090d2ed685..3907ae3442 100644 --- a/app/styles/base/breadcrumbs.scss +++ b/app/components/base/breadcrumbs/breadcrumb-group.scss @@ -1,3 +1,4 @@ +@import "app/styles/variables"; bl-breadcrumb-group { $separation: 3px; @@ -19,7 +20,8 @@ bl-breadcrumb-group { } ul > bl-breadcrumb { - display: block; + display: flex; + align-items: center; height: $height; background: $color; padding: 0 2px; @@ -29,6 +31,7 @@ bl-breadcrumb-group { min-width: 40px; max-width: 100px; cursor: pointer; + color: $whitesmoke; &:after { content: ""; @@ -40,7 +43,7 @@ bl-breadcrumb-group { top: 0; } - &:before { + &:not(:first-child):before { content: ""; position: absolute; border-width: $half-height 0 $half-height $half-height; @@ -61,42 +64,28 @@ bl-breadcrumb-group { } } - > div.crumb-content, > div.crumb-label { + > .crumb-icon { + margin-left: 3px; + } + + > .crumb-content { overflow: hidden; text-overflow: ellipsis; word-break: break-all; white-space: nowrap; - } - - > div.crumb-content { text-align: left; - color: $whiteSmoke; font-size: 12px; line-height: 16px; - - &.no-label { - height: 100%; - display: flex; - align-items: center; - margin-left: 3px; - } + height: 100%; + display: flex; + align-items: center; + margin-left: 3px; &.invert-ellipsis { - // width:170px; - // border:1px solid #999; direction:rtl; text-align:left; } } - - > div.crumb-label { - color: $whiteSmoke-darker; - font-style: italic; - text-align: right; - line-height: 9px; - font-size: 9px; - margin-top: 2px; - } } ul > .expand { diff --git a/app/components/base/breadcrumbs/breadcrumb-models.ts b/app/components/base/breadcrumbs/breadcrumb-models.ts index 53c7bca0c0..49d2f1ed54 100644 --- a/app/components/base/breadcrumbs/breadcrumb-models.ts +++ b/app/components/base/breadcrumbs/breadcrumb-models.ts @@ -3,7 +3,7 @@ import { Params } from "@angular/router"; export interface BreadcrumbData { name: string; - label: string; + icon: string; invertName?: boolean; } diff --git a/app/components/base/breadcrumbs/breadcrumb.component.ts b/app/components/base/breadcrumbs/breadcrumb.component.ts index fe1d384e4a..2d53e763d7 100644 --- a/app/components/base/breadcrumbs/breadcrumb.component.ts +++ b/app/components/base/breadcrumbs/breadcrumb.component.ts @@ -20,6 +20,10 @@ export class BreadcrumbComponent { return this.crumb && this.crumb.data.name; } + public get icon() { + return this.crumb && this.crumb.data.icon; + } + @HostBinding("class") public classes = "noselect"; diff --git a/app/components/base/breadcrumbs/breadcrumb.html b/app/components/base/breadcrumbs/breadcrumb.html index 7122d2377f..df0daaf037 100644 --- a/app/components/base/breadcrumbs/breadcrumb.html +++ b/app/components/base/breadcrumbs/breadcrumb.html @@ -1,4 +1,2 @@ -
{{crumb.data.name}}
-
- {{crumb.data.label}} -
+ +{{crumb.data.name}} diff --git a/app/components/base/list-and-show-layout/list-and-show-layout.html b/app/components/base/list-and-show-layout/list-and-show-layout.html index 4c54444584..cb33ac22c6 100644 --- a/app/components/base/list-and-show-layout/list-and-show-layout.html +++ b/app/components/base/list-and-show-layout/list-and-show-layout.html @@ -1,10 +1,6 @@
-
- - -
diff --git a/app/components/pool/details/pool-details.component.ts b/app/components/pool/details/pool-details.component.ts index 6e895e5a02..98f56bcf00 100644 --- a/app/components/pool/details/pool-details.component.ts +++ b/app/components/pool/details/pool-details.component.ts @@ -26,6 +26,7 @@ export class PoolDetailsComponent implements OnInit, OnDestroy { return { name: id, label, + icon: "database", }; } diff --git a/app/styles/main.scss b/app/styles/main.scss index 2d1babf0ae..675e3129d9 100644 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -4,7 +4,6 @@ @import "./common/type"; // Base styles -@import "./base/breadcrumbs"; @import "./base/buttons"; @import "./base/graphs/gauge"; @import "./base/list-and-show-layout"; diff --git a/app/styles/partials/header.scss b/app/styles/partials/header.scss index f69243bd37..7e369d20d3 100644 --- a/app/styles/partials/header.scss +++ b/app/styles/partials/header.scss @@ -2,28 +2,19 @@ #header { display: flex; - .logo-banner-bar { - float: left; + .logo { height: 31px; + margin: 5px 10px 0; + height: 100%; + color: $whitesmoke; + font-size: 16px; - a { - position: relative; - display: inline-block; - } - - a:after { - content: ""; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; + &:hover { + background-color: $navigation-bg; } - .logo { - margin-top: 5px; - margin-left: 7px; - float: left; + > .fa { + margin-right: 5px; } } } From 2be5eeb90ba90bebe688b82b15da2edb45357dd6 Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Wed, 22 Nov 2017 15:30:38 -0800 Subject: [PATCH 02/10] Looks nice --- app/assets/images/header/batchlabs.png | Bin 1932 -> 0 bytes .../base/breadcrumbs/breadcrumb-group.scss | 6 ++++-- app/styles/partials/header.scss | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 app/assets/images/header/batchlabs.png diff --git a/app/assets/images/header/batchlabs.png b/app/assets/images/header/batchlabs.png deleted file mode 100644 index 1643cac11f67df225d973db24ac47765e78bebea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1932 zcmV;72Xpv|P)X1^@s67(6o(00001b5ch_0Itp) z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^Ag1Z(U700#U?L_t(|UhSL(sAW|Yh6e)_yBizDZc#B1 zyHIRYu&@JE1QWZvJ20^WMa9DI#KOQ<1QlCEeg5CfU9jGs|D1Q93gfU zOA2@0#K=k_w6t(-dgW|!tvEQvMuHawxE*9uZ;qtvOl1BeZpi6|yk1t*j=yBolmC7J&&@hzIXB45sg=@2xxInxv zJ{7NsJH;NNY%$H;7PqCpWuccG?M>x^ZldQ<~%^GAc$eO3q^=+y10fLbUVR_g}xVz{IHW)RzzDy>=2{)_JZv|ZfLf; zP_BY!qlZovjDU0qVIs7yi0ir`jNVNrF^@o)^&qjLn5FYCBYen>?D0EdW^|v}Sn%Es z6@Llzx0qh!Yh#u~{bMdcjQ>MA>wi11D}9Cy8nV&32~X;9yTF9#UC}i4+swp*hXi6u zUgp?7Lf?oo7u+lm1*$1UnO|S*mtJS1V+8WK{cPfQfo>H!HxyxXIvAHP*}}vE%!_Uj zWiEF{EQiYc)*_Vm^p_&gQJB2)KfneJ+2~DTjk%3**SEoFi`+CdjQ+VObATyB2MX7w zBpZDz;o7jqMi|QFn+T)3PHVVuI0?~#mANo_Th*O)H_Go}5dt0UBXavnA7g`tY;;EQ zC_Ug+VP{;}~U3YCtveBE4z=p}%W)hAtI_C>q zemGDNL=@P{To}Erx_`7l6x(u~4jD1+r*m|(ph}-%gNC*>I?OC6sD)M*WgFI?RLdzq zu`Xq;7;8zy)W5ujP6W9eu$32@TDUeP-58yY4E-crzKJk8%L$ivuw%jWy6JOqo!s*R zwHcjtKPuPVs|dC$L%c`+f9q7fkFi0+P)3IhMCe$Na}?UL*v5KPJR>kMa%Sd6MsJET z2QligrgnM9aEwkR-{qSauF-cES@F5BjA4d@+Kk?I5|O$@XmXKr^9r6-_)diQ4Cx$l zyGoy6gNAO5KA8yRA{NE25XWX`75Tc$1#(7b9~`l_T;_lZe26NxYg00kMvsxQ8>6o+ zLT8HdJU>M?)T_}si-0h*%LjXk=xkBm(WvwZHfZR^=+lW%z5!X&qmM;yAH)s)o+xu? z3DjhCw!}i42-l`$Vlg_i9#pQO1I&-y=hltU;36a|etV@wI`cVRXCdwSlB>oWSUg6qICGu{-aE#6~-!9+8aEyMpK%7Bv z`8Y$+W^|Mf0|oPmP`6Lg#i&k!)#WRbFg9q&MrVp1Od;5^iM2AqxcOSvf`}1gO_6i4 zeTJOTbFqyBFcIenXMBC42w~8O!)}7pUU?}op^QFf1I&DA8@mmhQd>{t@5Axb&`?H4 z`DwX11V>v#`Lkjcf$`^0G04j+4jkoNr4O({LpFMw-Vo(Y#L2ZdRD(DO!ny3&lA|Dp z-WT~gm_fwh6%@x+F+#MVYMl>|IC1hV+IM4gMm5A=p>g>pay7e2ynos*B)%ok5mW8k z1f2_t&xLdQ<82?JIqP4H|Y7P2y(dCT)9a zjkPp4Q5I`cs`2ZLe&vl0+ltaa%o56WjB4e1cdFRsnsX$L&N79L3Fyc&d@qEVqy4Ia zhiS5?+*2T1ZS<>lqjOZ4(U{p#7N6}dqP&hRG`1}B_Fag22uq>zno1vFgAGh$817*U zrj=BiIqP1=*^AGyl7$5aWXh_23CD1m3bRgid5CGW%LU}8En*`D#W0@k<2~j$pNo6H z)E&y-pEL3siEefu*ly#j1MQh{mD_KXKEnnpl}dkMgOy69zp%kdrP5CfjQS4(2*nFK Sl>0dV0000 .fa { From 12be1985589fb147cc4044e784d2b8a1d5f77d74 Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Wed, 22 Nov 2017 16:03:31 -0800 Subject: [PATCH 03/10] SCrolling --- app/app.layout.html | 1 - .../base/breadcrumbs/breadcrumb-group.component.ts | 5 +++++ app/styles/partials/header.scss | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/app.layout.html b/app/app.layout.html index 10bb660dc7..0b72d6c2d3 100644 --- a/app/app.layout.html +++ b/app/app.layout.html @@ -14,7 +14,6 @@ -
diff --git a/app/components/base/breadcrumbs/breadcrumb-group.component.ts b/app/components/base/breadcrumbs/breadcrumb-group.component.ts index 0f7a3a61b2..6a8e1d3a22 100644 --- a/app/components/base/breadcrumbs/breadcrumb-group.component.ts +++ b/app/components/base/breadcrumbs/breadcrumb-group.component.ts @@ -40,6 +40,11 @@ export class BreadcrumbGroupComponent implements OnDestroy { } } + @HostListener("mousewheel", ["$event"]) + public mouseWheelMoves(event: WheelEvent) { + this.elementRef.nativeElement.scrollLeft -= (event.wheelDelta > 0 ? 10 : -10); + } + public expand(event: Event) { this.expanded = true; this._updateDisplayedCrumbs(); diff --git a/app/styles/partials/header.scss b/app/styles/partials/header.scss index 0a013e44ee..7d0e53294b 100644 --- a/app/styles/partials/header.scss +++ b/app/styles/partials/header.scss @@ -17,6 +17,20 @@ margin-right: 5px; } } + + > * { + flex-shrink: 0; + } + + > bl-breadcrumb-group { + flex: 1; + min-width: 200px; + overflow-x: auto; + overflow-y: hidden; + &::-webkit-scrollbar { + height: 1px; + } + } } .bookmarks-container { From 9b6b213da66dd04adc89de71f441ac0c322fc5b2 Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Wed, 22 Nov 2017 16:12:22 -0800 Subject: [PATCH 04/10] More --- .../breadcrumbs/breadcrumb-group.component.ts | 37 ++++--------------- .../base/breadcrumbs/breadcrumb-group.html | 15 +++++--- .../base/breadcrumbs/breadcrumb-models.ts | 3 +- .../job/details/job-details.component.ts | 1 + .../application-action/choose-action.html | 1 - .../local-template-browser.html | 2 - .../submit-local-template.html | 2 - .../submit-recent-template.html | 1 - .../submit/submit-market-application.html | 1 - 9 files changed, 20 insertions(+), 43 deletions(-) diff --git a/app/components/base/breadcrumbs/breadcrumb-group.component.ts b/app/components/base/breadcrumbs/breadcrumb-group.component.ts index 6a8e1d3a22..be44ed5505 100644 --- a/app/components/base/breadcrumbs/breadcrumb-group.component.ts +++ b/app/components/base/breadcrumbs/breadcrumb-group.component.ts @@ -6,25 +6,25 @@ import { BreadcrumbService } from "./breadcrumb.service"; import "./breadcrumb-group.scss"; -// Max number of breadcrumb to display without expanding -const expandableCount = 4; @Component({ selector: "bl-breadcrumb-group", templateUrl: "breadcrumb-group.html", }) export class BreadcrumbGroupComponent implements OnDestroy { public crumbs: Breadcrumb[] = []; - public displayCrumbs: Breadcrumb[] = []; - public expandable = false; - public expanded = false; private _subscription: Subscription; + private _lastCrumbCount = 0; constructor(breadcrumbService: BreadcrumbService, private elementRef: ElementRef) { this._subscription = breadcrumbService.crumbs.subscribe((crumbs) => { this.crumbs = crumbs; - this.expandable = crumbs.length > expandableCount; - this._updateDisplayedCrumbs(); + if (crumbs.length > this._lastCrumbCount) { + console.log("SW", this.elementRef.nativeElement.scrollWidth); + setTimeout(() => { + this.elementRef.nativeElement.scrollLeft = this.elementRef.nativeElement.scrollWidth; + }); + } }); } @@ -32,31 +32,8 @@ export class BreadcrumbGroupComponent implements OnDestroy { this._subscription.unsubscribe(); } - @HostListener("document:click", ["$event"]) - public onClick(event: Event) { - if (!this.elementRef.nativeElement.contains(event.target)) { - this.expanded = false; - this._updateDisplayedCrumbs(); - } - } - @HostListener("mousewheel", ["$event"]) public mouseWheelMoves(event: WheelEvent) { this.elementRef.nativeElement.scrollLeft -= (event.wheelDelta > 0 ? 10 : -10); } - - public expand(event: Event) { - this.expanded = true; - this._updateDisplayedCrumbs(); - event.stopImmediatePropagation(); - } - - private _updateDisplayedCrumbs() { - const crumbs = this.crumbs; - if (this.expandable && !this.expanded) { - this.displayCrumbs = crumbs.slice(crumbs.length - 3, crumbs.length); - } else { - this.displayCrumbs = crumbs; - } - } } diff --git a/app/components/base/breadcrumbs/breadcrumb-group.html b/app/components/base/breadcrumbs/breadcrumb-group.html index 9c7339e110..fa1ff5bdb4 100644 --- a/app/components/base/breadcrumbs/breadcrumb-group.html +++ b/app/components/base/breadcrumbs/breadcrumb-group.html @@ -1,9 +1,14 @@
    - + -
    - ... -
    - + + + + + + + + +
diff --git a/app/components/base/breadcrumbs/breadcrumb-models.ts b/app/components/base/breadcrumbs/breadcrumb-models.ts index 49d2f1ed54..b43d74e5a0 100644 --- a/app/components/base/breadcrumbs/breadcrumb-models.ts +++ b/app/components/base/breadcrumbs/breadcrumb-models.ts @@ -3,7 +3,8 @@ import { Params } from "@angular/router"; export interface BreadcrumbData { name: string; - icon: string; + icon?: string; + label: string; invertName?: boolean; } diff --git a/app/components/job/details/job-details.component.ts b/app/components/job/details/job-details.component.ts index 380a1604e1..cbc72b31ed 100644 --- a/app/components/job/details/job-details.component.ts +++ b/app/components/job/details/job-details.component.ts @@ -30,6 +30,7 @@ export class JobDetailsComponent implements OnInit, OnDestroy { return { name: id, label, + icon: "tasks", }; } diff --git a/app/components/market/application-action/choose-action.html b/app/components/market/application-action/choose-action.html index 40bf4daef3..b82399fed4 100644 --- a/app/components/market/application-action/choose-action.html +++ b/app/components/market/application-action/choose-action.html @@ -1,5 +1,4 @@ -

diff --git a/app/components/market/local-template-browser/local-template-browser.html b/app/components/market/local-template-browser/local-template-browser.html index 9cd8721ee7..3f9d30ea38 100644 --- a/app/components/market/local-template-browser/local-template-browser.html +++ b/app/components/market/local-template-browser/local-template-browser.html @@ -1,5 +1,3 @@ - -

Local templates

diff --git a/app/components/market/submit-local-template/submit-local-template.html b/app/components/market/submit-local-template/submit-local-template.html index 5b72a1bfc4..846021d80c 100644 --- a/app/components/market/submit-local-template/submit-local-template.html +++ b/app/components/market/submit-local-template/submit-local-template.html @@ -1,6 +1,4 @@ - -
{{error}} diff --git a/app/components/market/submit-recent-template/submit-recent-template.html b/app/components/market/submit-recent-template/submit-recent-template.html index be3521ac24..af585bb15f 100644 --- a/app/components/market/submit-recent-template/submit-recent-template.html +++ b/app/components/market/submit-recent-template/submit-recent-template.html @@ -1,5 +1,4 @@ - - From 63a6abf90592561bdb6a875eb94cce5410041315 Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Wed, 22 Nov 2017 16:13:12 -0800 Subject: [PATCH 05/10] More --- .../base/breadcrumbs/breadcrumb-group.component.ts | 1 - app/components/base/breadcrumbs/breadcrumb-group.html | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/app/components/base/breadcrumbs/breadcrumb-group.component.ts b/app/components/base/breadcrumbs/breadcrumb-group.component.ts index be44ed5505..ae1c4d87c4 100644 --- a/app/components/base/breadcrumbs/breadcrumb-group.component.ts +++ b/app/components/base/breadcrumbs/breadcrumb-group.component.ts @@ -20,7 +20,6 @@ export class BreadcrumbGroupComponent implements OnDestroy { this._subscription = breadcrumbService.crumbs.subscribe((crumbs) => { this.crumbs = crumbs; if (crumbs.length > this._lastCrumbCount) { - console.log("SW", this.elementRef.nativeElement.scrollWidth); setTimeout(() => { this.elementRef.nativeElement.scrollLeft = this.elementRef.nativeElement.scrollWidth; }); diff --git a/app/components/base/breadcrumbs/breadcrumb-group.html b/app/components/base/breadcrumbs/breadcrumb-group.html index fa1ff5bdb4..b96a8bab73 100644 --- a/app/components/base/breadcrumbs/breadcrumb-group.html +++ b/app/components/base/breadcrumbs/breadcrumb-group.html @@ -1,14 +1,4 @@
    - - - - - - - - - -
From 7f3fa4fb28397e480f533bdb7213e225c744378f Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Mon, 27 Nov 2017 09:30:18 -0800 Subject: [PATCH 06/10] More --- app/components/base/breadcrumbs/breadcrumb.service.ts | 2 +- app/components/base/editor/editor.component.ts | 4 +++- app/components/node/details/node-details.component.ts | 1 + app/components/task/details/task-details.component.ts | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/components/base/breadcrumbs/breadcrumb.service.ts b/app/components/base/breadcrumbs/breadcrumb.service.ts index a74ad95563..2ad0cf0abd 100644 --- a/app/components/base/breadcrumbs/breadcrumb.service.ts +++ b/app/components/base/breadcrumbs/breadcrumb.service.ts @@ -12,7 +12,7 @@ function breadcrumbMethodMissingMessage(componentName) { class ${componentName} { // Add this method public static breadcrumb(params, queryParams) { - return {name: "Some name", label: "Some label"}; + return {name: "Some name", label: "Some label", icon: "fontawesome-icon"}; } } `; diff --git a/app/components/base/editor/editor.component.ts b/app/components/base/editor/editor.component.ts index 043019b9ac..cb3947bbb5 100644 --- a/app/components/base/editor/editor.component.ts +++ b/app/components/base/editor/editor.component.ts @@ -99,7 +99,9 @@ export class EditorComponent implements ControlValueAccessor, AfterViewInit, OnC } public ngOnDestroy() { - this._editor.dispose(); + if (this._editor) { + this._editor.dispose(); + } this._resizeDetector.uninstall(this.elementRef.nativeElement); } diff --git a/app/components/node/details/node-details.component.ts b/app/components/node/details/node-details.component.ts index bd2ac901ca..00f20f5f97 100644 --- a/app/components/node/details/node-details.component.ts +++ b/app/components/node/details/node-details.component.ts @@ -21,6 +21,7 @@ export class NodeDetailsComponent implements OnInit, OnDestroy { return { name: id, label, + icon: "microchip", }; } diff --git a/app/components/task/details/task-details.component.ts b/app/components/task/details/task-details.component.ts index 4afbc87496..add071b193 100644 --- a/app/components/task/details/task-details.component.ts +++ b/app/components/task/details/task-details.component.ts @@ -21,6 +21,7 @@ export class TaskDetailsComponent implements OnInit, OnDestroy { return { name: id, label, + icon: "cogs", }; } From eb887ee0d3461074b9c9a7e7209830df10d197ec Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Mon, 27 Nov 2017 11:20:21 -0800 Subject: [PATCH 07/10] fix specs --- .../breadcrumb-group.component.spec.ts | 38 +------------------ 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/test/app/components/base/breadcrumbs/breadcrumb-group.component.spec.ts b/test/app/components/base/breadcrumbs/breadcrumb-group.component.spec.ts index a9ee7e1218..60eea436f2 100644 --- a/test/app/components/base/breadcrumbs/breadcrumb-group.component.spec.ts +++ b/test/app/components/base/breadcrumbs/breadcrumb-group.component.spec.ts @@ -3,8 +3,7 @@ import { By } from "@angular/platform-browser"; import { BehaviorSubject } from "rxjs"; import { BreadcrumbGroupComponent, BreadcrumbModule, BreadcrumbService } from "app/components/base/breadcrumbs"; -import { click } from "test/utils/helpers"; -import { jobsCrumb, node1Crumb, pool1Crumb, pool1PropertiesCrumb, poolsCrumb } from "./crumbs-data"; +import { pool1Crumb, pool1PropertiesCrumb, poolsCrumb } from "./crumbs-data"; describe("BreadcrumbGroupComponent", () => { let fixture: ComponentFixture; @@ -36,39 +35,4 @@ describe("BreadcrumbGroupComponent", () => { expect(crumbs[2].nativeElement.textContent).toContain(pool1PropertiesCrumb.data.name); }); }); - - describe("when there is more than 4 crumbs", () => { - beforeEach(() => { - serviceSpy.crumbs.next([poolsCrumb, pool1Crumb, pool1PropertiesCrumb, node1Crumb, jobsCrumb]); - fixture.detectChanges(); - }); - - it("should only display 4 crumbs", () => { - const crumbs = fixture.debugElement.queryAll(By.css("bl-breadcrumb")); - expect(crumbs.length).toBe(4); - expect(crumbs[0].nativeElement.textContent).toContain(poolsCrumb.data.name); - expect(crumbs[1].nativeElement.textContent).toContain(pool1PropertiesCrumb.data.name); - expect(crumbs[2].nativeElement.textContent).toContain(node1Crumb.data.name); - expect(crumbs[3].nativeElement.textContent).toContain(jobsCrumb.data.name); - }); - - it("should display the expand button", () => { - const expandBtn = fixture.debugElement.query(By.css(".expand")); - expect(expandBtn).toBeTruthy(); - }); - - it("clicking on expand btn should show all crumbs", () => { - const expandBtn = fixture.debugElement.query(By.css(".expand")); - click(expandBtn); - fixture.detectChanges(); - const crumbs = fixture.debugElement.queryAll(By.css("bl-breadcrumb")); - expect(crumbs.length).toBe(5); - - expect(crumbs[0].nativeElement.textContent).toContain(poolsCrumb.data.name); - expect(crumbs[1].nativeElement.textContent).toContain(pool1Crumb.data.name); - expect(crumbs[2].nativeElement.textContent).toContain(pool1PropertiesCrumb.data.name); - expect(crumbs[3].nativeElement.textContent).toContain(node1Crumb.data.name); - expect(crumbs[4].nativeElement.textContent).toContain(jobsCrumb.data.name); - }); - }); }); From 18545554b388e541df567ace5fec648084818063 Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Mon, 27 Nov 2017 12:32:44 -0800 Subject: [PATCH 08/10] fix stylelint --- .vscode/settings.json | 5 ++++- app/styles/partials/header.scss | 7 +++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 33746eca82..d2afda7631 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,5 +23,8 @@ "tslint.jsEnable": true, "tslint.autoFixOnSave": true, "vsicons.presets.angular": true, - "tslint.alwaysShowRuleFailuresAsWarnings": true + "tslint.alwaysShowRuleFailuresAsWarnings": true, + "stylelint.enable": true, + "css.validate": false, + "scss.validate": false } diff --git a/app/styles/partials/header.scss b/app/styles/partials/header.scss index 7d0e53294b..d325422d1e 100644 --- a/app/styles/partials/header.scss +++ b/app/styles/partials/header.scss @@ -3,7 +3,6 @@ display: flex; .logo { - height: 31px; margin: 5px 10px 0; height: 100%; color: $whitesmoke; @@ -13,12 +12,12 @@ background-color: $navigation-background; } - > .fa { + > .fa { margin-right: 5px; } } - > * { + > * { flex-shrink: 0; } @@ -28,7 +27,7 @@ overflow-x: auto; overflow-y: hidden; &::-webkit-scrollbar { - height: 1px; + height: 1px; } } } From d82e94107e7264aa42a23cf9c19be036eaba201e Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Mon, 27 Nov 2017 12:55:53 -0800 Subject: [PATCH 09/10] Added header component --- app/app.layout.html | 18 +---- .../layout/header/header.component.ts | 11 +++ app/components/layout/header/header.html | 19 +++++ app/components/layout/header/header.scss | 70 +++++++++++++++++++ app/components/layout/header/index.ts | 1 + app/components/layout/index.ts | 1 + app/components/layout/layout.module.ts | 3 +- app/styles/base/layout.scss | 28 +------- app/styles/main.scss | 1 - app/styles/partials/header.scss | 33 --------- 10 files changed, 107 insertions(+), 78 deletions(-) create mode 100644 app/components/layout/header/header.component.ts create mode 100644 app/components/layout/header/header.html create mode 100644 app/components/layout/header/header.scss create mode 100644 app/components/layout/header/index.ts delete mode 100644 app/styles/partials/header.scss diff --git a/app/app.layout.html b/app/app.layout.html index 0b72d6c2d3..fad976a45f 100644 --- a/app/app.layout.html +++ b/app/app.layout.html @@ -1,21 +1,7 @@
-