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
added logo
  • Loading branch information
@daros10
daros10 committed Mar 21, 2020
commit 3511f86024e66cf6ec32fb7adf75e92d9a505142
2 changes: 1 addition & 1 deletion src/app/components/options-sidebar/getting-started/getting-started.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="text-center mt-5">

<p>getting-started works!</p>
<img src="/assets/img/ioet.png" class="rounded" width="35%" alt="Responsive image">

</div>
2 changes: 1 addition & 1 deletion src/app/components/options-sidebar/time-clock/time-clock.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="text-center mt-5">
<div class="text-center mt-5 mb-5">

<div *ngIf="showAlertEnterTecnology" class="alert alert-danger" role="alert">
Field technology is requiered. Enter this field for clock out.
Expand Down
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 @@ -4,7 +4,7 @@

<div class="col text-left">
<a class="navbar-brand" href="/">
<img src="assets/img/ioet.png" width="20" height="35" class="align-top" alt="">
<img src="assets/img/ioet.png" width="4%" class="align-top" alt="">
</a>
</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 @@ -11,7 +11,7 @@ body {
}

#sidebar-wrapper {
min-height: 100vh;
min-height: 91.8vh;
margin-left: -15rem;
-webkit-transition: margin .25s ease-out;
-moz-transition: margin .25s ease-out;
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/shared/sidebar/sidebar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="d-flex" id="wrapper">
<!-- Sidebar -->
<div class="bg-dark border-right rounded-right " id="sidebar-wrapper">
<div class="bg-dark rounded-bottom" id="sidebar-wrapper">
<div class="list-group options-sidebar-hover">
<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]="['/getting-started']" routerLinkActive="color-item-active" class="list-group-item list-group-item-action bg-dark text-white" style="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>
Expand Down