Skip to content

Commit f970650

Browse files
authored
Merge pull request #20 from utat-ss/add-logo
Add logo and update styling
2 parents 18f1772 + 890d8ef commit f970650

File tree

8 files changed

+17
-14
lines changed

8 files changed

+17
-14
lines changed

Diff for: client/src/app/app.component.html

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<div id="title">
2+
<img src="assets/utat-treeviz-logo.png" style="object-fit: contain; object-position: left;" height="100%" width="100%"/>
3+
</div>
4+
15
<div style="display: flex; flex-grow: grow">
26
<app-node-directory [model]="model" [selectedNode]="selectedNode" [visibleList]="visibleList" (nodeClicked)="setSelectedNode($event)"></app-node-directory>
37
<app-org-chart [model]="model" [selectedNode]="selectedNode" [visibleList]="visibleList" (nodeClicked)="setSelectedNode($event)"></app-org-chart>

Diff for: client/src/app/app.component.sass

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
position: absolute
44
font-family: Sans-Serif
55
font-weight: bold
6-
width: 50vw
6+
height: 70px
7+
width: 20vw
78
z-index: 10
8-
margin: 1vh 1vh
9-
padding: 3vh 3vh
10-
border: #000 solid 2px
+7-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
mat-form-field, #form button
2-
margin: 1em
2+
margin-left: 1em
3+
margin-top: 1em
34

4-
#active-filters
5-
margin: 1em
5+
#container
6+
margin-left: 20vw
7+
margin-top: -5vh
8+
position: absolute
9+
z-index: 10

Diff for: client/src/app/components/inspector/inspector.component.sass

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#container
22
overflow: auto
3-
height: 98.5vh
3+
height: 80vh
44
margin: 0%
55
padding: 3% 1% 0 1%
6-
border: #000 solid 1px
76

87
mat-form-field
98
width: 100%
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<div id="app-node-directory"></div>
2-
<input type="text" placeholder="Search for a requirement" size="26px" [(ngModel)]="searchText" (keyup.enter)="searchNodes()" (keydown)="onKeyDown($event)" [style.color]="hasMatchingNodes ? '' : 'red'">
2+
<input type="text" placeholder="Search for a requirement" style="width: 20vw;" [(ngModel)]="searchText" (keyup.enter)="searchNodes()" (keydown)="onKeyDown($event)" [style.color]="hasMatchingNodes ? '' : 'red'">
33
<button (click)="clearSearch()" style="width: 99px; height: 20px;">Clear Search</button>

Diff for: client/src/app/components/node-directory/node-directory.component.sass

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
margin-right: auto
44
margin-top: 0
55
width: 20vw
6-
height: 97vh
7-
border: 1px solid black
6+
height: 80vh
87

98
#expandAllButton
109
background-color: #ADD8E6

Diff for: client/src/app/components/org-chart/org-chart.component.sass

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#app-org-chart
22
background: whitesmoke
33
width: 60vw
4-
height: 99.5vh
5-
border: 1px solid black
4+
height: 80vh
65
margin-right: 0
76
margin-left: auto
87
margin-top: 0

Diff for: client/src/assets/utat-treeviz-logo.png

116 KB
Loading

0 commit comments

Comments
 (0)