Skip to content
This repository has been archived by the owner on Feb 4, 2021. It is now read-only.

Make chosen look like Bootstrap input #311

Merged
merged 2 commits into from
Mar 10, 2016
Merged

Make chosen look like Bootstrap input #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fc99cc
#286 - adding bootstrap chosen styling
Mar 9, 2016
db62048
Merge branch 'develop' into feature/286-chosen
johanjanssens Mar 9, 2016
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
1 change: 1 addition & 0 deletions web/administrator/templates/elysio/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"jqtree": "https://github.com/mbraak/jqTree.git#1.2.1",
"select2": "https://github.com/select2/select2.git#4.0.0",
"select2-bootstrap": "https://github.com/select2/select2-bootstrap-theme.git#0.1.0-beta.4",
"bootstrap-chosen": "https://github.com/alxlit/bootstrap-chosen.git#1.0.1",
"bootstrap-sass": "3.3.4",
"neat": "1.7.2",
"footable": "2.0.3",
Expand Down
140 changes: 139 additions & 1 deletion web/administrator/templates/elysio/css/admin.css
View file
Open in desktop

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

Binary file added web/administrator/templates/elysio/images/chosen-sprite.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/administrator/templates/elysio/images/chosen-sprite@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions web/administrator/templates/elysio/scss/nooku/core/_core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@import "../../../bower_components/magnific-popup/src/css/main";
@import "../molecules/modal";
@import "../molecules/select2";
@import "../../vendor/bootstrap-chosen-custom";
/* We need the dropdowns for the datepicker */
@import "../../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/dropdowns";
@import "../molecules/datepicker";
Expand Down
2 changes: 1 addition & 1 deletion web/administrator/templates/elysio/scss/nooku/molecules/_grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

@include flexbox {
.k-container {
flex: 0 0 auto;
flex: 1 0 auto;
}
}

Expand Down
Loading