Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add missed icons in previous commit. Correct icon classes in override…

…s. Move print stylesheet to better place.
  • Loading branch information...
commit d77b4a2c9778421adcbc27a973fb3a77cb55ac09 1 parent 5da64cf
@devilcoders devilcoders authored
View
74 app/assets/stylesheets/store/print.css
@@ -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%;
+ }
+}
View
76 app/assets/stylesheets/store/shared/_print.scss
@@ -1,76 +0,0 @@
-@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%;
- }
-
- }
-}
View
2  app/overrides/spree/checkout/_confirm/add_icon_to_confirm_submit_button.html.erb.deface
@@ -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' %>
View
2  app/overrides/spree/orders/edit/add_icons_to_cart_buttons.html.erb.deface
@@ -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>
View
4 app/overrides/spree/orders/edit/add_icons_to_clear_cart_link.html.erb.deface
@@ -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>
View
2  app/overrides/spree/shared/_filters/add_icon_to_search_button.html.erb.deface
@@ -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" %>
View
2  app/overrides/spree/shared/_head/add_print_stylesheet.html.erb.deface
@@ -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' %>
View
5 lib/spree_fancy/engine.rb
@@ -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
View
BIN  vendor/assets/fonts/icons.eot
Binary file not shown
View
19 vendor/assets/fonts/icons.svg
@@ -2,7 +2,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>
-Created by FontForge 20100429 at Thu Jan 3 08:14:40 2013
+Created by FontForge 20100429 at Thu Jan 3 09:10:54 2013
By root
Copyright (C) 2012 by original authors @ fontello.com
</metadata>
@@ -16,7 +16,7 @@ Copyright (C) 2012 by original authors @ fontello.com
panose-1="2 0 6 3 0 0 0 0 0 0"
ascent="850"
descent="-150"
- bbox="14.9792 -110 955 810"
+ bbox="14.9661 -128 955 832"
underline-thickness="50"
underline-position="-100"
unicode-range="U+002B-1F50D"
@@ -41,6 +41,15 @@ q0 -80 -80 -80h-90q-80 0 -80 80v90q0 80 80 80h90z" />
d="M264 0q-34 0 -56 28l-180 236q-25 39 -2 78.5t67 33.5q29 -5 47 -28l118 -154l296 474q15 23 41 30t55 -8q23 -15 30 -41t-8 -55l-350 -560q-20 -32 -56 -32z" />
<glyph glyph-name="uni2715" unicode="&#x2715;" horiz-adv-x="500"
d="M467 194q18 -18 18 -43t-17.5 -42t-43.5 -17t-43 16l-132 152l-132 -152q-17 -16 -43 -16t-43 16q-16 17 -16 43t16 43l138 156l-138 158q-16 17 -16 43t16 43q17 16 43 16t43 -16l132 -152l132 152q17 16 43 16t43.5 -17t17.5 -42t-18 -43l-138 -158z" />
+ <glyph glyph-name="uni27A1" unicode="&#x27a1;" horiz-adv-x="760"
+d="M365 680l380 -330l-380 -330v192h-350v278h350v190z" />
+ <glyph glyph-name="uni27F3" unicode="&#x27f3;" horiz-adv-x="970"
+d="M423 760q168 0 287 -116q118 -116 123 -282h122l-184 -206l-184 206h144q-5 125 -94 210q-91 86 -214 86q-126 0 -216 -90t-90 -218q0 -126 90 -216t216 -90q104 0 182 60l70 -76q-109 -88 -252 -88q-168 0 -288 120t-120 290t120 290t288 120z" />
+ <glyph glyph-name="uniE4AE" unicode="&#xe4ae;" horiz-adv-x="760"
+d="M365 730l380 -380l-380 -380v192h-350v378h350v190z" />
+ <glyph glyph-name="uniE729" unicode="&#xe729;" horiz-adv-x="790"
+d="M65 458q121 -70 330 -70t330 70l-54 -486q-1 -13 -35 -36q-32 -22 -100 -43t-141 -21q-64 0 -132.5 19t-107.5 45q-35 22 -36 36zM553 758q94 -18 158 -55t64 -71v-10q0 -59 -112 -99q-114 -41 -268 -41t-268 41q-112 40 -112 99v10q0 34 64 71t158 55l42 48q23 26 70 26
+h92q52 0 70 -26zM499 646h84q-95 114 -104 126q-13 16 -32 16h-102q-22 0 -32 -16l-106 -126h84l64 66h82z" />
<glyph glyph-name="uniE73D" unicode="&#xe73d;"
d="M165 0q0 40 30 70t70 30q41 0 70.5 -29.5t29.5 -70.5q0 -42 -29 -71t-71 -29q-41 0 -70.5 29.5t-29.5 70.5zM665 0q0 40 30 70t70 30q41 0 70.5 -29.5t29.5 -70.5q0 -42 -29 -71t-71 -29q-41 0 -70.5 29.5t-29.5 70.5zM343 236q-18 -5 -26.5 -10.5t-7.5 -12.5
q1 -13 44 -13h562v-76q0 -20 -20 -20h-654q-20 0 -20 20v76l-54 250l-54 250h-98v80q0 20 20 20h156q20 0 20 -20v-86h704v-274q0 -22 -18 -26z" />
@@ -51,9 +60,15 @@ d="M515 800q42 0 71 -29t29 -71v-150h-98v150h-402v-700h402v100h98v-100q0 -41 -29.
<glyph glyph-name="uniE75A" unicode="&#xe75a;" horiz-adv-x="950"
d="M150 675q135 135 325 135t325 -135t135 -325t-135 -325t-325 -135t-325 135t-135 325t135 325zM730 605q-105 105 -255 105q-147 0 -254 -105q-106 -105 -106 -255q0 -148 106 -254t254 -106q150 0 255 106t105 254q0 150 -105 255zM283 440h204v114l190 -204l-190 -202
v112h-204v180z" />
+ <glyph glyph-name="uniE79B" unicode="&#xe79b;" horiz-adv-x="951"
+d="M909 720q13 4 21.5 -3t4.5 -19q-3 -8 -73 -313.5t-73 -312.5q-2 -13 -13 -18.5t-25 0.5l-139 75l-139 75l22 26l209 227l145 156q38 41 40 43q4 4 -1 9t-9 1l-550 -402l-302 120q-12 4 -12 12t12 12q7 4 227 82l437 154q217 76 218 76zM327 -8v204l160 -82
+q-122 -108 -142 -128q-18 -14 -18 6z" />
<glyph glyph-name="u1F464" unicode="&#x1f464;" horiz-adv-x="970"
d="M751 128q204 -72 204 -122v-106h-940v106q0 50 204 122q93 34 128 69q34 34 34 95q0 23 -22 49q-21 26 -32 73q-3 21 -23 26q-18 5 -23 60q0 32 14 38l4 4q-7 46 -12 88q-4 53 41 112q45 58 157 58t158 -58t40 -112l-12 -88q18 -8 18 -42q-5 -55 -23 -60q-20 -5 -23 -26
q-7 -47 -31 -74q-23 -26 -23 -48q0 -60 35 -95q34 -34 127 -69z" />
+ <glyph glyph-name="u1F504" unicode="&#x1f504;" horiz-adv-x="850"
+d="M317 256v-292l-276 16l88 86q-116 122 -114 290q1 168 120 288q99 99 240 116l4 -102q-101 -16 -172 -88q-89 -88 -90 -213q-2 -125 84 -217zM533 738l276 -16l-88 -86q116 -122 114 -290q-1 -168 -120 -288q-97 -99 -240 -118l-2 104q99 17 170 88q89 88 90 213
+q2 125 -84 217l-114 -116z" />
<glyph glyph-name="u1F50D" unicode="&#x1f50d;" horiz-adv-x="819"
d="M787 78q30 -34 6 -62l-46 -46q-36 -32 -68 0l-190 190q-73 -42 -156 -42q-128 0 -223 95t-95 223t90 219t218 91q127 0 224 -95q96 -95 96 -223q0 -89 -46 -162zM109 436q0 -88 68 -156t156 -68t151 63t63 153q0 87 -68 155q-67 67 -156 67q-88 0 -151 -63t-63 -151z" />
</font>
View
BIN  vendor/assets/fonts/icons.ttf
Binary file not shown
View
BIN  vendor/assets/fonts/icons.woff
Binary file not shown
View
6 vendor/assets/stylesheets/icons-codes.css
@@ -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' */
View
6 vendor/assets/stylesheets/icons-ie7-codes.css
@@ -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;'); }
View
6 vendor/assets/stylesheets/icons-ie7.css
@@ -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;'); }
View
6 vendor/assets/stylesheets/icons.scss
@@ -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' */
Please sign in to comment.
Something went wrong with that request. Please try again.