spree_core 0.60.6 → 0.70.0

data/{public/stylesheets/admin/admin-forms.css → app/assets/stylesheets/admin/admin-form.css.erb}

@@ -1,12 +1,12 @@
-/* -------------------------------------------------------------- 
-   
+/* --------------------------------------------------------------
+
    forms.css
    * Sets up some default styling for forms
    * Gives you classes to enhance your forms
-   
+
    Usage:
    * For text fields, use class .title or .text
-   
+
 -------------------------------------------------------------- */
 
 label       { font-weight: bold; }
@@ -28,11 +28,21 @@ textarea:focus, select:focus {
   border:1px solid #666;
 }
 
-input.text, 
+input.text,
 input.title   { padding:5px; }
 input.title   { font-size:1.5em; }
 textarea      { height: 250px; padding:5px; }
 
+
+fieldset#preferences input.input_string, fieldset#preferences textarea {
+  border: 1px solid #BBB;
+  padding: 5px;
+  font-size: 1.5em;
+  width: 98%;
+}
+
+fieldset#preferences textarea { height: 100px; }
+
 .required { color:#f00; font-weight:bold; font-size:1.2em;}
 .fullwidth { width:98% }
 
@@ -43,9 +53,7 @@ textarea      { height: 250px; padding:5px; }
 
 
 .date-range-filter {width:220px;}
-  .date-range-filter input {width:75px;}
-  .date-range-filter .yui-u { width:50% }
-
+  .date-range-filter input {width:70px;}
 
 /* Multi-column form layout
 -------------------------------------------------------------- */
@@ -54,16 +62,16 @@ div.split {
 }
 form div.left
 {
-	display:inline;
-	float:left;
-	width:48%;
+  display:inline;
+  float:left;
+  width:48%;
 }
 
 form div.right
 {
-	display:inline;
-	float:right;
-	width:48%;
+  display:inline;
+  float:right;
+  width:48%;
 }
 form p {
   clear:both;
@@ -86,17 +94,17 @@ form div.right.w30 {
   border-left:none;border-right:none;
 }
 .flash.error {
-  background: #FDE4E4 url(../../images/admin/icons/exclamation.png) 10px center no-repeat;
+  background: #FDE4E4 url(<%= asset_path 'admin/icons/exclamation.png' %>) 10px center no-repeat;
   color:#c00; border-color:#c00;
 }
 .flash.notice {
-  background: #E7F8D7 url(../../images/admin/icons/tick.png) 10px center no-repeat;
+  background: #E7F8D7 url(<%= asset_path 'admin/icons/tick.png' %>) 10px center no-repeat;
   color:#59A151; border-color: #59A151;
 }
 
 .withError {
   background-color:#FDE4E4;
-  background-image:url(../../images/admin/bg/red-stripes.png);
+  background-image:url(<%= asset_path 'admin/bg/red-stripes.png' %>);
 }
 .formError {
   color:#c00; font-weight:bold;
@@ -122,7 +130,7 @@ form div.right.w30 {
   position: relative; }
   .field .formError {
     color: #fff;
-    background: #f15700 url(../../images/admin/icons/fugue/exclamation_small.png) center left no-repeat;
+    background: #f15700 url(<%= asset_path 'admin/icons/exclamation.png' %>) center left no-repeat;
     padding: 3px 7px;
     display: inline-block;
     margin-bottom: 1em;
@@ -140,8 +148,9 @@ fieldset {
   margin-bottom: 1em;
   padding: 1em;
   border: solid 1px #ccc;
+  background-color: #fff;
   -moz-border-radius: 10px;
-  -webkit-border-radius: 10px; 
+  -webkit-border-radius: 10px;
   }
   fieldset h1 {
     font-size: 1.75em; }

data/{public/stylesheets/admin/admin-tables.css → app/assets/stylesheets/admin/admin-tables.css.erb}

@@ -1,5 +1,5 @@
 table.index th {
-  background: #cdcdcd url(../../images/admin/bg/grid_header_back.png) top left repeat-x;
+  background: #cdcdcd url(<%= asset_path 'admin/bg/grid_header_back.png' %>) top left repeat-x;
   padding: 7px 10px;
   border-left: 1px solid #ddd;
   border-top: 1px solid #ddd;
@@ -13,6 +13,7 @@ table.index th {
   table.index th.id-col {
     text-align: center; }
   table.index td {
+    background-color: #fff;
     border-bottom:1px solid #ddd;
     padding: 3px 10px;
   }
@@ -23,7 +24,7 @@ table.index th {
 table.index tr.alt td {
   background-color: #efefef; }
 table.index.green th {
-  background: #cfefa7 url(/images/grid_header_back_green.png) top left repeat-x;
+  background: #cfefa7 url(<%= asset_path 'admin/bg/grid_header_back_green.png' %>) top left repeat-x;
   border-left: 1px solid #E4FDB4;
   border-top: 1px solid #E4FDB4;
   border-right: 1px solid #B7CB90;

data/{public → app/assets}/stylesheets/admin/admin-typography.css

@@ -54,7 +54,7 @@ acronym     { border-bottom: 1px dotted #666; }
 address     { margin: 0 0 1.5em; font-style: italic; }
 del         { color:#666; }
 
-pre 				{ margin: 1.5em 0; white-space: pre; }
+pre         { margin: 1.5em 0; white-space: pre; }
 pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.5; }
 
 
@@ -78,7 +78,7 @@ dd          { margin-left: 1.5em;}
 
 table       { margin-bottom: 1.4em; width:100%; }
 th          { font-weight: bold; }
-thead th 		{ background: #c3d9ff; }
+thead th    { background: #c3d9ff; }
 th,td,caption { padding: 4px 10px 4px 5px; }
 tr.even td  { background: #e5ecf9; }
 tfoot       { font-style: italic; }

data/{public/stylesheets/admin/admin.css → app/assets/stylesheets/admin/admin.css.erb}

@@ -66,7 +66,7 @@ body {
       #content a:visited {
         color: #3C7DFB; }
     #content.with-sidebar {
-      background: #fff url(../../images/admin/bg/content-back.png) right top repeat-y;
+      background: #fff url(<%= asset_path 'admin/bg/content-back.png' %>) right top repeat-y;
       padding-right: 340px;
       position: relative; }
       #sidebar {
@@ -118,7 +118,7 @@ body {
               #sidebar ul.sidebar li a:hover { background-color:#ddd }
               #sidebar ul.sidebar li.active a {
                 font-weight: bold;
-                background: url(../../images/admin/bg/menu-current.png) left center no-repeat;
+                background: url(<%= asset_path 'admin/bg/menu-current.png' %>) left center no-repeat;
                 color: #363 !important;
                 margin-left: -20px;
                 padding-left: 30px; }
@@ -196,7 +196,7 @@ body {
   #IE7 #admin-menu {
     height: 39px; }
   #admin-menu {
-    background: #154e8c url(../../images/admin/bg/admin_tab_back.png) top left repeat-x;
+    background: #154e8c url(<%= asset_path 'admin/bg/admin_tab_back.png' %>) top left repeat-x;
     border-top: 1px solid #4B83E2;
     border-right: 1px solid #34599B;
     border-bottom: 1px solid #41A6F0;
@@ -206,7 +206,7 @@ body {
       #admin-menu ul li:first-child {
         border-left: 1px solid #34599B; }
       #admin-menu ul li.selected {
-        background: #0095da url(../../images/admin/bg/admin_tab_selected_back.png) top left repeat-x;
+        background: #0095da url(<%= asset_path 'admin/bg/admin_tab_selected_back.png' %>) top left repeat-x;
         border-left: 1px solid #41A6F0;
         border-top: 1px solid #41A6F0;
         border-right: 1px solid #4986BF;
@@ -252,7 +252,7 @@ body {
     .search-form label {
       display: block; }
   a.button {
-    background: transparent url(../../images/admin/buttons/right_01.png) no-repeat scroll top right;
+    background: transparent url(<%= asset_path 'admin/buttons/right_01.png' %>) no-repeat scroll top right;
     display: block;
     float: left;
     margin-right: 6px;
@@ -262,7 +262,7 @@ body {
     font-weight: bold;
     outline: none; }
     a.button span {
-      background: transparent url(../../images/admin/buttons/left_01.png) no-repeat;
+      background: transparent url(<%= asset_path 'admin/buttons/left_01.png' %>) no-repeat;
       display: block;
       line-height: 22px;
       padding: 7px 0 5px 14px;
@@ -274,24 +274,24 @@ body {
       font-weight: normal; }
     a.button.small {
       font-size: 1em;
-      background: transparent url(../../images/admin/buttons/right_01_small.png) no-repeat scroll top right;
+      background: transparent url(<%= asset_path 'admin/buttons/right_01_small.png' %>) no-repeat scroll top right;
       padding-right: 20px; }
       a.button.small span {
-        background: transparent url(../../images/admin/buttons/left_01_small.png) no-repeat;
+        background: transparent url(<%= asset_path 'admin/buttons/left_01_small.png' %>) no-repeat;
         padding: 5px 0 3px 20px;
         line-height: 21px; }
     a.button.green {
-      background: transparent url(../../images/admin/buttons/green/right_01.png) no-repeat scroll top right;
+      background: transparent url(<%= asset_path 'admin/buttons/green/right_01.png' %>) no-repeat scroll top right;
       color: #151 !important; }
       a.button.green span {
-        background: transparent url(../../images/admin/buttons/green/left_01.png) no-repeat; }
+        background: transparent url(<%= asset_path 'admin/buttons/green/left_01.png' %>) no-repeat; }
   button {
     border: 0;
     cursor: pointer;
     font-weight: bold;
     padding: 0 20px 0 0;
     text-align: center;
-    background: url(../../images/admin/buttons/right_01.png) center right no-repeat;
+    background: url(<%= asset_path 'admin/buttons/right_01.png' %>) center right no-repeat;
     font-size: 1.3em;
     outline: none; }
     button span {
@@ -301,7 +301,7 @@ body {
       padding: 0 0 0 20px;
       height: 35px;
       line-height: 35px;
-      background: url(../../images/admin/buttons/left_01.png) center left no-repeat;
+      background: url(<%= asset_path 'admin/buttons/left_01.png' %>) center left no-repeat;
       text-shadow: #efefef 1px 1px 0px; }
       button span img {
         vertical-align: middle;
@@ -311,6 +311,10 @@ body {
     button.tick {
       background: none;
       width: 24px; }
+    button.small {
+      font-size: 1em;
+      padding: 0 10px 0 10px;
+    }
   input.title,
   textarea {
     margin: 0; }
@@ -327,7 +331,7 @@ body {
     .errorExplanation h2 {
       font-size: 1.75em;
       padding-left: 40px;
-      background: url(../../images/admin/icons/orb/32x32/3.png) center left no-repeat; }
+      background: url(<%= asset_path 'admin/icons/32x32/3.png' %>) center left no-repeat; }
   ul.checkbox-list {
     list-style: none; }
     ul.checkbox-list li {
@@ -402,7 +406,7 @@ body {
       ul.taxonomy-actions li.disabled {
         opacity: .5; }
   h3.warning {
-    background-image: url(../../images/admin/icons/fugue/exclamation.png);
+    background-image: url(<%= asset_path 'admin/icons/exclamation.png' %>);
     background-position: 10px 15px;
     background-repeat: no-repeat;
     padding-left: 35px; }
@@ -447,12 +451,12 @@ span.current_page {
   color: #FFF;
 }
 
-div#calculator-settings-warning {
+div#calculator-settings-warning, .warning {
  color: #f00;
 }
 #progress{
   display:none;
-  background:#154E8C url(../../images/admin/bg/admin_tab_back.png) repeat-x scroll left top;
+  background:#154E8C url(<%= asset_path 'admin/bg/admin_tab_back.png' %>) repeat-x scroll left top;
   color:#fff;
   font-size:170%;
   height:25px;
@@ -578,37 +582,9 @@ table#product_scopes tr td table tr td {
 
 
 span.handle{
-  background-image: url(../../images/reorder.jpg);
+  background-image: url(<%= asset_path 'admin/icons/switch.png' %>);
   display: inline-block;
+  cursor: move;
   width:14px;
   height:15px;
 }
-
-.alert {
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-  font-size: 1.3em;
-  margin-bottom: 1em;
-  padding: 0.8em;
-}
-.alert a.dismiss {
-  float:right;
-  font-size: 0.8em;
-}
-.alert.release {
-  background: #ccddff url(../images/shadow_top.png) 0px -50px repeat-x;
-  color: #556699;
-  border: 1px solid #99aacc;
-}
-.alert.security {
-  background: #f4b4b4 url(../images/shadow_top.png) 0px -50px repeat-x;
-  color: #000000;
-  border: 1px solid #e75b5b;
-}
-.alert.news {
-  background: #ccffd4 url(../images/shadow_top.png) 0px -50px repeat-x;
-  color: #000000;
-  border: 1px solid #66ff7e;
-}
-

data/{public/stylesheets/admin/autocomplete.css → app/assets/stylesheets/admin/edit_checkouts.css}

@@ -1,8 +1,6 @@
-/* @override http://localhost:3000/stylesheets/admin/edit_orders.css */
-
 .ac_results {
   padding: 0px;
-  border: 1px solid #666;
+  border: 1px solid black;
   background-color: white;
   overflow: hidden;
   z-index: 99999;
@@ -34,7 +32,7 @@
   */
   line-height: 16px;
   overflow: hidden;
-  border-bottom: 1px solid #666;
+  border-bottom: 1px solid black;
   color: #000;
   cursor: pointer;
 }
@@ -56,6 +54,7 @@
 .ac_results li span{
   display: block;
   float: left;
+  margin-left: 8px;
 }
 .ac_loading {
   background: none;
@@ -67,7 +66,7 @@
   background-color: #41A6F0;
   color: #fff!important;
 }
-.ac_over h4 {
-	color: #fff;
+.ac_over h4{
+  color: #fff;
+  text-decoration: underline;
 }
-

data/app/assets/stylesheets/admin/spree_core.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require jquery.alerts/jquery.alerts
+ *= require jquery.alerts/jquery.alerts.spree
+ *= require admin/admin-reset
+ *= require admin/admin-tables
+ *= require admin/admin-form
+ *= require admin/admin-typography.css
+ *= require admin/admin
+ *= require admin/edit_checkouts.css
+ *= require admin/token-input.css
+ *= require jquery-ui.datepicker
+*/

data/app/assets/stylesheets/store/reset.css

@@ -0,0 +1,175 @@
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  font-weight: inherit;
+  font-style: inherit;
+  font-size: 100%;
+  font-family: inherit;
+  vertical-align: baseline;
+}
+*:focus { outline: 0; }
+body {
+  line-height: 1em;
+  color: black;
+  background: #ffffff;
+}
+ol, ul { list-style: none; }
+table {
+  border-collapse: separate;
+  border-spacing: 0;
+  vertical-align: middle;
+}
+caption, th, td {
+  text-align: left;
+  font-weight: normal;
+  vertical-align: middle;
+}
+q, blockquote { quotes: "" ""; }
+q:before { content: ""; }
+q:after { content: ""; }
+blockquote:before { content: ""; }
+blockquote:after { content: ""; }
+img a { border: none; }
+hr {
+  background: #dddddd;
+  color: #dddddd;
+  clear: both;
+  float: none;
+  width: 100%;
+  height: 0.1em;
+  margin: 0 0 1.45em;
+  border: none;
+}
+hr.space {
+  background: #dddddd;
+  color: #dddddd;
+  clear: both;
+  float: none;
+  width: 100%;
+  height: 0.1em;
+  margin: 0 0 1.45em;
+  border: none;
+  background: #ffffff;
+  color: #ffffff;
+}
+body {
+  line-height: 1.5;
+  font-family: Helvetica Neue, Arial, Helvetica, sans-serif;
+  color: #333333;
+  font-size: 90%;
+}
+h1 {
+  font-weight: normal;
+  color: #222222;
+  font-size: 3em;
+  line-height: 1;
+  margin-bottom: 0.5em;
+}
+h1 img { margin: 0; }
+h2 {
+  font-weight: normal;
+  color: #222222;
+  font-size: 2em;
+  margin-bottom: 0.75em;
+}
+h3 {
+  font-weight: normal;
+  color: #222222;
+  font-size: 1.5em;
+  line-height: 1;
+  margin-bottom: 1em;
+}
+h4 {
+  font-weight: normal;
+  color: #222222;
+  font-size: 1.2em;
+  line-height: 1.25;
+  margin-bottom: 1.25em;
+}
+h5 {
+  font-weight: normal;
+  color: #222222;
+  font-size: 1em;
+  font-weight: bold;
+  margin-bottom: 1.5em;
+}
+h6 {
+  font-weight: normal;
+  color: #222222;
+  font-size: 1em;
+  font-weight: bold;
+}
+h2 img { margin: 0; }
+h3 img { margin: 0; }
+h4 img { margin: 0; }
+h5 img { margin: 0; }
+h6 img { margin: 0; }
+p { margin: 0 0 1.5em; }
+p img.left {
+  display: inline;
+  float: left;
+  margin: 1.5em 1.5em 1.5em 0;
+  padding: 0;
+}
+p img.right {
+  display: inline;
+  float: right;
+  margin: 1.5em 0 1.5em 1.5em;
+  padding: 0;
+}
+a {
+  text-decoration: underline;
+  color: #2e6ab1;
+}
+blockquote {
+  margin: 1.5em;
+  color: #666666;
+  font-style: italic;
+}
+strong { font-weight: bold; }
+em { font-style: italic; }
+dfn {
+  font-style: italic;
+  font-weight: bold;
+}
+sup, sub { line-height: 0; }
+abbr, acronym { border-bottom: 1px dotted #666666; }
+address {
+  margin: 0 0 1.5em;
+  font-style: italic;
+}
+del { color: #666666; }
+pre {
+  margin: 1.5em 0;
+  white-space: pre;
+}
+pre, code, tt {
+  font: 1em 'andale mono', 'lucida console', monospace;
+  line-height: 1.5;
+}
+li ul { margin: 0 1.5em; }
+li ol { margin: 0 1.5em; }
+ul {
+  margin: 0 1.5em 1.5em 1.5em;
+  list-style-type: disc;
+}
+ol {
+  margin: 0 1.5em 1.5em 1.5em;
+  list-style-type: decimal;
+}
+dl { margin: 0 0 1.5em 0; }
+dl dt { font-weight: bold; }
+dd { margin-left: 1.5em; }
+table {
+  margin-bottom: 1.4em;
+  width: 100%;
+}
+th { font-weight: bold; }
+thead th { background: #c3d9ff; }
+th, td, caption { padding: 4px 10px 4px 5px; }
+tr.even td { background: #e5ecf9; }
+tfoot { font-style: italic; }
+caption { background: #eeeeee; }
+

data/app/assets/stylesheets/store/screen.css

@@ -0,0 +1,122 @@
+body {
+  padding: 0 1em;
+}
+
+/* Header */
+
+div#header {
+  margin-bottom: 1em;
+}
+
+div#header ul#nav-bar {
+  line-height: 50px;
+  float: right;
+  clear: both;
+  font-size: 1.2em;
+  list-style: none;
+  margin: 0;
+}
+
+div#header ul#nav-bar li {
+  padding: 0 0 0 1em;
+  display: table-cell;
+  vertical-align: middle;
+  height: 82px;
+}
+
+
+/* Sidebar */
+
+div#sidebar {
+  float: left;
+  height: 100%;
+  max-width: 25%;
+}
+
+/* Content */
+
+div#content {
+  float: left;
+}
+
+body.two-col div#content {
+  float: left;
+  max-width: 75%;
+}
+
+div#footer {
+  clear: both;
+}
+
+ul#products {
+  list-style: none;
+  margin: 0 auto;
+}
+
+ul#products li {
+  float: left;
+  text-align: center;
+  width: 200px;
+  height: 150px;
+  padding: 0 10px 20px 10px;
+}
+
+ul#products li img {
+  display: block;
+  margin: auto;
+}
+
+button, a.button, input.button {
+  display: inline-block;
+  width: auto;
+  height: auto;
+  cursor: pointer;
+  margin: 0px;
+  padding: 3px;
+  text-decoration: none;
+  font-size: 1em;
+  color: inherit;
+}
+
+button img, a.button img, input.button img {
+  vertical-align: middle;
+  margin-right: 5px;
+}
+
+div#subtotal { float: right; }
+
+div#product-variants ul li label { cursor: pointer; }
+div#product-images { width: 50%; }
+div#product-images, div#main-image, div#cart-form { float: left; }
+div#product-description { float: none; clear: both; }
+
+ul.thumbnails, #breadcrumbs ul {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+ul.thumbnails li {
+  width: 48px;
+  height: 48px;
+  margin-right: 4px;
+  margin-bottom: 4px;
+  min-height: 48px;
+  padding: 0;
+  float: none;
+  display: inline-block;
+  position: relative;
+  border: 1px solid silver;
+}
+#breadcrumbs ul li { display: inline-block; }
+
+dl.table-display dt { float: left; min-width: 200px; padding: 3px 5px; }
+dl.table-display dd { padding: 3px; }
+dl#product-price dt { float: left; padding: 0 10px 0 0; font-size: 14pt; }
+dl#product-price dd { font-size: 14pt; }
+
+.even { background: #EEE;}
+.odd { background: #DDD;}
+.hidden { display: none; }
+
+div.inner input[type=text], div.inner select { width: 90%; }
+span.req { color: red; padding-left: 0.25em; }

data/app/assets/stylesheets/store/spree_core.css

@@ -0,0 +1,5 @@
+/*
+ * This is a manifest file that includes stylesheets for spree_core
+ *= require store/reset
+ *= require store/screen 
+*/