Skip to content
Permalink
Browse files

added latest css bootstrap and font icons

  • Loading branch information...
danielkerr committed Aug 24, 2015
1 parent 2dea454 commit 8031629ffd7345227130629902c232816a87044e
Showing with 5,483 additions and 1,495 deletions.
  1. +587 −0 upload/admin/view/javascript/bootstrap/css/bootstrap-theme.css
  2. +1 −0 upload/admin/view/javascript/bootstrap/css/bootstrap-theme.css.map
  3. +5 −0 upload/admin/view/javascript/bootstrap/css/bootstrap-theme.min.css
  4. +1,132 −619 upload/admin/view/javascript/bootstrap/css/bootstrap.css
  5. +1 −0 upload/admin/view/javascript/bootstrap/css/bootstrap.css.map
  6. +5 −0 upload/admin/view/javascript/bootstrap/css/bootstrap.min.css
  7. +1 −1 upload/admin/view/javascript/common.js
  8. +358 −4 upload/admin/view/javascript/font-awesome/css/font-awesome.css
  9. +2 −2 upload/admin/view/javascript/font-awesome/css/font-awesome.min.css
  10. BIN upload/admin/view/javascript/font-awesome/fonts/FontAwesome.otf
  11. BIN upload/admin/view/javascript/font-awesome/fonts/fontawesome-webfont.eot
  12. +133 −13 upload/admin/view/javascript/font-awesome/fonts/fontawesome-webfont.svg
  13. BIN upload/admin/view/javascript/font-awesome/fonts/fontawesome-webfont.ttf
  14. BIN upload/admin/view/javascript/font-awesome/fonts/fontawesome-webfont.woff
  15. BIN upload/admin/view/javascript/font-awesome/fonts/fontawesome-webfont.woff2
  16. +34 −0 upload/admin/view/javascript/font-awesome/less/animated.less
  17. +9 −0 upload/admin/view/javascript/font-awesome/less/bordered-pulled.less
  18. +2 −1 upload/admin/view/javascript/font-awesome/less/core.less
  19. +2 −2 upload/admin/view/javascript/font-awesome/less/font-awesome.less
  20. +126 −1 upload/admin/view/javascript/font-awesome/less/icons.less
  21. +2 −1 upload/admin/view/javascript/font-awesome/less/mixins.less
  22. +1 −0 upload/admin/view/javascript/font-awesome/less/path.less
  23. +129 −2 upload/admin/view/javascript/font-awesome/less/variables.less
  24. +34 −0 upload/admin/view/javascript/font-awesome/scss/_animated.scss
  25. +9 −0 upload/admin/view/javascript/font-awesome/scss/_bordered-pulled.scss
  26. +2 −1 upload/admin/view/javascript/font-awesome/scss/_core.scss
  27. +126 −1 upload/admin/view/javascript/font-awesome/scss/_icons.scss
  28. +2 −1 upload/admin/view/javascript/font-awesome/scss/_mixins.scss
  29. +2 −1 upload/admin/view/javascript/font-awesome/scss/_path.scss
  30. +129 −2 upload/admin/view/javascript/font-awesome/scss/_variables.scss
  31. +2 −2 upload/admin/view/javascript/font-awesome/scss/font-awesome.scss
  32. +3 −5 upload/admin/view/template/common/filemanager.tpl
  33. +7 −7 upload/admin/view/template/common/menu.tpl
  34. +125 −14 upload/catalog/view/javascript/bootstrap/css/bootstrap-theme.css
  35. +1 −1 upload/catalog/view/javascript/bootstrap/css/bootstrap-theme.css.map
  36. +2 −2 upload/catalog/view/javascript/bootstrap/css/bootstrap-theme.min.css
  37. +324 −90 upload/catalog/view/javascript/bootstrap/css/bootstrap.css
  38. +1 −1 upload/catalog/view/javascript/bootstrap/css/bootstrap.css.map
  39. +2 −2 upload/catalog/view/javascript/bootstrap/css/bootstrap.min.css
  40. +226 −169 upload/catalog/view/javascript/bootstrap/js/bootstrap.js
  41. +4 −4 upload/catalog/view/javascript/bootstrap/js/bootstrap.min.js
  42. +501 −41 upload/catalog/view/javascript/font-awesome/css/font-awesome.css
  43. +2 −2 upload/catalog/view/javascript/font-awesome/css/font-awesome.min.css
  44. BIN upload/catalog/view/javascript/font-awesome/fonts/FontAwesome.otf
  45. BIN upload/catalog/view/javascript/font-awesome/fonts/fontawesome-webfont.eot
  46. +600 −464 upload/catalog/view/javascript/font-awesome/fonts/fontawesome-webfont.svg
  47. BIN upload/catalog/view/javascript/font-awesome/fonts/fontawesome-webfont.ttf
  48. BIN upload/catalog/view/javascript/font-awesome/fonts/fontawesome-webfont.woff
  49. BIN upload/catalog/view/javascript/font-awesome/fonts/fontawesome-webfont.woff2
  50. +34 −0 upload/catalog/view/javascript/font-awesome/less/animated.less
  51. +9 −0 upload/catalog/view/javascript/font-awesome/less/bordered-pulled.less
  52. +4 −4 upload/catalog/view/javascript/font-awesome/less/core.less
  53. +2 −2 upload/catalog/view/javascript/font-awesome/less/font-awesome.less
  54. +174 −3 upload/catalog/view/javascript/font-awesome/less/icons.less
  55. +1 −1 upload/catalog/view/javascript/font-awesome/less/list.less
  56. +10 −4 upload/catalog/view/javascript/font-awesome/less/mixins.less
  57. +6 −5 upload/catalog/view/javascript/font-awesome/less/path.less
  58. +11 −0 upload/catalog/view/javascript/font-awesome/less/rotated-flipped.less
  59. +176 −3 upload/catalog/view/javascript/font-awesome/less/variables.less
  60. +34 −0 upload/catalog/view/javascript/font-awesome/scss/_animated.scss
  61. +9 −0 upload/catalog/view/javascript/font-awesome/scss/_bordered-pulled.scss
  62. +4 −4 upload/catalog/view/javascript/font-awesome/scss/_core.scss
  63. +174 −3 upload/catalog/view/javascript/font-awesome/scss/_icons.scss
  64. +10 −4 upload/catalog/view/javascript/font-awesome/scss/_mixins.scss
  65. +2 −1 upload/catalog/view/javascript/font-awesome/scss/_path.scss
  66. +11 −0 upload/catalog/view/javascript/font-awesome/scss/_rotated-flipped.scss
  67. +176 −3 upload/catalog/view/javascript/font-awesome/scss/_variables.scss
  68. +2 −2 upload/catalog/view/javascript/font-awesome/scss/font-awesome.scss

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -120,7 +120,7 @@ $(document).ready(function() {
$('#button-image').prop('disabled', false);
},
success: function(html) {
$('body').append('<div id="modal-image" class="modal">' + html + '</div>');
$('body').after('<div id="modal-image" class="modal"><div class="modal-dialog modal-lg">' + html + '</div></div>');

$('#modal-image').modal('show');
}
Oops, something went wrong.

0 comments on commit 8031629

Please sign in to comment.
You can’t perform that action at this time.