Skip to content

Commit 8f76348

Browse files
authored
Merge branch 'master' into TT-582-improve-the-summary-section-of-the-time-clock-page-QA
2 parents f9ba78f + ac17c44 commit 8f76348

File tree

3 files changed

+49
-4
lines changed

3 files changed

+49
-4
lines changed

src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
2424
lengthMenu: [this.selectOptionValues, this.selectOptionNames],
2525
buttons: [
2626
{
27+
text: "Column Visibility" + " ▼",
2728
extend: 'colvis',
2829
columns: ':not(.hidden-col)'
2930
},

src/app/modules/time-clock/components/time-entries-summary/time-entries-summary.component.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@
2727
-webkit-box-shadow: 0px 1px 5px 2px rgba(0,0,0,0.56);
2828
-moz-box-shadow: 0px 1px 5px 2px rgba(0,0,0,0.56);
2929
color: #fff;
30-
}
30+
}

src/styles/colors.scss

Lines changed: 47 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,59 @@ General Datatable adjustment styles
7878

7979
.dt-buttons {
8080
.dt-button {
81-
background-image: linear-gradient($info);
81+
color: #ffffff;
82+
font-family: roboto, arial, sans-serif;
83+
background: $primary;
84+
border: 1px solid transparent;
85+
border-radius: 5px;
8286
}
8387
.dt-button:hover:not(.disabled) {
84-
background-image: linear-gradient($info);
85-
opacity: 0.5;
88+
background: $primary;
89+
border: 1px solid transparent;
8690
}
8791

8892
.dt-button.disabled {
8993
background-image: linear-gradient($info);
9094
opacity: 0.5;
9195
}
9296
}
97+
98+
.dataTables_paginate {
99+
.paginate_button {
100+
&:hover {
101+
color: #ffffff;
102+
background: $primary;
103+
border: 1px solid transparent;
104+
}
105+
}
106+
}
107+
108+
.dataTables_wrapper {
109+
padding-top: 10px;
110+
padding-right: 10px;
111+
}
112+
113+
.dataTables_wrapper input {
114+
border: 1px solid #ced4da;
115+
border-radius: 5px;
116+
outline: none;
117+
}
118+
119+
.dataTables_wrapper input:focus {
120+
border: 1px solid #80bdff;
121+
box-shadow: 0px 0px 2px 3px #bfdeff;
122+
-webkit-box-shadow: 0px 0px 2px 3px #bfdeff;
123+
-moz-box-shadow: 0px 0px 2px 3px #bfdeff;
124+
}
125+
126+
.dataTables_wrapper select {
127+
border: 1px solid #ced4da;
128+
outline: none;
129+
}
130+
131+
.dataTables_wrapper select:focus {
132+
border: 1px solid #80bdff;
133+
box-shadow: 0px 0px 2px 3px #bfdeff;
134+
-webkit-box-shadow: 0px 0px 2px 3px #bfdeff;
135+
-moz-box-shadow: 0px 0px 2px 3px #bfdeff;
136+
}

0 commit comments

Comments
 (0)