Permalink
Browse files

Merge remote branch 'ethan/develop' into develop

  • Loading branch information...
2 parents a73648a + a0c2d73 commit 9bfff355470d39bcdd175e6d1818ea20fff52956 Gerry Gleason committed Dec 20, 2012
Showing with 30 additions and 10 deletions.
  1. +2 −2 app/assets/stylesheets/card.css
  2. +5 −1 ...pplication-87d0aa7fc68928d99a172298d1f8d85f.js → application-22f43018efeed57b91185ae107020c52.js}
  3. BIN ...tion-87d0aa7fc68928d99a172298d1f8d85f.js.gz → application-22f43018efeed57b91185ae107020c52.js.gz}
  4. +1 −1 ...-all-a72253fe146dba15c6a0baf7f0bdd2a1.css → application-all-08d99b895fb180eba1c44ce06f328e78.css}
  5. BIN public/assets/application-all-08d99b895fb180eba1c44ce06f328e78.css.gz
  6. BIN public/assets/application-all-a72253fe146dba15c6a0baf7f0bdd2a1.css.gz
  7. +1 −1 public/assets/application-all.css
  8. BIN public/assets/application-all.css.gz
  9. BIN public/assets/application-print-2ab614fbd34fa2be0e616bbdf0d2318b.css.gz
  10. BIN public/assets/application-print.css.gz
  11. +5 −1 public/assets/application.js
  12. BIN public/assets/application.js.gz
  13. BIN public/assets/jquerymobile/ajax-loader-a8a4bc1c4b502e156ed451507987eed7.png
  14. BIN public/assets/jquerymobile/ajax-loader-cad1a448fe000d9643c57860e5493861.gif
  15. BIN public/assets/jquerymobile/ajax-loader.gif
  16. BIN public/assets/jquerymobile/ajax-loader.png
  17. BIN public/assets/jquerymobile/icons-18-black-b6e62647e8518462e73fd052bfe25d6c.png
  18. BIN public/assets/jquerymobile/icons-18-black.png
  19. BIN public/assets/jquerymobile/icons-18-white-f4ae730f6acc1e5b1781652e5d6973c7.png
  20. BIN public/assets/jquerymobile/icons-18-white.png
  21. BIN public/assets/jquerymobile/icons-36-black-13a52024f9a92e59a69dca49014d9292.png
  22. BIN public/assets/jquerymobile/icons-36-black.png
  23. BIN public/assets/jquerymobile/icons-36-white-3b109c0900c418fd2e5468dfb35b3f59.png
  24. BIN public/assets/jquerymobile/icons-36-white.png
  25. +16 −4 public/assets/manifest.yml
  26. BIN public/assets/tinymce-025f3a2beeeb18ce2b5f2dafdb14eb86.js.gz
  27. BIN public/assets/tinymce.js.gz
@@ -137,7 +137,7 @@ a.email-link {
color: #069;
background: #ffc;
}
-
+/*
.content-view p,
.content-view span,
.content-view a,
@@ -149,7 +149,7 @@ a.email-link {
-moz-border-radius: inherit;
border-radius: inherit;
}
-
+*/
/* note: ".card-slot .content-view div not(.editor)" was not working properly and was breaking nested block elements.
without it nested divs in content-view areas probably won't highlight */

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.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -61,10 +61,10 @@ wait.gif: wait-fcacc98c2777bec05f82da6258e1378b.gif
wait/index.gif: wait-fcacc98c2777bec05f82da6258e1378b.gif
wait_lg.gif: wait_lg-397bf884dd6fafbdd31e51c0f7c328d3.gif
wait_lg/index.gif: wait_lg-397bf884dd6fafbdd31e51c0f7c328d3.gif
-application.js: application-87d0aa7fc68928d99a172298d1f8d85f.js
-application/index.js: application-87d0aa7fc68928d99a172298d1f8d85f.js
-application-all.css: application-all-a72253fe146dba15c6a0baf7f0bdd2a1.css
-application-all/index.css: application-all-a72253fe146dba15c6a0baf7f0bdd2a1.css
+application.js: application-22f43018efeed57b91185ae107020c52.js
+application/index.js: application-22f43018efeed57b91185ae107020c52.js
+application-all.css: application-all-08d99b895fb180eba1c44ce06f328e78.css
+application-all/index.css: application-all-08d99b895fb180eba1c44ce06f328e78.css
application-print.css: application-print-2ab614fbd34fa2be0e616bbdf0d2318b.css
application-print/index.css: application-print-2ab614fbd34fa2be0e616bbdf0d2318b.css
tinymce.js: tinymce-025f3a2beeeb18ce2b5f2dafdb14eb86.js
@@ -241,3 +241,15 @@ tinymce/themes/simple/img/icons.gif: tinymce/themes/simple/img/icons-0a4645a5a71
tinymce/themes/simple/img/icons/index.gif: tinymce/themes/simple/img/icons-0a4645a5a71e0da61978dbf7dce1708b.gif
tinymce/themes/simple/skins/o2k7/img/button_bg.png: tinymce/themes/simple/skins/o2k7/img/button_bg-89e593ea65f65ae49e3c299dc0a19cb1.png
tinymce/themes/simple/skins/o2k7/img/button_bg/index.png: tinymce/themes/simple/skins/o2k7/img/button_bg-89e593ea65f65ae49e3c299dc0a19cb1.png
+jquerymobile/ajax-loader.gif: jquerymobile/ajax-loader-cad1a448fe000d9643c57860e5493861.gif
+jquerymobile/ajax-loader/index.gif: jquerymobile/ajax-loader-cad1a448fe000d9643c57860e5493861.gif
+jquerymobile/ajax-loader.png: jquerymobile/ajax-loader-a8a4bc1c4b502e156ed451507987eed7.png
+jquerymobile/ajax-loader/index.png: jquerymobile/ajax-loader-a8a4bc1c4b502e156ed451507987eed7.png
+jquerymobile/icons-18-black.png: jquerymobile/icons-18-black-b6e62647e8518462e73fd052bfe25d6c.png
+jquerymobile/icons-18-black/index.png: jquerymobile/icons-18-black-b6e62647e8518462e73fd052bfe25d6c.png
+jquerymobile/icons-18-white.png: jquerymobile/icons-18-white-f4ae730f6acc1e5b1781652e5d6973c7.png
+jquerymobile/icons-18-white/index.png: jquerymobile/icons-18-white-f4ae730f6acc1e5b1781652e5d6973c7.png
+jquerymobile/icons-36-black.png: jquerymobile/icons-36-black-13a52024f9a92e59a69dca49014d9292.png
+jquerymobile/icons-36-black/index.png: jquerymobile/icons-36-black-13a52024f9a92e59a69dca49014d9292.png
+jquerymobile/icons-36-white.png: jquerymobile/icons-36-white-3b109c0900c418fd2e5468dfb35b3f59.png
+jquerymobile/icons-36-white/index.png: jquerymobile/icons-36-white-3b109c0900c418fd2e5468dfb35b3f59.png
Binary file not shown.
View
Binary file not shown.

0 comments on commit 9bfff35

Please sign in to comment.