Skip to content

Commit

Permalink
Add missed icons in previous commit. Correct icon classes in override…
Browse files Browse the repository at this point in the history
…s. Move print stylesheet to better place.
  • Loading branch information
Alexey Topolyanskiy committed Jan 3, 2013
1 parent 5da64cf commit d77b4a2
Show file tree
Hide file tree
Showing 16 changed files with 121 additions and 89 deletions.
74 changes: 74 additions & 0 deletions app/assets/stylesheets/store/print.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
@media print {
body {
background: white;
font-size: 12pt;
font-family: "Open Sans", "Helvetica Neue", "Helvetica", sans-serif;
}
#main-nav-bar, #nav-bar,
.open-menu, .close-menu,
#mobile-navigation, #footer,
#taxon-crumbs, .add-to-cart,
#product-thumbnails, input, button,
#taxonomies, textarea, .cart-item-quantity-header,
.cart-item-delete, .cart-item-quantity, a.continue,
span.or, select {
display: none !important;
}

#wrapper a:link:after, #wrapper a:visited:after {
content: " (" attr(href) ") ";
font-size: 90%;
}

#logo {
width: 100%;
text-align: center;
}

.product-section-title {
font-size: 14pt;
font-weight: bold;
border-bottom: 1px solid black;
margin-bottom: 5pt;
}

#product-images, [data-hook="product_properties"],
#cart-form {
float: left;
width: 45%;
}

#cart-form, [data-hook="product_properties"] {
clear: both;
}

[data-hook="product_properties"] {
margin-top: -50px;
}

#product-description {
float: right;
width: 50%;
position: absolute;
top: 200px;
right: 0;
}

#cart-form .price.selling {
position: absolute;
top: 160px;
right: 0;
width: 50%;
display: block;
font-size: 18pt;
font-weight: bold;
border-bottom: 1px solid black;
}

[data-hook="inside_cart_form"] #subtotal {
font-size: 18pt;
border-top: 1px solid black;
text-align: right;
width: 100%;
}
}
76 changes: 0 additions & 76 deletions app/assets/stylesheets/store/shared/_print.scss

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<!-- replace 'code:contains("submit_tag t(:place_order)")' -->
<%= button_tag content_tag(:i, '', :class => 'icon-check-1') + ' ' + t(:place_order), :type => 'submit', :class => 'continue button primary' %>
<%= button_tag content_tag(:i, '', :class => 'icon-check') + ' ' + t(:place_order), :type => 'submit', :class => 'continue button primary' %>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<%= t(:update) %>
<% end %>
<%= button_tag :class => 'button checkout primary', :id => 'checkout-link', :name => 'checkout' do %>
<i class="icon-right-3"></i>
<i class="icon-right"></i>
<%= t(:checkout) %>
<% end %>
</div>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- replace '#clear_cart_link' -->
<p id="clear_cart_link" data-hook>
<%= button_tag content_tag(:i, '', :class => 'icon-trash-5') + ' ' + t(:empty_cart), :class => 'button gray', :type => "submit" %>
<%= button_tag content_tag(:i, '', :class => 'icon-trash') + ' ' + t(:empty_cart), :class => 'button gray', :type => "submit" %>
<span class="or"><%= t(:or) %></span>
<%= link_to content_tag(:i, '', :class => 'icon-right-3') + ' ' + t(:continue_shopping), products_path, :class => 'continue button gray' %>
<%= link_to content_tag(:i, '', :class => 'icon-right') + ' ' + t(:continue_shopping), products_path, :class => 'continue button gray' %>
</p>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<!-- replace 'code:contains(" t(:search)")' -->
<%= button_tag content_tag(:i, '', :class => 'icon-search-5') + ' ' + t(:search), :type => "submit" %>
<%= button_tag content_tag(:i, '', :class => 'icon-search') + ' ' + t(:search), :type => "submit" %>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<!-- insert_before 'code:contains("csrf_meta_tags")'-->
<%= stylesheet_link_tag 'store/shared/_print', :media => 'print' %>
<%= stylesheet_link_tag 'store/print', :media => 'print' %>
5 changes: 0 additions & 5 deletions lib/spree_fancy/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ def self.activate
Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
Rails.configuration.cache_classes ? require(c) : load(c)
end

initializer "spree_fancy.assets.precompile", :group => :all do |app|
app.config.assets.precompile << "store/shared/_print.css"
end

end

config.to_prepare &method(:activate).to_proc
Expand Down
Binary file modified vendor/assets/fonts/icons.eot
Binary file not shown.
19 changes: 17 additions & 2 deletions vendor/assets/fonts/icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified vendor/assets/fonts/icons.ttf
Binary file not shown.
Binary file modified vendor/assets/fonts/icons.woff
Binary file not shown.
6 changes: 6 additions & 0 deletions vendor/assets/stylesheets/icons-codes.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,15 @@
.icon-layout:before { content: '\268f'; } /* '⚏' */
.icon-check:before { content: '\2713'; } /* '✓' */
.icon-cancel:before { content: '\2715'; } /* '✕' */
.icon-right:before { content: '\27a1'; } /* '➡' */
.icon-cw:before { content: '\27f3'; } /* '⟳' */
.icon-right-bold:before { content: '\e4ae'; } /* '' */
.icon-trash:before { content: '\e729'; } /* '' */
.icon-basket:before { content: '\e73d'; } /* '' */
.icon-login:before { content: '\e740'; } /* '' */
.icon-logout:before { content: '\e741'; } /* '' */
.icon-right-circled:before { content: '\e75a'; } /* '' */
.icon-paper-plane:before { content: '\e79b'; } /* '' */
.icon-user:before { content: '👤'; } /* '\1f464' */
.icon-arrows-ccw:before { content: '🔄'; } /* '\1f504' */
.icon-search:before { content: '🔍'; } /* '\1f50d' */
6 changes: 6 additions & 0 deletions vendor/assets/stylesheets/icons-ie7-codes.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,15 @@
.icon-layout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x268f;&nbsp;'); }
.icon-check { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x2713;&nbsp;'); }
.icon-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x2715;&nbsp;'); }
.icon-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x27a1;&nbsp;'); }
.icon-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x27f3;&nbsp;'); }
.icon-right-bold { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe4ae;&nbsp;'); }
.icon-trash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe729;&nbsp;'); }
.icon-basket { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe73d;&nbsp;'); }
.icon-login { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe740;&nbsp;'); }
.icon-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe741;&nbsp;'); }
.icon-right-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe75a;&nbsp;'); }
.icon-paper-plane { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe79b;&nbsp;'); }
.icon-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f464;&nbsp;'); }
.icon-arrows-ccw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f504;&nbsp;'); }
.icon-search { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f50d;&nbsp;'); }
6 changes: 6 additions & 0 deletions vendor/assets/stylesheets/icons-ie7.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,15 @@
.icon-layout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x268f;&nbsp;'); }
.icon-check { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x2713;&nbsp;'); }
.icon-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x2715;&nbsp;'); }
.icon-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x27a1;&nbsp;'); }
.icon-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x27f3;&nbsp;'); }
.icon-right-bold { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe4ae;&nbsp;'); }
.icon-trash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe729;&nbsp;'); }
.icon-basket { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe73d;&nbsp;'); }
.icon-login { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe740;&nbsp;'); }
.icon-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe741;&nbsp;'); }
.icon-right-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe75a;&nbsp;'); }
.icon-paper-plane { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe79b;&nbsp;'); }
.icon-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f464;&nbsp;'); }
.icon-arrows-ccw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f504;&nbsp;'); }
.icon-search { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x1f50d;&nbsp;'); }
6 changes: 6 additions & 0 deletions vendor/assets/stylesheets/icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,15 @@
.icon-layout:before { content: '\268f'; } /* '⚏' */
.icon-check:before { content: '\2713'; } /* '✓' */
.icon-cancel:before { content: '\2715'; } /* '✕' */
.icon-right:before { content: '\27a1'; } /* '➡' */
.icon-cw:before { content: '\27f3'; } /* '⟳' */
.icon-right-bold:before { content: '\e4ae'; } /* '' */
.icon-trash:before { content: '\e729'; } /* '' */
.icon-basket:before { content: '\e73d'; } /* '' */
.icon-login:before { content: '\e740'; } /* '' */
.icon-logout:before { content: '\e741'; } /* '' */
.icon-right-circled:before { content: '\e75a'; } /* '' */
.icon-paper-plane:before { content: '\e79b'; } /* '' */
.icon-user:before { content: '👤'; } /* '\1f464' */
.icon-arrows-ccw:before { content: '🔄'; } /* '\1f504' */
.icon-search:before { content: '🔍'; } /* '\1f50d' */

0 comments on commit d77b4a2

Please sign in to comment.