Permalink
Browse files

Merge branch 'v3.3'

Conflicts:
	example/about.html
	example/documentation.html
	example/fluid.html
	example/grid.html
	index.html
	js/centurion.js
	js/modernizr-2.6.2-custom-min.js
	semantic.html
  • Loading branch information...
2 parents 40c7e64 + b87ff8d commit 17b39e1126dc49fab02c5a61df7862627ec84eec @justinhough committed Jul 23, 2013
Showing with 6,391 additions and 2,638 deletions.
  1. +2 −1 .gitignore
  2. +549 −0 _tables.html
  3. +567 −0 css/centurion-ie-rtl.css
  4. +567 −0 css/centurion-ie.css
  5. +1,200 −0 css/centurion-rtl.css
  6. +403 −184 css/centurion.css
  7. +1 −0 css/compressed/centurion-ie-rtl.min.css
  8. +1 −0 css/compressed/centurion-ie.min.css
  9. +1 −0 css/compressed/centurion-rtl.min.css
  10. +1 −1 css/compressed/centurion.min.css
  11. +1 −1 css/compressed/custom.min.css
  12. +1 −1 css/compressed/elusive-webfont.min.css
  13. +1 −1 css/compressed/fluid.min.css
  14. +1 −1 css/compressed/reset.min.css
  15. +1 −1 css/compressed/semantic.min.css
  16. +32 −18 css/custom.css
  17. +595 −542 css/elusive-webfont.css
  18. +127 −36 css/fluid.css
  19. +18 −21 css/reset.css
  20. +0 −3 css/semantic.css
  21. +30 −1 example/about.html
  22. +37 −337 example/documentation.html
  23. +30 −1 example/fluid.html
  24. +268 −431 example/grid.html
  25. BIN example/images/apple-touch-icon-114x114.png
  26. BIN example/images/apple-touch-icon-72x72.png
  27. BIN example/images/apple-touch-icon.png
  28. BIN example/images/favicon.ico
  29. BIN example/images/favicon.jpg
  30. BIN graphics/favicon.jpg
  31. BIN images/apple-touch-icon-114x114.png
  32. BIN images/apple-touch-icon-72x72.png
  33. BIN images/apple-touch-icon.png
  34. BIN images/favicon.jpg
  35. +101 −91 index.html
  36. +313 −1 js/centurion.js
  37. +1 −1 js/centurion.min.js
  38. +311 −0 js/lte-ie7.js
  39. +7 −0 js/modernizr-2.6.2-custom-min.js
  40. +37 −0 sass/centurion-ie-rtl.sass
  41. +35 −0 sass/centurion-ie.sass
  42. +81 −0 sass/centurion-rtl.sass
  43. +18 −18 sass/centurion.sass
  44. +1 −2 sass/core/_alerts.sass
  45. +2 −2 sass/core/_base.sass
  46. +1 −3 sass/core/_breadcrumbs.sass
  47. +0 −2 sass/core/_buttons.sass
  48. +0 −22 sass/core/_clearfix.sass
  49. +0 −154 sass/core/_col-grid.sass
  50. +0 −34 sass/core/_colors.sass
  51. +75 −60 sass/core/_grid.sass
  52. +154 −0 sass/core/_mixins.sass
  53. +12 −39 sass/core/_navigation.sass
  54. +1 −3 sass/core/_panels.sass
  55. +5 −0 sass/core/_print.sass
  56. +6 −7 sass/core/_tables.sass
  57. +1 −0 sass/core/_tooltips.sass
  58. +92 −28 sass/core/_typography.sass
  59. +0 −3 sass/core/_vars.sass
  60. +49 −27 sass/custom.sass
  61. +582 −546 sass/elusive-webfont.sass
  62. +2 −2 sass/fluid.sass
  63. +46 −1 sass/reset.sass
  64. +24 −11 semantic.html
View
@@ -1,5 +1,6 @@
.DS_store
.project
*.scssc
-
*.sassc
+
+compass_app_log.txt
Oops, something went wrong.

0 comments on commit 17b39e1

Please sign in to comment.