From dafaa0271810c5204ac507b2e76fb7479a310fdc Mon Sep 17 00:00:00 2001 From: mespeche Date: Wed, 4 Sep 2013 11:35:22 +0200 Subject: [PATCH 1/3] Working : Major class changes migration from bootstrap 2.x to 3.0 --- templates/admin/default/admin-layout.tpl | 22 +- .../glyphicons-halflings-regular.eot | Bin 0 -> 14079 bytes .../glyphicons-halflings-regular.svg | 228 ++++++ .../glyphicons-halflings-regular.ttf | Bin 0 -> 29512 bytes .../glyphicons-halflings-regular.woff | Bin 0 -> 16448 bytes .../default/assets/js/bootstrap/affix.js | 126 +++ .../default/assets/js/bootstrap/alert.js | 98 +++ .../default/assets/js/bootstrap/button.js | 109 +++ .../default/assets/js/bootstrap/carousel.js | 217 ++++++ .../default/assets/js/bootstrap/collapse.js | 179 +++++ .../default/assets/js/bootstrap/dropdown.js | 154 ++++ .../default/assets/js/bootstrap/modal.js | 246 ++++++ .../default/assets/js/bootstrap/popover.js | 117 +++ .../default/assets/js/bootstrap/scrollspy.js | 158 ++++ .../admin/default/assets/js/bootstrap/tab.js | 135 ++++ .../default/assets/js/bootstrap/tooltip.js | 386 ++++++++++ .../default/assets/js/bootstrap/transition.js | 56 ++ .../default/assets/less/bootstrap/alerts.less | 67 ++ .../default/assets/less/bootstrap/badges.less | 51 ++ .../assets/less/bootstrap/bootstrap.less | 59 ++ .../assets/less/bootstrap/breadcrumbs.less | 23 + .../assets/less/bootstrap/button-groups.less | 248 ++++++ .../assets/less/bootstrap/buttons.less | 160 ++++ .../assets/less/bootstrap/carousel.less | 209 +++++ .../default/assets/less/bootstrap/close.less | 33 + .../default/assets/less/bootstrap/code.less | 56 ++ .../less/bootstrap/component-animations.less | 29 + .../assets/less/bootstrap/dropdowns.less | 193 +++++ .../default/assets/less/bootstrap/forms.less | 353 +++++++++ .../assets/less/bootstrap/glyphicons.less | 232 ++++++ .../default/assets/less/bootstrap/grid.less | 346 +++++++++ .../assets/less/bootstrap/input-groups.less | 127 +++ .../assets/less/bootstrap/jumbotron.less | 40 + .../default/assets/less/bootstrap/labels.less | 58 ++ .../assets/less/bootstrap/list-group.less | 88 +++ .../default/assets/less/bootstrap/media.less | 56 ++ .../default/assets/less/bootstrap/mixins.less | 723 ++++++++++++++++++ .../default/assets/less/bootstrap/modals.less | 141 ++++ .../default/assets/less/bootstrap/navbar.less | 621 +++++++++++++++ .../default/assets/less/bootstrap/navs.less | 229 ++++++ .../assets/less/bootstrap/normalize.less | 396 ++++++++++ .../default/assets/less/bootstrap/pager.less | 55 ++ .../assets/less/bootstrap/pagination.less | 83 ++ .../default/assets/less/bootstrap/panels.less | 148 ++++ .../assets/less/bootstrap/popovers.less | 133 ++++ .../default/assets/less/bootstrap/print.less | 100 +++ .../assets/less/bootstrap/progress-bars.less | 95 +++ .../less/bootstrap/responsive-utilities.less | 220 ++++++ .../assets/less/bootstrap/scaffolding.less | 130 ++++ .../default/assets/less/bootstrap/tables.less | 236 ++++++ .../default/assets/less/bootstrap/theme.less | 232 ++++++ .../assets/less/bootstrap/thumbnails.less | 31 + .../assets/less/bootstrap/tooltip.less | 95 +++ .../default/assets/less/bootstrap/type.less | 238 ++++++ .../assets/less/bootstrap/utilities.less | 42 + .../assets/less/bootstrap/variables.less | 620 +++++++++++++++ .../default/assets/less/bootstrap/wells.less | 29 + templates/admin/default/assets/less/main.less | 6 + .../assets/less/thelia/breadcrumbs.less | 20 + .../assets/less/thelia/datepicker.less | 109 +++ .../default/assets/less/thelia/forms.less | 168 ++++ .../default/assets/less/thelia/modals.less | 15 + .../default/assets/less/thelia/navbar.less | 29 + .../assets/less/thelia/responsive.less | 24 + .../assets/less/thelia/scaffolding.less | 19 + .../default/assets/less/thelia/tables.less | 63 ++ .../assets/less/thelia/tablesorter.less | 58 ++ .../default/assets/less/thelia/thelia.less | 248 ++++++ .../default/assets/less/thelia/type.less | 41 + .../default/assets/less/thelia/variables.less | 31 + templates/admin/default/categories.html | 26 +- templates/admin/default/configuration.html | 40 +- templates/admin/default/currencies.html | 28 +- templates/admin/default/currency-edit.html | 20 +- templates/admin/default/edit_category.html | 42 +- templates/admin/default/general_error.html | 4 +- templates/admin/default/home.html | 2 +- templates/admin/default/login.html | 8 +- templates/admin/default/message-edit.html | 14 +- templates/admin/default/messages.html | 26 +- templates/admin/default/variable-edit.html | 14 +- templates/admin/default/variables.html | 30 +- 82 files changed, 10205 insertions(+), 136 deletions(-) create mode 100755 templates/admin/default/assets/fonts/bootstrap/glyphicons-halflings-regular.eot create mode 100755 templates/admin/default/assets/fonts/bootstrap/glyphicons-halflings-regular.svg create mode 100755 templates/admin/default/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf create mode 100755 templates/admin/default/assets/fonts/bootstrap/glyphicons-halflings-regular.woff create mode 100755 templates/admin/default/assets/js/bootstrap/affix.js create mode 100755 templates/admin/default/assets/js/bootstrap/alert.js create mode 100755 templates/admin/default/assets/js/bootstrap/button.js create mode 100755 templates/admin/default/assets/js/bootstrap/carousel.js create mode 100755 templates/admin/default/assets/js/bootstrap/collapse.js create mode 100755 templates/admin/default/assets/js/bootstrap/dropdown.js create mode 100755 templates/admin/default/assets/js/bootstrap/modal.js create mode 100755 templates/admin/default/assets/js/bootstrap/popover.js create mode 100755 templates/admin/default/assets/js/bootstrap/scrollspy.js create mode 100755 templates/admin/default/assets/js/bootstrap/tab.js create mode 100755 templates/admin/default/assets/js/bootstrap/tooltip.js create mode 100755 templates/admin/default/assets/js/bootstrap/transition.js create mode 100755 templates/admin/default/assets/less/bootstrap/alerts.less create mode 100755 templates/admin/default/assets/less/bootstrap/badges.less create mode 100755 templates/admin/default/assets/less/bootstrap/bootstrap.less create mode 100755 templates/admin/default/assets/less/bootstrap/breadcrumbs.less create mode 100755 templates/admin/default/assets/less/bootstrap/button-groups.less create mode 100755 templates/admin/default/assets/less/bootstrap/buttons.less create mode 100755 templates/admin/default/assets/less/bootstrap/carousel.less create mode 100755 templates/admin/default/assets/less/bootstrap/close.less create mode 100755 templates/admin/default/assets/less/bootstrap/code.less create mode 100755 templates/admin/default/assets/less/bootstrap/component-animations.less create mode 100755 templates/admin/default/assets/less/bootstrap/dropdowns.less create mode 100755 templates/admin/default/assets/less/bootstrap/forms.less create mode 100755 templates/admin/default/assets/less/bootstrap/glyphicons.less create mode 100755 templates/admin/default/assets/less/bootstrap/grid.less create mode 100755 templates/admin/default/assets/less/bootstrap/input-groups.less create mode 100755 templates/admin/default/assets/less/bootstrap/jumbotron.less create mode 100755 templates/admin/default/assets/less/bootstrap/labels.less create mode 100755 templates/admin/default/assets/less/bootstrap/list-group.less create mode 100755 templates/admin/default/assets/less/bootstrap/media.less create mode 100755 templates/admin/default/assets/less/bootstrap/mixins.less create mode 100755 templates/admin/default/assets/less/bootstrap/modals.less create mode 100755 templates/admin/default/assets/less/bootstrap/navbar.less create mode 100755 templates/admin/default/assets/less/bootstrap/navs.less create mode 100755 templates/admin/default/assets/less/bootstrap/normalize.less create mode 100755 templates/admin/default/assets/less/bootstrap/pager.less create mode 100755 templates/admin/default/assets/less/bootstrap/pagination.less create mode 100755 templates/admin/default/assets/less/bootstrap/panels.less create mode 100755 templates/admin/default/assets/less/bootstrap/popovers.less create mode 100755 templates/admin/default/assets/less/bootstrap/print.less create mode 100755 templates/admin/default/assets/less/bootstrap/progress-bars.less create mode 100755 templates/admin/default/assets/less/bootstrap/responsive-utilities.less create mode 100755 templates/admin/default/assets/less/bootstrap/scaffolding.less create mode 100755 templates/admin/default/assets/less/bootstrap/tables.less create mode 100755 templates/admin/default/assets/less/bootstrap/theme.less create mode 100755 templates/admin/default/assets/less/bootstrap/thumbnails.less create mode 100755 templates/admin/default/assets/less/bootstrap/tooltip.less create mode 100755 templates/admin/default/assets/less/bootstrap/type.less create mode 100755 templates/admin/default/assets/less/bootstrap/utilities.less create mode 100755 templates/admin/default/assets/less/bootstrap/variables.less create mode 100755 templates/admin/default/assets/less/bootstrap/wells.less create mode 100644 templates/admin/default/assets/less/main.less create mode 100755 templates/admin/default/assets/less/thelia/breadcrumbs.less create mode 100755 templates/admin/default/assets/less/thelia/datepicker.less create mode 100755 templates/admin/default/assets/less/thelia/forms.less create mode 100755 templates/admin/default/assets/less/thelia/modals.less create mode 100755 templates/admin/default/assets/less/thelia/navbar.less create mode 100755 templates/admin/default/assets/less/thelia/responsive.less create mode 100755 templates/admin/default/assets/less/thelia/scaffolding.less create mode 100755 templates/admin/default/assets/less/thelia/tables.less create mode 100755 templates/admin/default/assets/less/thelia/tablesorter.less create mode 100644 templates/admin/default/assets/less/thelia/thelia.less create mode 100755 templates/admin/default/assets/less/thelia/type.less create mode 100755 templates/admin/default/assets/less/thelia/variables.less diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl index 93143d0e6..2288098f5 100644 --- a/templates/admin/default/admin-layout.tpl +++ b/templates/admin/default/admin-layout.tpl @@ -18,14 +18,18 @@ {* -- Bootstrap CSS section --------------------------------------------- *} {block name="before-bootstrap-css"}{/block} + + {stylesheets file='assets/less/*' filters='less,cssembed'} + + {/stylesheets} - {stylesheets file='assets/bootstrap/css/bootstrap.css' filters='cssembed'} + {block name="after-bootstrap-css"}{/block} @@ -33,9 +37,9 @@ {block name="before-admin-css"}{/block} - {stylesheets file='assets/css/*' filters='less,cssembed'} + {block name="after-admin-css"}{/block} @@ -67,15 +71,15 @@ {loop name="top-bar-search" type="auth" roles="ADMIN" permissions="admin.search"} @@ -88,7 +92,7 @@