Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
style: TT-582 improved the clocked in hour text and current time box
  • Loading branch information
codigodehoy committed Mar 17, 2022
commit a8e7e79ebff4323fe61f1f71806318da887136e7
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "time-tracker",
"version": "1.66.0",
"version": "1.69.1",
"scripts": {
"config": "ts-node ./scripts/setenv.ts",
"preinstall": "npx npm-force-resolutions",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
table.dataTable thead th {
position: relative;
}

table.dataTable thead th.sorting:after,
table.dataTable thead th.sorting_asc:after,
table.dataTable thead th.sorting_desc:after {
position: absolute;
top: 10px;
right: 3px;
display: block;
font-family: Arial, Helvetica, sans-serif;
color: #ff5e0a;
-webkit-text-stroke: 2px white;
}

table.dataTable thead .sorting_asc::after {
content: "▲";
}

table.dataTable thead .sorting_desc::after {
content: "▼";
}

table.dataTable thead .sorting_asc,
table.dataTable thead .sorting_desc {
background-image: none;
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ export class CustomerListComponent implements OnInit, OnDestroy, AfterViewInit {
@Output() changeValueShowCustomerForm = new EventEmitter<boolean>();
@Input()
customers: CustomerUI[] = [];
dtOptions: any = {};
dtOptions: any = {
columnDefs: [{orderable: false, targets: [2]}]
};
dtTrigger: Subject<any> = new Subject();
@ViewChild(DataTableDirective, { static: false })
dtElement: DataTableDirective;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,31 @@ $url-hover-color: darken($url-base-color, 20);
}
}

table.dataTable thead th {
position: relative;
}

table.dataTable thead th.sorting:after,
table.dataTable thead th.sorting_asc:after,
table.dataTable thead th.sorting_desc:after {
position: absolute;
top: 10px;
right: 3px;
display: block;
font-family: Arial, Helvetica, sans-serif;
color: #ff5e0a;
-webkit-text-stroke: 2px white;
}

table.dataTable thead .sorting_asc::after {
content: "▲";
}

table.dataTable thead .sorting_desc::after {
content: "▼";
}

table.dataTable thead .sorting_asc,
table.dataTable thead .sorting_desc {
background-image: none;
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
id="uri"
type="text"
placeholder="Enter Jira ticket URL"
class="form-control"
class="url-ticket-input form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,14 @@ input[type="date"]::-webkit-clear-button {
::ng-deep .cdk-overlay-container {
z-index: 1100 !important;
}

.url-ticket-input {
border: 1px solid #ced4da;
border-radius: 0.25rem;
}

::ng-deep .ngx-timepicker {
border: 1px solid #ced4da;
border-radius: 0.25rem;
padding: 2px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div class="row content-months">
<div class="spacing col-xl-1 col-lg-1 col-md-2 col-2" *ngFor="let month of months; let i = index">
<button class="btn btn-light btn-block"
[ngClass]="{'btn-primary': isSelectedMonth(i)}"
[ngClass]="{'btn-primary selected-month': isSelectedMonth(i)}"
(click)="selectMonth(i)"
[disabled]="monthEnable(i)">
<small>{{ month.slice(0, 3) }}</small>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
}
}

.selected-month {
color: white;
}

.align-item {
display: flex;
justify-content: center;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
placeholder="Enter Jira ticket URL"
id="uri"
formControlName="uri"
class="form-control"
class="url-ticket-input form-control"
/>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,14 @@
.hidden {
display: none;
}

.url-ticket-input {
border: 1px solid #ced4da;
border-radius: 0.25rem;
}

::ng-deep .ngx-timepicker {
border: 1px solid #ced4da;
border-radius: 0.25rem;
padding: 2px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
bottom: 9px;
}


.clock-out{
text-align: center;
}
Expand All @@ -26,4 +27,5 @@
-webkit-box-shadow: 0px 1px 5px 2px rgba(0,0,0,0.56);
-moz-box-shadow: 0px 1px 5px 2px rgba(0,0,0,0.56);
color: #fff;
}
}

28 changes: 28 additions & 0 deletions src/app/modules/time-entries/pages/time-entries.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
table.dataTable thead th {
position: relative;
}

table.dataTable thead th.sorting:after,
table.dataTable thead th.sorting_asc:after,
table.dataTable thead th.sorting_desc:after {
position: absolute;
top: 10px;
right: 3px;
display: block;
font-family: Arial, Helvetica, sans-serif;
color: #ff5e0a;
-webkit-text-stroke: 2px white;
}

table.dataTable thead .sorting_asc::after {
content: "▲";
}

table.dataTable thead .sorting_desc::after {
content: "▼";
}

table.dataTable thead .sorting_asc,
table.dataTable thead .sorting_desc {
background-image: none;
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { CalendarView } from 'angular-calendar';
export class TimeEntriesComponent implements OnInit, OnDestroy, AfterViewInit {
dtOptions: any = {
order: [[ 0, 'desc' ]],
columnDefs: [{orderable: false, targets: [6]}],
destroy: true,
};
dtTrigger: Subject<any> = new Subject();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
table.dataTable thead th {
position: relative;
}

table.dataTable thead th.sorting:after,
table.dataTable thead th.sorting_asc:after,
table.dataTable thead th.sorting_desc:after {
position: absolute;
top: 10px;
right: 3px;
display: block;
font-family: Arial, Helvetica, sans-serif;
color: #ff5e0a;
-webkit-text-stroke: 2px white;
}

table.dataTable thead .sorting_asc::after {
content: "▲";
}

table.dataTable thead .sorting_desc::after {
content: "▼";
}

table.dataTable thead .sorting_asc,
table.dataTable thead .sorting_desc {
background-image: none;
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
dtTrigger: Subject<any> = new Subject();
@ViewChild(DataTableDirective, { static: false })
dtElement: DataTableDirective;
dtOptions: any = {};
dtOptions: any = {
columnDefs: [{ orderable: false, targets: [2]}]
};
switchGroupsSubscription: Subscription;
isDevelopment = true;

Expand Down