-
Notifications
You must be signed in to change notification settings - Fork 1
#19 change application colors #70
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.
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
Closed
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
e488233
#3 search active projects in view projects
daros10 6defa24
#3 search active projects in view timeClockIn
daros10 f4304fe
#3 added project service in list
daros10 24fffd6
#3 Added importation filter project
daros10 dea7d20
#50 added border error in inputs
daros10 741bfdd
#50 added validaition style in Activity page
daros10 b390e14
#19 added navbar and sidebar styles
daros10 3ec1568
#19 added styles in pages
daros10 541eeb8
#3 search active projects in view projects
daros10 bd595a9
#3 search active projects in view timeClockIn
daros10 1521710
#3 added project service in list
daros10 d85cf09
#3 Added importation filter project
daros10 78fa129
#50 added border error in inputs
daros10 dd7f132
#19 added styles in pages
daros10 750f375
#19 styles aplied based only in master branch
daros10 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
#3 search active projects in view timeClockIn
- Loading branch information
commit 6defa24d3375833f41c54dc049cb697372998310
There are no files selected for viewing
5 changes: 3 additions & 2 deletions
5
src/app/modules/project-management/components/project-list/project-list.component.spec.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/app/modules/shared/components/search-project/search-project.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
<div class="form-group"> | ||
<input (keyup)="changeFilterValue()" type="text" class="form-control" placeholder=" Search active projects..." name="filterProject" [(ngModel)]="filterProject" style="font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif, FontAwesome"> | ||
<input (keyup)="changeFilterValue()" type="text" class="form-control" placeholder=" Search projects..." name="filterProject" [(ngModel)]="filterProject" style="font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif, FontAwesome"> | ||
</div> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 4 additions & 14 deletions
18
src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,7 @@ | ||
<app-search-project (changeFilterProject)="filterProjects = $event"></app-search-project> | ||
<ul class="list-group content-projects"> | ||
<li | ||
class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" | ||
*ngFor="let item of projects; let i = index" | ||
(mouseenter)="showButton = i" | ||
(mouseleave)="showButton = -1" | ||
(click)="clockIn(item.id)" | ||
[ngClass]="{ active: selectedId === item.id }" | ||
> | ||
<li class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" *ngFor="let item of projects | filterProject:filterProjects; let i = index" (mouseenter)="showButton = i" (mouseleave)="showButton = -1" (click)="clockIn(item.id)" [ngClass]="{ active: selectedId === item.id }"> | ||
{{ item.name }} | ||
<span | ||
*ngIf="showButton === i && selectedId !== item.id" | ||
class="badge badge-light" | ||
>Clock In</span | ||
> | ||
<span *ngIf="showButton === i && selectedId !== item.id" class="badge badge-light">Clock In</span> | ||
</li> | ||
</ul> | ||
</ul> |
3 changes: 2 additions & 1 deletion
3
...app/modules/time-clock/components/project-list-hover/project-list-hover.component.spec.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR only needs to contain the required styles for the app. Please remove this pipe implementation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed.