Permalink
Browse files

Merge branch 'take2'

Conflicts:
	.gitignore
	README.md
	app/assets/images/logo.png
	app/assets/stylesheets/homepage.css
	app/assets/stylesheets/rdr.css
	app/assets/stylesheets/screen.css
	app/overrides/replace_body.rb
  • Loading branch information...
2 parents d1d7f33 + 4ede38b commit efdb33d0fdc21d9817629cba146338f11f01f172 @sammyd committed Nov 18, 2011
Showing with 2,439 additions and 792 deletions.
  1. +27 −4 README.md
  2. BIN app/assets/images/bg.jpg
  3. BIN app/assets/images/footer_bkgd.jpg
  4. BIN app/assets/images/kid.jpg
  5. BIN app/assets/images/logo.png
  6. BIN app/assets/images/narrow_bg.png
  7. BIN app/assets/images/satellite-radios-bg.jpg
  8. BIN app/assets/images/search_bg_s1.gif
  9. BIN app/assets/images/store/bigbanner.png
  10. BIN app/assets/images/{ → store}/icons/american-express-curved-32px.png
  11. BIN app/assets/images/{ → store}/icons/discover-curved-32px.png
  12. BIN app/assets/images/{ → store}/icons/facebook.png
  13. BIN app/assets/images/{ → store}/icons/mastercard-curved-32px.png
  14. BIN app/assets/images/{ → store}/icons/social-icons-rollover.png
  15. BIN app/assets/images/{ → store}/icons/social-icons.png
  16. BIN app/assets/images/{ → store}/icons/twitter.png
  17. BIN app/assets/images/{ → store}/icons/visa-curved-32px.png
  18. BIN app/assets/images/store/shadow_top.png
  19. BIN app/assets/images/store/sidebanner.png
  20. BIN app/assets/images/{ → store}/social-icons-rollover.png
  21. BIN app/assets/images/{ → store}/social-icons.png
  22. +23 −0 app/assets/javascripts/store/rdr_wishlist.js
  23. +0 −263 app/assets/stylesheets/datepicker.css
  24. +0 −127 app/assets/stylesheets/homepage.css
  25. +0 −20 app/assets/stylesheets/rdr.css
  26. +0 −174 app/assets/stylesheets/screen.css
  27. 0 app/assets/stylesheets/{ → store}/cart.css
  28. +6 −5 app/assets/stylesheets/{ → store}/checkout.css
  29. 0 app/assets/stylesheets/{ → store}/editor.css
  30. +4 −4 app/assets/stylesheets/{errors.css → store/errors.css.erb}
  31. 0 app/assets/stylesheets/{ → store}/login.css
  32. +85 −0 app/assets/stylesheets/store/misc.css
  33. +2 −1 app/assets/stylesheets/{ → store}/products.css
  34. 0 app/assets/stylesheets/{ → store}/reset.css
  35. +219 −0 app/assets/stylesheets/store/screen.scss.erb
  36. 0 app/assets/stylesheets/{ → store}/social.css
  37. +25 −4 app/assets/stylesheets/{taxonomy.css → store/taxonomy.scss.erb}
  38. +15 −0 app/assets/stylesheets/store/tuatun.css
  39. +3 −3 app/assets/stylesheets/{ → store}/typography.css
  40. +20 −0 app/overrides/add_related_products_to_cart_form.rb
  41. +7 −0 app/overrides/add_taxonomies_to_product_show.rb
  42. +3 −7 app/overrides/add_to_head.rb
  43. +5 −0 app/overrides/drop_icon_from_add_to_wishlist.rb
  44. +11 −0 app/overrides/redefine_add_socials_to_login_extras.rb
  45. +7 −0 app/overrides/redefine_add_wish_to_cart_form.rb
  46. +13 −0 app/overrides/redefine_add_wishlists_to_account_my_orders.rb
  47. +16 −0 app/overrides/redefine_recently_viewed_overrides.rb
  48. +44 −0 app/overrides/redefine_replace_account_summary_with_social_logins.rb
  49. +5 −3 app/overrides/replace_account_my_orders.rb
  50. +36 −115 app/overrides/replace_body.rb
  51. +1 −2 app/overrides/replace_cart_form.rb
  52. +11 −3 app/overrides/replace_confirm.rb
  53. +1 −7 app/overrides/replace_empty-cart.rb
  54. +1 −1 app/overrides/replace_gateway_fields.rb
  55. +9 −0 app/overrides/replace_new_wishlist_form.rb
  56. +5 −0 app/overrides/replace_new_wishlist_header.rb
  57. +8 −0 app/overrides/replace_paypal_payment.rb
  58. +9 −9 app/overrides/replace_product_show.rb
  59. +4 −13 app/overrides/replace_products.rb
  60. +6 −0 app/overrides/replace_taxon_children.rb
  61. +2 −5 app/overrides/replace_taxon_sidebar_navigation.rb
  62. +1 −20 app/overrides/replace_taxonomies.rb
  63. +10 −2 app/overrides/replace_user_sessions_new.rb
  64. +22 −0 app/views/shared/_all_products.html.erb
  65. +9 −0 app/views/shared/_product_banner.html.erb
  66. +11 −0 app/views/shared/_social_users.html.erb
  67. +86 −0 app/views/wishlists/show.html.erb
  68. +20 −0 lib/generators/spree_tuatun_theme/install/install_generator.rb
  69. BIN vendor/assets/images/fancybox/blank.gif
  70. BIN vendor/assets/images/fancybox/fancy_close.png
  71. BIN vendor/assets/images/fancybox/fancy_loading.png
  72. BIN vendor/assets/images/fancybox/fancy_nav_left.png
  73. BIN vendor/assets/images/fancybox/fancy_nav_right.png
  74. BIN vendor/assets/images/fancybox/fancy_shadow_e.png
  75. BIN vendor/assets/images/fancybox/fancy_shadow_n.png
  76. BIN vendor/assets/images/fancybox/fancy_shadow_ne.png
  77. BIN vendor/assets/images/fancybox/fancy_shadow_nw.png
  78. BIN vendor/assets/images/fancybox/fancy_shadow_s.png
  79. BIN vendor/assets/images/fancybox/fancy_shadow_se.png
  80. BIN vendor/assets/images/fancybox/fancy_shadow_sw.png
  81. BIN vendor/assets/images/fancybox/fancy_shadow_w.png
  82. BIN vendor/assets/images/fancybox/fancy_title_left.png
  83. BIN vendor/assets/images/fancybox/fancy_title_main.png
  84. BIN vendor/assets/images/fancybox/fancy_title_over.png
  85. BIN vendor/assets/images/fancybox/fancy_title_right.png
  86. BIN vendor/assets/images/fancybox/fancybox-x.png
  87. BIN vendor/assets/images/fancybox/fancybox-y.png
  88. BIN vendor/assets/images/fancybox/fancybox.png
  89. +72 −0 vendor/assets/javascripts/jquery.easing-1.3.pack.js
  90. +1,156 −0 vendor/assets/javascripts/jquery.fancybox-1.3.4.js
  91. +46 −0 vendor/assets/javascripts/jquery.fancybox-1.3.4.pack.js
  92. +14 −0 vendor/assets/javascripts/jquery.mousewheel-3.0.4.pack.js
  93. 0 {app → vendor}/assets/stylesheets/jq-autocomplete.css
  94. 0 {app → vendor}/assets/stylesheets/jq-mobile-1.0a2.css
  95. +359 −0 vendor/assets/stylesheets/jquery.fancybox-1.3.4.css
View
@@ -1,11 +1,23 @@
SUMMARY
-------
-*NOTE: This is a work in progress*
+Spree Tuatun Theme is a standalone theme for Spree Commerce version 0.70.0 or later.
-Tuatun Theme is a standalone theme for Spree Commerce version 0.70.0 or later.
+This theme is now being used as the base theme for Spree demo store:
+
+* [View Demo - http://demo.spreecommerce.com](http://demo.spreecommerce.com)
+* [View Demo Repo - https://github.com/spree/demo](https://github.com/spree/demo)
+
+
+This theme also currently supports (and will restyle the following
+extensions if installed):
+
+* [spree_social - https://github.com/spree/spree_social](https://github.com/spree/spree_social)
+* [spree_wishlist - https://github.com/spree/spree_wishlist](https://github.com/spree/spree_wishlist)
+* [spree_recently_viewed - https://github.com/spree/spree_recently_viewed](https://github.com/spree/spree_recently_viewed)
+* [spree_related_products - https://github.com/spree/spree_related_products](https://github.com/spree/spree_related_products)
+* [spree_paypal_express - https://github.com/spree/spree_paypal_express](https://github.com/spree/spree_paypal_express)
-Based on the Rails Dog Radio Theme at https://github.com/spree/spree_rdr_theme
INSTALLATION
------------
@@ -14,6 +26,17 @@ Add the following line to your Gemfile:
gem 'spree_tuatun_theme', :git => 'git://github.com/sammyd/spree_tuatun_theme.git'
-And install:
+NOTE: It's important that you add this line at the bottom of the Gemfile, or at least AFTER any other extension/engine/gem that you'd like to theme (i.e. Spree)
+
+Run bundler:
$ bundle install
+
+Install assets:
+
+ $ rails g spree_tuatun_theme:install
+
+Optional: Clear out precompiled assets (required for install in sandbox):
+
+ $ rake assets:clean
+
View
Deleted file not rendered
Deleted file not rendered
View
Deleted file not rendered
View
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
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.
@@ -0,0 +1,23 @@
+$(document).ready(function() {
+
+ if($('a#edit_wishlist_link').is('*')){
+ //handle wishlist edit link (show / hide form)
+ $('a#edit_wishlist_link').click(function(){
+ if($('#edit_wishlist').is(':visible')){
+ $('#edit_wishlist').slideUp();
+ }else{
+ $('#edit_wishlist').slideDown();
+ }
+
+ return false;
+ });
+
+ //handle move item link
+ $('.move_item a.button').click(function(){
+ var move_button = $(this);
+ move_button.hide();
+ move_button.parent().find('form').fadeIn();
+ return false;
+ });
+ }
+ });
@@ -1,263 +0,0 @@
-/* This is a very basic stylesheet for the date-picker. Feel free to create your own. */
-
-/* The wrapper div */
-div.datePicker
- {
- position:absolute;
- min-width:24em;
- width:24em;
- z-index:9999;
- text-align:center;
-
- /* Change the font-size to suit your design's CSS. The following line is for the demo that has a 12px font-size defined on the body tag */
- font:900 0.8em/0.8em Verdana, Sans-Serif;
-
- /* For Example: If using the YUI font CSS, uncomment the following line to get a 10px font-size within the datePicker */
- /* font:900 77%/77% Verdana; */
-
- background:transparent;
-
- /* Mozilla & Webkit extensions to stop text-selection. Remove if you wish to validate the CSS */
- -moz-user-select:none;
- -khtml-user-select:none;
- }
-/* Styles for the static datePickers */
-div.staticDP
- {
- position:relative;
- top:5px;
- left:0;
- }
-/* The iframe hack to cover selectlists in Internet Explorer <= v6 */
-iframe.iehack
- {
- position:absolute;
- background:#fff;
- z-index:9998;
- padding:0;
- border:0;
- display:none;
- margin:0;
- }
-/* The "button" created beside each input for non-static datePickers */
-a.date-picker-control:link,
-a.date-picker-control:visited,
-a.date-picker-control:hover,
-a.date-picker-control:active,
-a.date-picker-control:focus
- {
- /*position:relative;*/
- /* Moz & FF */
- display: -moz-inline-stack;
- border:0 none;
- padding:0;
- margin:0 0 0 4px;
- background:transparent url(/images/datepicker/cal.gif) no-repeat 50% 50%;
- min-width:16px;
- line-height:1;
- cursor:pointer;
- visibility:visible;
- text-decoration:none;
- vertical-align:middle;
- }
-/* Feed IE6 the following rule, IE7 should handle the min-width declared above */
-* html a.date-picker-control
- {
- width:16px;
- }
-a.date-picker-control
- {
- /* IE, Safari & Opera. Seperate CSS rule seems to be required. */
- display:inline-block;
- }
-a.date-picker-control span
- {
- display:block;
- width:16px;
- height:16px;
- margin:auto 0;
- }
-/* The next & previous buttons */
-div.datePicker th span
- {
- display:inline;
- padding:0;
- margin:0;
- color:#000;
- text-align:center;
- line-height:1em;
- border-width:0;
- font-family: georgia, times new roman, palatino, times, bookman, serif;
- background:transparent;
- font-weight:bold;
- cursor:pointer;
- }
-div.datePicker th span.month-display,
-div.datePicker th span.year-display
- {
- text-transform:uppercase;
- letter-spacing:1px;
- font:normal 1.2em Verdana, Sans-Serif;
- cursor:default;
- }
-div.datePicker th span.prev-but,
-div.datePicker th span.next-but
- {
- font-size:1.8em;
- cursor:pointer !important;
- }
-
-div.datePicker th span.today-but
- {
- text-align:center;
- margin:0 auto;
- font:normal 1em Verdana, Sans-Serif;
- width:100%;
- text-decoration:none;
- line-height:1.6em;
- text-transform:uppercase;
- cursor:pointer !important
- }
-div.datePicker thead th span.fd-disabled
- {
- color:#aaa;
- cursor:default !important;
- }
-/* The mon, tue, wed etc day buttons */
-div.datePicker th span.fd-day-header
- {
- text-align:center;
- margin:0 auto;
- font:900 1em Verdana, Sans-Serif;
- height:1.4em;
- width:2em;
- text-decoration:none;
- text-transform:lowercase;
- line-height:1.4em;
- }
-/* The table */
-div.datePicker table
- {
- position:relative;
- margin:0;
- padding:0;
- border:1px solid #ccc;
- background:#fff url(/images/datepicker/gradient-e5e5e5-ffffff.gif) repeat-x 0 -20px;
- text-align:center;
- width:100%;
- border-spacing:2px;
- table-layout:fixed;
- border-collapse:separate;
- }
-/* Common TD & TH styling */
-div.datePicker table td
- {
- border:1px solid #ccc;
- padding:0;
- text-align:center;
- vertical-align:middle;
- /* Opera requires a line-height bigger than 1em in order to redraw properly */
- line-height:1.2em;
- cursor:pointer;
- background:#fff url(/images/datepicker/gradient-e5e5e5-ffffff.gif) repeat-x 0 -40px;
- width:3em;
- height:3em !important;
- height:2.8em;
- outline:none;
- }
-div.datePicker table th
- {
- border:0 none;
- padding:0;
- line-height:1em;
- font-weight:bold;
- color:#222;
- text-align:center;
- vertical-align:middle;
- }
-div.datePicker table td.date-picker-unused
- {
- background:#fff url(/images/datepicker/backstripes.gif);
- border-color:#dcdcdc;
- padding:0;
- cursor:default !important;
- }
-div.datePicker table thead th.date-picker-title
- {
- width:auto;
- height:auto;
- padding:0.4em 0;
- }
-/* The "mon tue wed etc" day header button styles */
-div.datePicker table th.date-picker-day-header
- {
- text-transform:lowercase;
- width:3em;
- }
-div.datePicker table th.date-picker-day-header span
- {
- display:block;
- }
-/* The "todays date" style */
-div.datePicker table td.date-picker-today
- {
- background:#fff url(/images/datepicker/bullet2.gif) no-repeat 0 0;
- color:rgb(100,100,100) !important;
- }
-/* The "selected date" style */
-div.datePicker table td.date-picker-selected-date
- {
- color:#333 !important;
- border-color:#333 !important;
- }
-/* the "highlight days" style */
-td.date-picker-highlight
- {
- color:#a86666;
- }
-/* The date "out of range" style */
-div.datePicker table td.out-of-range
- {
- color:#ccc !important;
- font-style:oblique;
- background:#fcfcfc !important;
- cursor:default !important;
- }
-/* The "disabled days" style */
-div.datePicker table td.day-disabled
- {
- color:#aaa !important;
- background:transparent !important;
- cursor:default !important;
- }
-/* The "active cursor" style */
-div.datePicker table tbody td.date-picker-hover
- {
- background:#fff url(/images/datepicker/bg_header.jpg) no-repeat 0 0;
- cursor:pointer;
- border-color:rgb(100,130,170);
- color:rgb(100,130,170);
- }
-/*
- Quirksmode necessity?
- ---------------------
-
- If your HTML document renders in quirksmode (i.e. has no doctype declaration)
- then uncomment the following CSS rule to set a less drastic font-size in IE
-
-div.datePicker table th,
-div.datePicker table td
- {
- font-size:100%;
- }
-*/
-
-/* Remove the images for Internet Explorer <= v6 using the "* html" hack */
-* html div.datePicker table td
- {
- background-image:none;
- }
-* html div.datePicker table td.date-picker-unused
- {
- background:#f2f2f2;
- }
Oops, something went wrong.

0 comments on commit efdb33d

Please sign in to comment.