Skip to content
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

Jump to bottom

fix(styling): extra styling shouldn't override default bootstrap style #415

Merged
merged 1 commit into from
Sep 8, 2020
Merged

fix(styling): extra styling shouldn't override default bootstrap style #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,18 @@
"postsass-build-task:scss-compile:material": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-material.css dist/styles/css/slickgrid-theme-material.css --output-style compressed",
"sass-build-task:scss-compile:material-bare": "node-sass src/aurelia-slickgrid/styles/slickgrid-theme-material.bare.scss -o dist/styles/css --output-style compressed",
"postsass-build-task:scss-compile:material-bare": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-material.bare.css dist/styles/css/slickgrid-theme-material.bare.css --output-style compressed",
"sass-build-task:scss-compile:material-lite": "node-sass src/aurelia-slickgrid/styles/slickgrid-theme-material.lite.scss -o dist/styles/css --output-style compressed",
"postsass-build-task:scss-compile:material-lite": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-material.lite.css dist/styles/css/slickgrid-theme-material.lite.css --output-style compressed",
"sass-build-task:scss-compile:salesforce": "node-sass src/aurelia-slickgrid/styles/slickgrid-theme-salesforce.scss -o dist/styles/css --output-style compressed",
"postsass-build-task:scss-compile:salesforce": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-salesforce.css dist/styles/css/slickgrid-theme-salesforce.css --output-style compressed",
"sass-build-task:scss-compile:salesforce-bare": "node-sass src/aurelia-slickgrid/styles/slickgrid-theme-salesforce.bare.scss -o dist/styles/css --output-style compressed",
"postsass-build-task:scss-compile:salesforce-bare": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-salesforce.bare.css dist/styles/css/slickgrid-theme-salesforce.bare.css --output-style compressed",
"sass-build-task:scss-compile:salesforce-lite": "node-sass src/aurelia-slickgrid/styles/slickgrid-theme-salesforce.lite.scss -o dist/styles/css --output-style compressed",
"postsass-build-task:scss-compile:salesforce-lite": "postcss --no-map --use autoprefixer --output dist/styles/css/slickgrid-theme-salesforce.lite.css dist/styles/css/slickgrid-theme-salesforce.lite.css --output-style compressed",
"sass:build": "run-p sass-build-task:scss-compile:*",
"presass:copy": "cross-env copyfiles -f src/aurelia-slickgrid/styles/*.png dist/styles/css",
"sass:copy": "cross-env copyfiles -f src/aurelia-slickgrid/styles/*.scss dist/styles/sass",
"postsass:copy": "cross-env copyfiles -f src/aurelia-slickgrid/styles/*.png dist/styles/sass",
"presass:watch:bootstrap": "cross-env npm run sass-build-task:scss-compile:bootstrap",
"sass:watch:bootstrap": "cross-env npm run sass-build-task:scss-compile:bootstrap -- -watch",
"presass:watch:material": "cross-env npm run sass-build-task:scss-compile:material",
Expand Down
2 changes: 1 addition & 1 deletion src/aurelia-slickgrid/editors/dualInputEditor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export class DualInputEditor implements Editor {
const idPropName = this.gridOptions.datasetIdPropertyName || 'id';
const itemId = this.args && this.args.item && this.args.item[idPropName] || 0;

let fieldType = editorSideParams.type || 'text';
let fieldType: string = editorSideParams.type || 'text';
if (fieldType === 'float' || fieldType === 'integer') {
fieldType = 'number';
}
Expand Down
45 changes: 24 additions & 21 deletions src/aurelia-slickgrid/styles/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
* Lib Website (https://github.com/ghiscoding/aurelia-slickgrid)
* Licensed under MIT (https://github.com/ghiscoding/aurelia-slickgrid/blob/master/LICENSE)
*/

$border-color: #dddddd !default;
$font-size-base-value: 14 !default;
$font-size-base: $font-size-base-value + 0px !default;
$font-size-base: $font-size-base-value + 0px !default;
$font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default;
$primary-color: #31708F !default;
$button-primary-bg-color: $primary-color !default;
$button-primary-color: inherit !default;
$flatpickr-bgcolor: #ffffff !default;
$filter-placeholder-font-family: 'Segoe UI Symbol' !default;
$focus-color: rgb(115, 179, 229) !default;
Expand Down Expand Up @@ -36,7 +39,7 @@
$cell-border-right: 1px transparent !default;
$cell-border-bottom: 1px transparent !default;
$cell-border-left: 1px transparent !default;
$cell-even-background-color: #ffffff !default;
$cell-even-background-color: #ffffff !default;
$cell-odd-background-color: darken($grid-cell-color, 3%) !default; // for striping every second row
$cell-odd-active-background-color: darken($grid-cell-color, 5%) !default;
$cell-padding-top-bottom: 5px !default;
Expand Down Expand Up @@ -129,34 +132,34 @@
$icon-group-height: 20px !default;
$icon-group-width: 14px !default;
$table-background: transparent !default;
$link-color: #08c !default;
$link-color: #08c !default;
$link-color-hover: darker($link-color, 15%) !default;
$gray-dark: #333 !default;
$text-color: $gray-dark !default;
$navbar-default-link-hover-color: $gray-dark !default;
$gray-dark: #333 !default;
$text-color: $gray-dark !default;
$navbar-default-link-hover-color: $gray-dark !default;

/* AutoComplete */
$autocomplete-bg-color: #ffffff !default;
$autocomplete-border: 1px solid rgba(0, 0, 0, 0.15) !default;
$autocomplete-border-radius: 4px !default;
$autocomplete-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175) !default;
$autocomplete-hover-color: #262626 !default;
$autocomplete-hover-bg-color: darken($row-mouse-hover-color, 3%) !default;
$autocomplete-bg-color: #ffffff !default;
$autocomplete-border: 1px solid rgba(0, 0, 0, 0.15) !default;
$autocomplete-border-radius: 4px !default;
$autocomplete-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175) !default;
$autocomplete-hover-color: #262626 !default;
$autocomplete-hover-bg-color: darken($row-mouse-hover-color, 3%) !default;
$autocomplete-loading-icon: "\f021" !default;
$autocomplete-loading-icon-color: $icon-color !default;
$autocomplete-loading-icon-width: inherit !default;
$autocomplete-loading-icon-margin-left: -16px !default;
$autocomplete-loading-icon-line-height: 0px !default;
$autocomplete-loading-icon-vertical-align: inherit !default;
$autocomplete-max-height: 25vh !default;
$autocomplete-min-height: 75px !default;
$autocomplete-min-width: 50px !default;
$autocomplete-overflow-x: hidden !default;
$autocomplete-overflow-y: auto !default;
$autocomplete-text-color: #333333 !default;
$autocomplete-text-overflow: ellipsis !default;
$autocomplete-text-padding: 3px 15px !default;
$autocomplete-z-index: 9999 !default;
$autocomplete-max-height: 25vh !default;
$autocomplete-min-height: 75px !default;
$autocomplete-min-width: 50px !default;
$autocomplete-overflow-x: hidden !default;
$autocomplete-overflow-y: auto !default;
$autocomplete-text-color: #333333 !default;
$autocomplete-text-overflow: ellipsis !default;
$autocomplete-text-padding: 3px 15px !default;
$autocomplete-z-index: 9999 !default;

/** AutoComplte with Custom Styling (2 rows) */
$autocomplete-tpl2-font-size: 12px !default;
Expand Down