Skip to content

Commit f3b06e6

Browse files
Resolved the select dropdown issue, Separate scss variables and update information for the custom scrollbar npm package.
1 parent 68753b9 commit f3b06e6

12 files changed

+906
-14
lines changed

components/data-table/README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ See [the Releases section of our GitHub project](https://github.com/digicorp/pro
5353

5454
## License
5555

56-
Propeller v1.1.0 (http://propeller.in)
57-
© 2016-2017 [Digicorp Information Systems Pvt. Ltd.](https://www.digi-corp.com/)
56+
Code and documentation copyright 2016-2018 [Digicorp Information Systems Pvt. Ltd.](https://www.digi-corp.com/)
5857
Licensed under [MIT](https://github.com/digicorp/propeller/blob/master/LICENSE)
5958

6059

components/data-table/changelog.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#Change Log
2+
All notable changes to this project will be documented in this file.
3+
`Propeller` adheres to [Semantic Versioning](http://semver.org/).
4+
5+
---
6+
7+
## [1.2.0] (05/03/2018)
8+
Released on Thursday, March 05, 2018. All issues associated with this milestone can be found using this [filter](https://github.com/digicorp/propeller/issues).
9+
10+
#### Highlights
11+
* Added Sass variables and maps and functions to make customizing Data Table theming easier.
12+
* Fixed background color issue in custom-select class in Data Table.
13+
14+
#### Added
15+
###### SCSS
16+
* [#79](https://github.com/digicorp/propeller/commit/5fdf64671f28f8437795dccee95024af1896c9b4): Added Sass variables and maps and functions to make customizing Data Table theming easier.
17+
18+
#### Removed
19+
###### CSS
20+
* [#79](https://github.com/digicorp/propeller/commit/5fdf64671f28f8437795dccee95024af1896c9b4): Removed unnecessary images from the custom-select class in Data Table.

components/data-table/css/pmd-datatable.css

+11-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/data-table/css/pmd-datatable.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/data-table/css/pmd-datatable.scss

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Propeller v1.3.0 (http://propeller.in)
2+
* Propeller v1.2.0 (http://propeller.in)
33
* Copyright 2016-2018 Digicorp, Inc.
44
* Licensed under MIT (http://propeller.in/LICENSE)
55
*/
@@ -188,6 +188,7 @@ table.dataTable {
188188
padding: 0;
189189
border-radius: 0;
190190
height: 24px;
191+
line-height: 24px;
191192
}
192193
}
193194
// Propeller DataTable Pagination
@@ -390,18 +391,21 @@ div.dataTables_wrapper {
390391
}
391392
.pmd-card-inverse {
392393
.custom-select {
393-
background: #373a3c;
394+
background: transparent;
394395
&::after {
395-
color: #fff;
396+
color: $custom-select-inverse-color;
396397
}
397398
};
398399
div.dataTables_length {
399400
select {
400-
color: #fff;
401+
color: $custom-select-inverse-color;
402+
option {
403+
color: $custom-select-option-inverse-color;
404+
}
401405
}
402406
}
403407
.custom-select-info {
404-
background-color: #313131;
408+
background-color: $custom-select-inverse-bg;
405409
height: 64px;
406410
position: absolute;
407411
top: 0;
@@ -413,7 +417,10 @@ div.dataTables_wrapper {
413417
table.dataTable {
414418
> tbody > tr {
415419
&.child {
416-
background-color: #313131;
420+
background-color: $child-table-inverse-bg;
421+
&::hover{
422+
background-color: $child-table-inverse-bg;
423+
}
417424
}
418425
}
419426
}

components/data-table/package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "propellerkit-datatables",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"description": "Propeller’s data tables refers to a matrix of information, like an excel spreadsheet with columns, rows, and data. We have used Bootstrap Data table as base and customized it by applying material design principles to it.",
55
"homepage": "http://propeller.in/",
66
"author": "Digicorp, Inc",
@@ -15,7 +15,9 @@
1515
},
1616
"keywords": [
1717
"css",
18+
"scss",
1819
"js",
20+
"material design",
1921
"mobile-first",
2022
"responsive",
2123
"front-end",
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import "mixins/border-radius";
+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Fonts
2+
$font-family-sans-serif: Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
3+
$font-family-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
4+
$font-family-base: $font-family-sans-serif !default;
5+
$black: #000000 !default;
6+
$white: #ffffff !default;
7+
8+
// Checkbox
9+
$checkbox-border-width: 0.125rem !default;
10+
$checkbox-border-radius: 0.125rem !default;
11+
$checkbox-border-color: rgba($black,.54) !default;
12+
$checkbox-check-size: 0.125rem !default;
13+
$checkbox-check-color: #ffffff !default;
14+
$checkbox-checked-bg: #4285f4 !default;
15+
16+
// Datatable
17+
$datatable-control-bg: #ffffff !default;
18+
$datatable-control-color: #31b131 !default;
19+
20+
$datatable-checkbox-border-color: $checkbox-border-color !default;
21+
$datatable-checkbox-border-radius: $checkbox-border-radius !default;
22+
$datatable-checkbox-border-width: $checkbox-border-width !default;
23+
$datatable-checkbox-check-color: $checkbox-check-color !default;
24+
$datatable-checkbox-check-size: $checkbox-check-size !default;
25+
$datatable-checkbox-checked-bg: $checkbox-checked-bg !default;
26+
$datatable-checkbox-checked-border-color: $datatable-checkbox-checked-bg !default;
27+
28+
$datatable-active-bg: #edf4fd !default;
29+
$datatable-dark-active-bg: #313131 !default;
30+
$datatable-dark-checkbox-border-color: rgba($white,.54);
31+
32+
$custom-select-inverse-bg: rgba($black, .84) !default;
33+
$custom-select-inverse-color: $white !default;
34+
$child-table-inverse-bg: rgba($black, .84) !default;
35+
$custom-select-option-inverse-color:rgba($black, .84) !default;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Single side border-radius
2+
3+
@mixin border-radius($radius: $border-radius) {
4+
border-radius: $radius;
5+
}
6+
7+
@mixin border-top-radius($radius) {
8+
border-top-left-radius: $radius;
9+
border-top-right-radius: $radius;
10+
}
11+
12+
@mixin border-right-radius($radius) {
13+
border-top-right-radius: $radius;
14+
border-bottom-right-radius: $radius;
15+
}
16+
17+
@mixin border-bottom-radius($radius) {
18+
border-bottom-right-radius: $radius;
19+
border-bottom-left-radius: $radius;
20+
}
21+
22+
@mixin border-left-radius($radius) {
23+
border-top-left-radius: $radius;
24+
border-bottom-left-radius: $radius;
25+
}

0 commit comments

Comments
 (0)