Skip to content

Commit fbee2eb

Browse files
blabla1337blabla1337
committed
Improve styling
1 parent fcf5204 commit fbee2eb

File tree

12 files changed

+122
-111
lines changed

12 files changed

+122
-111
lines changed

‎Angular2/src/app/app-routing.module.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const routes: Routes = [
1616
];
1717

1818
@NgModule({
19-
imports: [RouterModule.forRoot(routes, { scrollPositionRestoration: 'top' })],
19+
imports: [RouterModule.forRoot(routes)],
2020
exports: [RouterModule]
2121
})
2222

‎Angular2/src/app/layouts/horizontaltopbar/horizontaltopbar.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
<div class="navbar-brand-box">
11-
<a href="/" class="logo logo-light">
11+
<a href="/" class="logo logo-light">
1212
<span class="logo-sm">
1313
<img src="assets/images/logo.svg" alt="" height="22">
1414
Security Knowledge Framework
@@ -78,7 +78,7 @@
7878
<a class="dropdown-item" (click)='platformUpdate(item.id)'>{{item.name}}</a>
7979
</div>
8080
<div class="dropdown-divider"></div>
81-
<a *ngIf="priv.includes('manage')" routerLink="/category/manage" class="dropdown-item text-center text-primary">Manage</a>
81+
<a *ngIf="priv.includes('manage')" routerLink="/category/manage" class="dropdown-item text-center text-primary">Manage Types</a>
8282
</div>
8383
</div>
8484

‎Angular2/src/app/pages/auth/login/login.component.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ <h5 class="text-dark">Welcome Back !</h5>
1717
</div>
1818
<div class="card-body pt-0">
1919
<div>
20-
<a href="javascript: void(0)">
2120
<div class="avatar-md profile-user-wid mb-4">
2221
<span class="avatar-title rounded-circle">
2322
<img src="assets/images/logo.svg" alt="SKF Logo" class="rounded-circle" height="65">
2423
</span>
2524
</div>
26-
</a>
2725
</div>
2826
<div class="p-2" *ngIf="loginMethod == 'skfprovider'">
2927
<ngb-alert type="danger" *ngIf="errormsg" [dismissible]="false">Username or Password is incorrect.</ngb-alert>
@@ -48,13 +46,13 @@ <h5 class="text-dark">Welcome Back !</h5>
4846
</div>
4947

5048
<div class="mt-3">
51-
<button (click)="onLogin()" class="btn btn-primary btn-block" type="submit">Log In</button>
49+
<button (click)="onLogin()" class="btn btn-primary btn-block" type="submit">Login</button>
5250
</div>
53-
51+
<!--
5452
<div class="mt-4 text-center">
5553
<a routerLink="javascript: void(0)" class="text-muted"><i class="mdi mdi-lock mr-1"></i> Forgot your
5654
password?</a>
57-
</div>
55+
</div> -->
5856
<div class="mt-3 text-center">
5957
<a href="javascript: void(0)" (click)="onSkip()" class="text-muted"><i
6058
class="mdi mdi-lock-open mr-1"></i> Skip Login</a>

‎Angular2/src/app/pages/checklists/manage/manage.component.html‎

Lines changed: 85 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,89 @@
88
</div>
99
<ul ngbNav joyrideStep="manageInfo" title="Checklists expert wizard" [stepContent]="manageInfo"
1010
#nav="ngbNav" [activeId]="1" class="nav-tabs nav-tabs-custom mt-3">
11-
<li [ngbNavItem]="1">
11+
12+
<li [ngbNavItem]="1">
13+
<a ngbNavLink joyrideStep="manageReq" title="Checklists requirements" [stepContent]="manageReq">Requirements</a>
14+
<ng-template ngbNavContent>
15+
<div class="row mb-3 mt-4">
16+
<div class="col-lg-12">
17+
<div class="row mb-3">
18+
<div class="col-7">
19+
<p class="card-title">Manage Requirements</p>
20+
</div>
21+
<div class="col-5">
22+
<a type="button" routerLink="/checklists/add-requirement" class="btn btn-primary float-right mb-2">Add
23+
requirement</a>
24+
</div>
25+
</div>
26+
<div class="table-responsive">
27+
<table class="table table-centered table-nowrap table-hover">
28+
<thead class="thead-light">
29+
<tr>
30+
<th scope="col">
31+
<div class="text-center">Security controls / Security requirements</div>
32+
</th>
33+
<th scope="col">
34+
<div class="text-center">Action</div>
35+
</th>
36+
</tr>
37+
</thead>
38+
<tbody>
39+
<tr *ngFor="let item of checklistData.items">
40+
<td style="width: 60%">
41+
<div class="mt-2">
42+
<h6 class="text-dark">{{item.checklist_items_checklist_id}}
43+
{{item.checklist_items_content |slice:0:130}}...</h6>
44+
</div>
45+
</td>
46+
<td style="width: 40%">
47+
<ul class="list-inline mb-0 text-center">
48+
<li class="list-inline-item">
49+
<a type="button" [routerLink]="['/checklists/update-requirement', item.id]"
50+
class="btn btn-success btn-sm">Update</a>
51+
</li>
52+
<li class="list-inline-item">
53+
<button (click)="centerModal(controlDelete)" type="button"
54+
class="btn btn-danger btn-sm ml-2">Delete</button>
55+
</li>
56+
</ul>
57+
</td>
58+
59+
<!-- Deletion modal-->
60+
<ng-template #controlDelete let-modal>
61+
<div class="modal-header">
62+
<h5 class="modal-title mt-0">Delete Requirement</h5>
63+
<button type="button" class="close" aria-label="Close" (click)="modal.dismiss('Close click')">
64+
<span aria-hidden="true">&times;</span>
65+
</button>
66+
</div>
67+
<div class="modal-body">
68+
<form>
69+
<div class="form-group">
70+
<label for="delete">Type <b class="text-danger">DELETE</b> to delete the Requirement
71+
item</label>
72+
<input autocomplete="off" [(ngModel)]="delete" type="text" class="form-control" id="delete"
73+
name="delete" placeholder="Type DELETE" onfocus="this.placeholder = ''"
74+
onblur="this.placeholder = 'Type DELETE'">
75+
</div>
76+
<button (click)="deleteRequirement(item.id); modal.dismiss('Cross click')"
77+
class="btn btn-danger">Delete</button>
78+
</form>
79+
</div>
80+
</ng-template>
81+
<!-- END Project Delete Modal -->
82+
83+
</tr>
84+
</tbody>
85+
</table>
86+
</div>
87+
</div>
88+
<!-- end col-->
89+
</div>
90+
</ng-template>
91+
</li>
92+
93+
<li [ngbNavItem]="2">
1294
<a ngbNavLink joyrideStep="manageConfig" title="Checklists config" [stepContent]="manageConfig">Config questionnaire</a>
1395
<ng-template ngbNavContent>
1496
<div class="card mt-3 shadow-none">
@@ -50,7 +132,7 @@
50132
</p>
51133
</div>
52134
<div class="col-2">
53-
<i class="bx bx-plus font-size-15 py-3 float-right"></i>
135+
<i class="fas fa-pencil-alt text-success mr-1 float-right"> Add</i>
54136
</div>
55137
</div>
56138
</button>
@@ -77,7 +159,7 @@
77159
</p>
78160
</div>
79161
<div class="col-2">
80-
<i class="bx bx-minus font-size-15 py-3 float-right"></i>
162+
<i class="fas fa-trash-alt text-danger mr-1 float-right">Remove</i>
81163
</div>
82164
</div>
83165
</button>
@@ -91,86 +173,7 @@
91173
</ng-template>
92174
</li>
93175

94-
<li [ngbNavItem]="2">
95-
<a ngbNavLink joyrideStep="manageReq" title="Checklists requirements" [stepContent]="manageReq">Requirements</a>
96-
<ng-template ngbNavContent>
97-
<div class="row mb-3 mt-4">
98-
<div class="col-lg-12">
99-
<div class="row mb-3">
100-
<div class="col-7">
101-
<p class="card-title">Manage Requirements</p>
102-
</div>
103-
<div class="col-5">
104-
<a type="button" routerLink="/checklists/add-requirement" class="btn btn-primary float-right mb-2">Add
105-
requirement</a>
106-
</div>
107-
</div>
108-
<div class="table-responsive">
109-
<table class="table table-centered table-nowrap table-hover">
110-
<thead class="thead-light">
111-
<tr>
112-
<th scope="col">
113-
<div class="text-center">Security controls / Security requirements</div>
114-
</th>
115-
<th scope="col">
116-
<div class="text-center">Action</div>
117-
</th>
118-
</tr>
119-
</thead>
120-
<tbody>
121-
<tr *ngFor="let item of checklistData.items">
122-
<td style="width: 60%">
123-
<div class="mt-2">
124-
<h6 class="text-dark">{{item.checklist_items_checklist_id}}
125-
{{item.checklist_items_content |slice:0:130}}...</h6>
126-
</div>
127-
</td>
128-
<td style="width: 40%">
129-
<ul class="list-inline mb-0 text-center">
130-
<li class="list-inline-item">
131-
<a type="button" [routerLink]="['/checklists/update-requirement', item.id]"
132-
class="btn btn-success btn-sm">Update</a>
133-
</li>
134-
<li class="list-inline-item">
135-
<button (click)="centerModal(controlDelete)" type="button"
136-
class="btn btn-danger btn-sm ml-2">Delete</button>
137-
</li>
138-
</ul>
139-
</td>
140-
141-
<!-- Deletion modal-->
142-
<ng-template #controlDelete let-modal>
143-
<div class="modal-header">
144-
<h5 class="modal-title mt-0">Delete Requirement</h5>
145-
<button type="button" class="close" aria-label="Close" (click)="modal.dismiss('Close click')">
146-
<span aria-hidden="true">&times;</span>
147-
</button>
148-
</div>
149-
<div class="modal-body">
150-
<form>
151-
<div class="form-group">
152-
<label for="delete">Type <b class="text-danger">DELETE</b> to delete the Requirement
153-
item</label>
154-
<input autocomplete="off" [(ngModel)]="delete" type="text" class="form-control" id="delete"
155-
name="delete" placeholder="Type DELETE" onfocus="this.placeholder = ''"
156-
onblur="this.placeholder = 'Type DELETE'">
157-
</div>
158-
<button (click)="deleteRequirement(item.id); modal.dismiss('Cross click')"
159-
class="btn btn-danger">Delete</button>
160-
</form>
161-
</div>
162-
</ng-template>
163-
<!-- END Project Delete Modal -->
164176

165-
</tr>
166-
</tbody>
167-
</table>
168-
</div>
169-
</div>
170-
<!-- end col-->
171-
</div>
172-
</ng-template>
173-
</li>
174177

175178
<li [ngbNavItem]="3">
176179
<a ngbNavLink joyrideStep="manageQuestions" title="Checklists questions" [stepContent]="manageQuestions">Questions</a>

‎Angular2/src/app/pages/checklists/update-requirement/update-requirement.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ <h4 class="mb-5">Update Checklist</h4>
9191
</div>
9292
</div>
9393

94-
<button [routerLink]="['/checklists/manage', checklistId]" class="btn btn-danger float-right ml-3"
94+
<button [routerLink]="['/checklists/manage/'+checklistId]" fragment="2" class="btn btn-danger float-right ml-3"
9595
type="button">Cancel</button>
9696
<button (click)="UpdateChecklistItem()" class="btn btn-success float-right"
9797
type="submit">Submit</button>

‎Angular2/src/app/pages/checklists/update-requirement/update-requirement.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export class UpdateRequirementComponent implements OnInit
128128

129129
this._checklistService
130130
.updateChecklistItem(this.validationform.value, this.id)
131-
.subscribe(() => this.router.navigate(['/checklists/manage', this.checklistId]));
131+
.subscribe(() => this.router.navigate(['/checklists/manage', this.checklistId], { fragment: '2' }));
132132
}
133133

134134
get form()

‎Angular2/src/app/pages/code-example/view/view.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ <h4 class="card-title text-primary">{{code.code_lang}} - {{code.title}}</h4>
7676
</div> -->
7777
<div class="row mt-4">
7878
<div class="col-sm-6">
79-
<a routerLink="/" class="btn text-muted d-none d-sm-inline-block btn-link">
80-
<i class="mdi mdi-arrow-left mr-1"></i> Learn More</a>
79+
<!--<a routerLink="/" class="btn text-muted d-none d-sm-inline-block btn-link">
80+
<i class="mdi mdi-arrow-left mr-1"></i> Learn More</a>-->
8181
</div> <!-- end col -->
8282
<div class="col-sm-6">
8383
<div *ngIf="loggedIn()" class="text-sm-right">

‎Angular2/src/app/pages/dashboard/home/home.component.html‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,19 @@ <h4 class="mb-0 font-size-18 head-four">Dashboard</h4>
3131
</div>
3232

3333
<div class="row justify-content-center">
34+
<div class="col-md-3 d-flex align-items-stretch">
35+
<div class="card mt-4 maintenance-box">
36+
<div class="card-body d-flex flex-column">
37+
<i class="bx bx-code-alt mb-4 h1 text-primary"></i>
38+
<h5 class="font-size-15 text-primary text-uppercase">Code examples</h5>
39+
<p class="mb-0">The code examples show how to approach some common functionalities and how to apply the secure coding principles!
40+
We have secure code examples in different languages.</p>
41+
<div class="mt-auto pt-3">
42+
<button type="button" routerLink="/code-example/view" class="btn btn-primary btn-sm">Learn More</button>
43+
</div>
44+
</div>
45+
</div>
46+
</div>
3447
<div class="col-md-3 d-flex align-items-stretch">
3548
<div class="card mt-4 maintenance-box">
3649
<div class="card-body d-flex flex-column">
@@ -57,26 +70,14 @@ <h5 class="font-size-15 text-primary text-uppercase">Knowledge Base</h5>
5770
</div>
5871
</div>
5972
</div>
60-
<div class="col-md-3 d-flex align-items-stretch">
61-
<div class="card mt-4 maintenance-box">
62-
<div class="card-body d-flex flex-column">
63-
<i class="bx bx-code-alt mb-4 h1 text-primary"></i>
64-
<h5 class="font-size-15 text-primary text-uppercase">Code examples</h5>
65-
<p class="mb-0">The code examples show how to approach some common functionalities and how to apply the secure coding principles!
66-
We have secure code examples in different languages.</p>
67-
<div class="mt-auto pt-3">
68-
<button type="button" routerLink="/code-example/view" class="btn btn-primary btn-sm">Learn More</button>
69-
</div>
70-
</div>
71-
</div>
72-
</div>
73+
7374
<div class="col-md-3 d-flex align-items-stretch">
7475
<div class="card mt-4 maintenance-box">
7576
<div class="card-body d-flex flex-column">
7677
<i class="bx bxs-flask mb-4 h1 text-primary"></i>
7778
<h5 class="font-size-15 text-primary text-uppercase">
7879
SKF Labs</h5>
79-
<p class="mb-0">We created in SKF Labs for Developers and security specialist to train their security testing skills.
80+
<p class="mb-0">We created SKF Labs for Developers and security specialist to train their security testing skills.
8081
Also provided are write-ups for the labs to teach the correct testing methodology.</p>
8182
<div class="mt-auto pt-3">
8283
<button type="button" routerLink="/labs/view" class="btn btn-primary btn-sm">Learn More</button>

‎Angular2/src/assets/scss/_variables-light.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $sidebar-menu-item-color: #545a6d;
1010
$sidebar-menu-sub-item-color: #545a6d;
1111
$sidebar-menu-item-icon-color: #7f8387;
1212
$sidebar-menu-item-hover-color: #383c40;
13-
$sidebar-menu-item-active-color: #556ee6;
13+
$sidebar-menu-item-active-color: #451cb7;
1414
$sidebar-width: 250px;
1515
$sidebar-collapsed-width: 70px;
1616
$sidebar-width-sm: 160px;
@@ -75,7 +75,7 @@ $chart-text-color: #343a40;
7575
// Buttons
7676
$btn-bg: #ae85d9;
7777
$btn-color: #fff;
78-
$btn-hover: #ae85d9;
78+
$btn-hover: #8263a3;
7979

8080

8181
// Variables

‎Angular2/src/assets/scss/app-dark.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,8 @@ aw-wizard {
5252

5353
.badge {
5454
color: #000000;
55+
}
56+
57+
.logo {
58+
color: #ffffff;
5559
}

0 commit comments

Comments
 (0)