-
-
Notifications
You must be signed in to change notification settings - Fork 120
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(styling): extra styling shouldn't override default bootstrap style (
#570) - also added a "lite" version since the material/salesforce theme now also include the without-bootstrap-styling and also flatpickr/multipleSelect stylings
- Loading branch information
1 parent
979a5d7
commit 5cdc4d9
Showing
13 changed files
with
1,082 additions
and
811 deletions.
There are no files selected for viewing
This file contains 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 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 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
1,432 changes: 717 additions & 715 deletions
1,432
src/app/modules/angular-slickgrid/styles/_variables.scss
Large diffs are not rendered by default.
Oops, something went wrong.
13 changes: 13 additions & 0 deletions
13
src/app/modules/angular-slickgrid/styles/flatpickr.min.scss
Large diffs are not rendered by default.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
191 changes: 191 additions & 0 deletions
191
src/app/modules/angular-slickgrid/styles/multiple-select.scss
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| /** | ||
| * @author zhixin wen <[email protected]> | ||
| */ | ||
|
|
||
| .ms-parent { | ||
| display: inline-block; | ||
| position: relative; | ||
| vertical-align: middle; | ||
| } | ||
|
|
||
| .ms-choice { | ||
| display: block; | ||
| width: 100%; | ||
| height: 26px; | ||
| padding: 0; | ||
| overflow: hidden; | ||
| cursor: pointer; | ||
| border: 1px solid #aaa; | ||
| text-align: left; | ||
| white-space: nowrap; | ||
| line-height: 26px; | ||
| color: #444; | ||
| text-decoration: none; | ||
| -webkit-border-radius: 4px; | ||
| -moz-border-radius: 4px; | ||
| border-radius: 4px; | ||
| background-color: #fff; | ||
| } | ||
|
|
||
| .ms-choice.disabled { | ||
| background-color: #f4f4f4; | ||
| background-image: none; | ||
| border: 1px solid #ddd; | ||
| cursor: default; | ||
| } | ||
|
|
||
| .ms-choice > span { | ||
| position: absolute; | ||
| top: 0; | ||
| left: 0; | ||
| right: 20px; | ||
| white-space: nowrap; | ||
| overflow: hidden; | ||
| text-overflow: ellipsis; | ||
| display: block; | ||
| padding-left: 8px; | ||
| } | ||
|
|
||
| .ms-choice > span.placeholder { | ||
| color: #999; | ||
| } | ||
|
|
||
| .ms-choice > div { | ||
| position: absolute; | ||
| top: 0; | ||
| right: 0; | ||
| width: 20px; | ||
| height: 25px; | ||
| background: url('~/multiple-select.png') left top no-repeat; | ||
| } | ||
|
|
||
| .ms-choice > div.open { | ||
| background: url('~/multiple-select.png') right top no-repeat; | ||
| } | ||
|
|
||
| .ms-drop { | ||
| width: 100%; | ||
| overflow: hidden; | ||
| display: none; | ||
| margin-top: -1px; | ||
| padding: 0; | ||
| position: absolute; | ||
| z-index: 1000; | ||
| background: #fff; | ||
| color: #000; | ||
| border: 1px solid #aaa; | ||
| -webkit-border-radius: 4px; | ||
| -moz-border-radius: 4px; | ||
| border-radius: 4px; | ||
| } | ||
|
|
||
| .ms-drop.bottom { | ||
| top: 100%; | ||
| -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15); | ||
| -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, .15); | ||
| box-shadow: 0 4px 5px rgba(0, 0, 0, .15); | ||
| } | ||
|
|
||
| .ms-drop.top { | ||
| bottom: 100%; | ||
| -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); | ||
| -moz-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); | ||
| box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); | ||
| } | ||
|
|
||
| .ms-search { | ||
| display: inline-block; | ||
| margin: 0; | ||
| min-height: 26px; | ||
| padding: 4px; | ||
| position: relative; | ||
| white-space: nowrap; | ||
| width: 100%; | ||
| z-index: 10000; | ||
| } | ||
|
|
||
| .ms-search input { | ||
| width: 100%; | ||
| height: auto !important; | ||
| min-height: 24px; | ||
| padding: 0 20px 0 5px; | ||
| margin: 0; | ||
| outline: 0; | ||
| font-family: sans-serif; | ||
| font-size: 1em; | ||
| border: 1px solid #aaa; | ||
| -webkit-border-radius: 0; | ||
| -moz-border-radius: 0; | ||
| border-radius: 0; | ||
| -webkit-box-shadow: none; | ||
| -moz-box-shadow: none; | ||
| box-shadow: none; | ||
| background: #fff url('~/multiple-select.png') no-repeat 100% -22px; | ||
| background: url('~/multiple-select.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee)); | ||
| background: url('~/multiple-select.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%); | ||
| background: url('~/multiple-select.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%); | ||
| background: url('~/multiple-select.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%); | ||
| background: url('~/multiple-select.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%); | ||
| background: url('~/multiple-select.png') no-repeat 100% -22px, linear-gradient(to top, #ffffff 85%, #eeeeee 99%); | ||
| } | ||
|
|
||
| .ms-search, .ms-search input { | ||
| -webkit-box-sizing: border-box; | ||
| -khtml-box-sizing: border-box; | ||
| -moz-box-sizing: border-box; | ||
| -ms-box-sizing: border-box; | ||
| box-sizing: border-box; | ||
| } | ||
|
|
||
| .ms-drop ul { | ||
| overflow: auto; | ||
| margin: 0; | ||
| padding: 5px 8px; | ||
| } | ||
|
|
||
| .ms-drop ul > li { | ||
| list-style: none; | ||
| display: list-item; | ||
| background-image: none; | ||
| position: static; | ||
| } | ||
|
|
||
| .ms-drop ul > li .disabled { | ||
| opacity: .35; | ||
| filter: Alpha(Opacity=35); | ||
| } | ||
|
|
||
| .ms-drop ul > li.multiple { | ||
| display: block; | ||
| float: left; | ||
| } | ||
|
|
||
| .ms-drop ul > li.group { | ||
| clear: both; | ||
| } | ||
|
|
||
| .ms-drop ul > li.multiple label { | ||
| width: 100%; | ||
| display: block; | ||
| white-space: nowrap; | ||
| overflow: hidden; | ||
| text-overflow: ellipsis; | ||
| } | ||
|
|
||
| .ms-drop ul > li label { | ||
| font-weight: normal; | ||
| display: block; | ||
| white-space: nowrap; | ||
| } | ||
|
|
||
| .ms-drop ul > li label.optgroup { | ||
| font-weight: bold; | ||
| } | ||
|
|
||
| .ms-drop input[type="checkbox"] { | ||
| vertical-align: middle; | ||
| } | ||
|
|
||
| .ms-drop .ms-no-results { | ||
| display: none; | ||
| } |
This file contains 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 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
25 changes: 25 additions & 0 deletions
25
src/app/modules/angular-slickgrid/styles/slickgrid-theme-material.lite.scss
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /*! | ||
| * SlickGrid custom styling for Material (https://github.com/ghiscoding/angular-slickgrid) | ||
| * Licensed under MIT (https://github.com/ghiscoding/angular-slickgrid/blob/master/LICENSE) | ||
| * @author: Ghislain B. (ghiscoding) | ||
| *//*! | ||
| /** SlickGrid Material Theme */ | ||
| @import './variables-theme-material'; | ||
| @import './roboto-font'; | ||
| @import './slick-default-theme'; | ||
| @import './slick-grid'; | ||
| @import './slick-controls'; | ||
| @import './slick-editors'; | ||
| @import './slick-plugins'; | ||
| @import './slick-pagination'; | ||
| @import './slick-footer'; | ||
| @import './slickgrid-examples'; | ||
| @import './slick-bootstrap'; | ||
| @import './ui-autocomplete'; | ||
| @import './material-svg-icons'; | ||
| @import './material-svg-utilities'; | ||
|
|
||
| $link-color: $primary-color !default; | ||
| @import './colors.scss'; | ||
| @import './extra-styling.scss'; |
Oops, something went wrong.