Przeglądaj źródła

finsihed homepage

Elliott Stansbury 5 lat temu
rodzic
commit
0769387e37

+ 7
- 7
src/main/webapp/app/home/home.component.html Wyświetl plik

1
 <div class="row">
1
 <div class="row">
2
     <div class="col-md-3">
2
     <div class="col-md-3">
3
-        <span class="hipster img-fluid rounded"></span>
3
+        <span class="hipster img-fluid rounded" ></span>
4
     </div>
4
     </div>
5
     <div class="col-md-9">
5
     <div class="col-md-9">
6
 
6
 
7
-        <h1 class="display-1" jhiTranslate="home.title">Welcome to Faeboo!</h1>
8
-        <h2 class="lead" jhiTranslate="home.subtitle">This is your homepage</h2>
7
+        <h1 class="display-1" style="color:#F6AE2D" jhiTranslate="home.title">Welcome to Faeboo!</h1>
8
+        <h2 class="lead" style="color:#2F4858" jhiTranslate="home.subtitle">This is your homepage</h2>
9
 
9
 
10
         <div [ngSwitch]="isAuthenticated()">
10
         <div [ngSwitch]="isAuthenticated()">
11
             <div class="alert alert-success" *ngSwitchCase="true">
11
             <div class="alert alert-success" *ngSwitchCase="true">
16
             <br>
16
             <br>
17
             <div class="alert alert-warning" *ngSwitchCase="false">
17
             <div class="alert alert-warning" *ngSwitchCase="false">
18
 
18
 
19
-                <span>You can sign in by clicking</span>
20
-                <a class="alert-link" (click)="login()" >sign in</a>
19
+                <span style="color: #3e8acc">You can sign in by clicking</span>
20
+                <a class="alert-link" style="color: #3e8acc"(click)="login()" >sign in</a>
21
             </div>
21
             </div>
22
             <div class="alert alert-warning" *ngSwitchCase="false">
22
             <div class="alert alert-warning" *ngSwitchCase="false">
23
-                <span jhiTranslate="global.messages.info.register.noaccount">You don't have an account yet?</span>&nbsp;
24
-                <a class="alert-link" routerLink="register" jhiTranslate="global.messages.info.register.link">Register a new account</a>
23
+                <span style="color: #3e8acc" jhiTranslate="global.messages.info.register.noaccount">You don't have an account yet?</span>&nbsp;
24
+                <a class="alert-link" style="color: #3e8acc" routerLink="register" jhiTranslate="global.messages.info.register.link">Register a new account</a>
25
             </div>
25
             </div>
26
 
26
 
27
             <iframe src="https://giphy.com/embed/NQZhGb4uBcVa0" width="900" height="270" frameBorder="0" class="giphy-embed" allowFullScreen></iframe>
27
             <iframe src="https://giphy.com/embed/NQZhGb4uBcVa0" width="900" height="270" frameBorder="0" class="giphy-embed" allowFullScreen></iframe>

+ 12
- 12
src/main/webapp/app/layouts/navbar/navbar.component.html Wyświetl plik

5
         </a>
5
         </a>
6
         <a class="navbar-brand logo float-left" routerLink="/" (click)="collapseNavbar()">
6
         <a class="navbar-brand logo float-left" routerLink="/" (click)="collapseNavbar()">
7
             <span class="logo-img"></span>
7
             <span class="logo-img"></span>
8
-            <span jhiTranslate="global.title" class="navbar-title">FaeBoo</span>
8
+            <span jhiTranslate="global.title" class="navbar-title"style="color: #F6AE2D">FaeBoo</span>
9
     </div>
9
     </div>
10
     <div class="navbar-collapse collapse" id="navbarResponsive" [ngbCollapse]="isNavbarCollapsed" [ngSwitch]="isAuthenticated()">
10
     <div class="navbar-collapse collapse" id="navbarResponsive" [ngbCollapse]="isNavbarCollapsed" [ngSwitch]="isAuthenticated()">
11
         <ul class="navbar-nav ml-auto">
11
         <ul class="navbar-nav ml-auto">
12
             <li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
12
             <li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
13
                 <a class="nav-link" routerLink="/" (click)="collapseNavbar();trace();">
13
                 <a class="nav-link" routerLink="/" (click)="collapseNavbar();trace();">
14
                     <span>
14
                     <span>
15
-                        <fa-icon icon="home"></fa-icon>
16
-                        <span jhiTranslate="global.menu.home">Home</span>
15
+                        <fa-icon style="color: #F6AE2D" icon="home"></fa-icon>
16
+                        <span style="color: #F6AE2D"jhiTranslate="global.menu.home">Home</span>
17
                     </span>
17
                     </span>
18
                 </a>
18
                 </a>
19
             </li>
19
             </li>
21
             <li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
21
             <li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
22
                 <a class="nav-link" routerLink="/profile-head" (click)="collapseNavbar();">
22
                 <a class="nav-link" routerLink="/profile-head" (click)="collapseNavbar();">
23
                     <span>
23
                     <span>
24
-                        <fa-icon icon="home"></fa-icon>
25
-                        <span>Profile</span>
24
+                        <fa-icon style="color: #F6AE2D"icon="home"></fa-icon>
25
+                        <span style="color: #F6AE2D">Profile</span>
26
                     </span>
26
                     </span>
27
                 </a>
27
                 </a>
28
             </li>
28
             </li>
31
             <li *ngSwitchCase="true" ngbDropdown class="nav-item dropdown pointer" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
31
             <li *ngSwitchCase="true" ngbDropdown class="nav-item dropdown pointer" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
32
                 <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="entity-menu">
32
                 <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="entity-menu">
33
                     <span>
33
                     <span>
34
-                        <fa-icon icon="th-list"></fa-icon>
35
-                        <span jhiTranslate="global.menu.entities.main">
34
+                        <fa-icon icon="th-list" style="color: #F6AE2D"></fa-icon>
35
+                        <span jhiTranslate="global.menu.entities.main" style="color: #F6AE2D">
36
                             Entities
36
                             Entities
37
                         </span>
37
                         </span>
38
                     </span>
38
                     </span>
92
             <li *jhiHasAnyAuthority="'ROLE_ADMIN'" ngbDropdown class="nav-item dropdown pointer" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
92
             <li *jhiHasAnyAuthority="'ROLE_ADMIN'" ngbDropdown class="nav-item dropdown pointer" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
93
                 <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="admin-menu">
93
                 <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="admin-menu">
94
                     <span>
94
                     <span>
95
-                        <fa-icon icon="user-plus"></fa-icon>
96
-                        <span jhiTranslate="global.menu.admin.main">Administration</span>
95
+                        <fa-icon style="color: #F6AE2D" icon="user-plus"></fa-icon>
96
+                        <span jhiTranslate="global.menu.admin.main" style="color: #F6AE2D">Administration</span>
97
                     </span>
97
                     </span>
98
                 </a>
98
                 </a>
99
-                <ul class="dropdown-menu" ngbDropdownMenu>
99
+                <ul class="dropdown-menu"  ngbDropdownMenu>
100
                     <li>
100
                     <li>
101
                         <a class="dropdown-item" routerLink="admin/user-management" routerLinkActive="active" (click)="collapseNavbar()">
101
                         <a class="dropdown-item" routerLink="admin/user-management" routerLinkActive="active" (click)="collapseNavbar()">
102
                             <fa-icon icon="user" fixedWidth="true"></fa-icon>
102
                             <fa-icon icon="user" fixedWidth="true"></fa-icon>
164
             <li ngbDropdown class="nav-item dropdown pointer" placement="bottom-right" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
164
             <li ngbDropdown class="nav-item dropdown pointer" placement="bottom-right" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
165
                 <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="account-menu">
165
                 <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="account-menu">
166
                   <span *ngIf="!getImageUrl()">
166
                   <span *ngIf="!getImageUrl()">
167
-                    <fa-icon icon="user"></fa-icon>
168
-                    <span jhiTranslate="global.menu.account.main">
167
+                    <fa-icon style="color: #F6AE2D" icon="user"></fa-icon>
168
+                    <span style="color: #F6AE2D" jhiTranslate="global.menu.account.main">
169
                       Account
169
                       Account
170
                     </span>
170
                     </span>
171
                   </span>
171
                   </span>

+ 4
- 0
src/main/webapp/app/layouts/navbar/navbar.scss Wyświetl plik

7
     color: #ccc;
7
     color: #ccc;
8
 }
8
 }
9
 
9
 
10
+.dropdown-item {
11
+    color: #f6ae2d;
12
+}
13
+
10
 .jh-navbar {
14
 .jh-navbar {
11
     background-color: #353d47;
15
     background-color: #353d47;
12
     padding: 0.2em 1em;
16
     padding: 0.2em 1em;

BIN
src/main/webapp/favicon.ico Wyświetl plik


BIN
src/main/webapp/favicon1.ico Wyświetl plik