Skip to content

Change application colors #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
daros10 wants to merge 12 commits into from
Closed

Change application colors #32

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ba7f7d5
timer working
daros10 Mar 19, 2020
f2dbf42
added time to entry and out
daros10 Mar 19, 2020
5a6e41e
added time to entry and out in projects
daros10 Mar 19, 2020
31bf129
clean field technology
daros10 Mar 19, 2020
c21fc61
added start time ih hover project
daros10 Mar 19, 2020
7803290
fixed test
daros10 Mar 19, 2020
8b5dce7
Merge branch 'master' of https://github.com/ioet/time-tracker-ui into…
daros10 Mar 19, 2020
ed7dcd2
remove hash routes
daros10 Mar 20, 2020
4886ac4
added some styles
daros10 Mar 21, 2020
bdf5bc6
content adjust in navbar
daros10 Mar 21, 2020
cb2beb3
addes more styles
daros10 Mar 21, 2020
3511f86
added logo
daros10 Mar 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
addes more styles
  • Loading branch information
@daros10
daros10 committed Mar 21, 2020
commit cb2beb39aa0be8a104d7a6492bb68df18ccd4f9f
2 changes: 1 addition & 1 deletion src/app/components/shared/navbar/navbar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<app-clock></app-clock>
</div>

<div class="col text-right" style="background-color: sienna;">
<div class="col">
<app-user></app-user>
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/app/components/shared/sidebar/sidebar.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ body {
color: #30BCED !important
}

.color-item-avtive {
.color-item-active {
color: #16BAC5 !important
}

Expand Down
12 changes: 6 additions & 6 deletions src/app/components/shared/sidebar/sidebar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<!-- Sidebar -->
<div class="bg-dark border-right rounded-right " id="sidebar-wrapper">
<div class="list-group options-sidebar-hover">
<a [routerLink]="['/getting-started']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white" style="border-top-color: #565264; border-color: #565264;"><i class="fas fa-flag"></i> Getting Started</a>
<a [routerLink]="['/time-clock']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-clock"></i> Time Clock</a>
<a [routerLink]="['/time-entries']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-list-alt"></i> Time Entries</a>
<a [routerLink]="['/time-off']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-paper-plane"></i> Time Off</a>
<a [routerLink]="['/reports']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="fas fa-chart-pie"></i> Reports</a>
<a [routerLink]="['/project-management']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-folder-open"></i> Projects</a>
<a [routerLink]="['/getting-started']" routerLinkActive="color-item-active" class="list-group-item list-group-item-action bg-dark text-white" style="border-top-color: #565264; border-color: #565264;"><i class="fas fa-flag"></i> Getting Started</a>
<a [routerLink]="['/time-clock']" routerLinkActive="color-item-active" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-clock"></i> Time Clock</a>
<a [routerLink]="['/time-entries']" routerLinkActive="color-item-active" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-list-alt"></i> Time Entries</a>
<a [routerLink]="['/time-off']" routerLinkActive="color-item-active" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-paper-plane"></i> Time Off</a>
<a [routerLink]="['/reports']" routerLinkActive="color-item-active" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="fas fa-chart-pie"></i> Reports</a>
<a [routerLink]="['/project-management']" routerLinkActive="color-item-active" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-folder-open"></i> Projects</a>
</div>
</div>
<!-- /#sidebar-wrapper -->
Expand Down
24 changes: 22 additions & 2 deletions src/app/components/shared/user/user.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
.help-color {
color: white;
.user-hover :hover {
cursor: pointer;
color: #16BAC5 !important
}

.notifications-hover :hover {
cursor: pointer;
color: #FF3948 !important
}

.help-hover :hover {
cursor: pointer;
color: #861388 !important
}

.text-items-black :hover {
cursor: pointer;
color: black !important;
}

.black-item {
color: black !important;
}
73 changes: 42 additions & 31 deletions src/app/components/shared/user/user.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,51 @@
<div class="row">
<div class="col-md-2">
<a class="nav-link dropdown-toggle help-color" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-question-circle"></i>
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item">Getting Started Guie</a>
<a class="dropdown-item">Product Help</a>
<a class="dropdown-item">Suggest Idea</a>
<a class="dropdown-item">What's New</a>
</div>
</div>
<div class="row justify-content-end">

<div class="col-form-label text-right help-hover">
<div class="dropdown show">
<a class="nav-link dropdown-toggle text-white" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-question-circle"></i>
</a>

<div class="col-md-2">
<a class="nav-link dropdown-toggle help-color" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="far fa-bell"></i>
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item">Notifications</a>
<div class="dropdown-divider"></div>
<p class="text-center"> Empty </p>
<div class="dropdown-menu text-items-black" aria-labelledby="dropdownMenuLink">
<a class="dropdown-item black-item">Getting Started Guie</a>
<a class="dropdown-item black-item">Product Help</a>
<a class="dropdown-item black-item">Suggest Idea</a>
<a class="dropdown-item black-item">What's New</a>
</div>
</div>


</div>
<div class="col-form-label text-right notifications-hover">
<div class="dropdown show">
<a class="nav-link dropdown-toggle text-white" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="far fa-bell"></i>
</a>

<div class="col-md-5">
<div class="dropdown-menu p-4 text-muted text-items-black">
<p class="black-item">
All clear. No notifications right now.
</p>
</div>
</div>

<a class="nav-link dropdown-toggle help-color" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="far fa-user-circle"></i> Dario Herrera
</a>

<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item">Profile user</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item">Time clock</a>
<a class="dropdown-item">Profile</a>
<a class="dropdown-item">Support tools</a>
<a class="dropdown-item">Sign Out</a>
</div>
<div class="col-form-label border rounded text-right " style="border-color: #30BCED !important;">

<div class="dropdown show mt-2 text-white user-hover">
<a class="dropdown-toggle p-2 " role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="far fa-user-circle"></i> Dario Herrera
</a>
<div class=" dropdown-menu text-items-black" aria-labelledby="dropdownMenuLink">
<a class="dropdown-item black-item">Profile user</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item black-item">Profile</a>
<a class="dropdown-item black-item">Time clock</a>
<a class="dropdown-item black-item">Support tools</a>
<a class="dropdown-item black-item">Sign Out</a>
</div>
</div>


</div>