Skip to content

Commit

Permalink
fix select-element-active css
Browse files Browse the repository at this point in the history
  • Loading branch information
santiago-elustondo committed Jun 4, 2018
1 parent 9854fa2 commit 69f7045
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/frontend/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
[ngModules]="ngModules"
(tabChange)="onSelectedTabChange($event)"
(componentsSubTabMenuChange)="onSelectedComponentsSubTabMenuChange($event)"
(DOMSelectionActiveChange)="onDOMSelectionActiveChange($event)"
(domSelectionActiveChange)="onDOMSelectionActiveChange($event)"
(selectNode)="onSelectNode($event)"
(inspectElement)="onInspectElement($event)"
(collapseChildren)="onCollapseChildren($event)"
Expand Down
1 change: 1 addition & 0 deletions src/frontend/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@ export class App {
}

private onDOMSelectionActiveChange(state: boolean) {
console.log('setting to: ', state);
this.mainActions.setDOMSelectionActive(state);
}

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/components/app-trees/app-trees.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[domSelectionActive]="domSelectionActive"
[selectedTab]="selectedTab"
(tabChange)="onTabSelectionChanged($event)"
(DOMSelectionActiveChange)="onDOMSelectionActiveChange($event)">
(domSelectionActiveChange)="onDOMSelectionActiveChange($event)">
<div postlude class="flex px3">
<span *ngIf="ngVersion" class="ngVersion">
Angular Version: {{ngVersion}}
Expand Down
1 change: 1 addition & 0 deletions src/frontend/components/app-trees/app-trees.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export class AppTrees {
}

onDOMSelectionActiveChange(state: boolean) {
console.log('second reaction')
this.domSelectionActiveChange.emit(state);
}

Expand Down
1 change: 1 addition & 0 deletions src/frontend/components/tab-menu/tab-menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<img src="../images/augury-logo.svg" class="logo">
<div (click)="selectElement()" class="select-element"
[ngClass]="{'select-element-active': domSelectionActive}">
<h1>{{domSelectionActive}}</h2>
<svg width="16px" height="16px" viewBox="0 0 28 26" version="1.1" xmlns="http://www.w3.org/2000/svg">
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="pointer" transform="translate(2.000000, 2.000000)">
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/components/tab-menu/tab-menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ export class TabMenu {
@Output() tabChange: EventEmitter<any> = new EventEmitter<any>();
@Output() domSelectionActiveChange: EventEmitter<any> = new EventEmitter<any>();

constructor(private userActions: UserActions) {
}
constructor(private userActions: UserActions) {}

selectElement() {
console.log("first reaction");
if (this.domSelectionActive) {
this.userActions.cancelFindElement();
this.domSelectionActiveChange.emit(false);
Expand Down
29 changes: 10 additions & 19 deletions src/styles/utils/colors.css
Original file line number Diff line number Diff line change
Expand Up @@ -92,19 +92,11 @@ bt-injector-tree {
background-color: #E5E5E5;
}

& .select-element-active > svg * > polygon {
fill: #5A5A5A;
}

& .select-element-active > svg * > path {
stroke: #5A5A5A;
}

& .select-element-active > svg * > polygon {
& .select-element-active svg * polygon {
fill: #4280EC;
}

& .select-element-active > svg * > path {
& .select-element-active svg * path {
stroke: #4280EC;
}

Expand Down Expand Up @@ -241,23 +233,22 @@ bt-injector-tree {
background-color: #313131;
}

& .select-element > svg * > polygon {
fill: #FFCC33;
& .select-element-active > svg * > polygon {
fill: #03f4ff;
}

& .select-element > svg * > path {
stroke: #FFCC33;
& .select-element-active > svg * > path {
stroke: #03f4ff;
}

& .select-element-active > svg * > polygon {
fill: #A28AD0;
& .select-element > svg * > polygon {
fill: #FFCC33;
}

& .select-element-active > svg * > path {
stroke: #A28AD0;
& .select-element > svg * > path {
stroke: #FFCC33;
}


& .node-item:hover {
background-color: #3D3D3D;
}
Expand Down

0 comments on commit 69f7045

Please sign in to comment.