raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-25 01:23:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 17 Branches 454 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

4617 Commits

Author SHA1 Message Date
summerscope
cad8f8a7a8 New stylesheet to style taxon SVG icons 2014-06-13 14:20:10 +10:00
Will Marshall
f7c71568df Merge branch 'laura_and_will' 
Conflicts:
	app/models/spree/variant_decorator.rb
	db/schema.rb
	spec/models/spree/product_spec.rb
	spec/models/spree/variant_spec.rb
 2014-06-13 12:42:14 +10:00
Will Marshall
415a4eff0a Not pre-loading images and setting the map back to gifses 2014-06-13 11:05:32 +10:00
Will Marshall
bc93ce57e6 Smooth scrolling, svg support via directive 2014-06-13 11:00:28 +10:00
summerscope
4fd1a3d77c Remove SVG from styling - cannot reach it through iframe #document markup 2014-06-12 16:52:04 +10:00
summerscope
e090352c43 Styling for shopfront page to resize icons as SVGs 2014-06-12 16:51:32 +10:00
summerscope
e2f983b448 Icon update for update to icon font 2014-06-12 16:40:06 +10:00
summerscope
2ff4883725 Update icon font to add Bulk icon and pop out icon 2014-06-12 16:22:54 +10:00
Will Marshall
365c14d4fe Adding smooth scroll to hubses 2014-06-12 16:16:46 +10:00
Will Marshall
f6690cb8dd Patching a minor bug in cart emptying 2014-06-12 16:13:52 +10:00
Will Marshall
a55e58d50c Adding working scrolling to anchors 2014-06-12 16:13:51 +10:00
Will Marshall
7a062b0310 Reworking the variant display of units and names 2014-06-12 16:13:51 +10:00
summerscope
1a4e3c20ad Styling for new svg icons for taxons 2014-06-12 15:47:38 +10:00
Rohan Mitchell
88c41df201 BPE uses soft-delete for products 2014-06-12 14:59:27 +10:00
summerscope
8acbfba873 Change z index of icon so it sits behind fixed menu at top 2014-06-12 13:03:39 +10:00
Rob H
be6a043aac Move dynamic placeholder logic to directive so that it can be used for master variants too 2014-06-12 12:58:40 +10:00
Rob H
0b1b260527 Adding dynamic text to display as placeholder 2014-06-12 12:58:39 +10:00
summerscope
176735544b Changing class name to remove ofn- from naming convention which call the icon font styling 2014-06-12 12:12:25 +10:00
Will Marshall
349ba112d0 Fixing map issues, adding a nice pretty loader 2014-06-12 11:50:28 +10:00
Will Marshall
48e2c3512f Patching a minor bug in cart emptying 2014-06-12 11:49:55 +10:00
Rob H
d9a5b02415 Move dynamic placeholder logic to directive so that it can be used for master variants too 2014-06-12 11:49:54 +10:00
Rob H
5f8ed01475 Adding dynamic text to display as placeholder 2014-06-12 11:49:54 +10:00
Rob H
f688461e84 Add fields for variant display name and display as to bpe 2014-06-12 11:49:53 +10:00
summerscope
860360d81e Change map container name to remove ofn- which refers to icon font styling 2014-06-12 11:34:01 +10:00
Rob H
8e960c817a Merge branch 'master' into units 2014-06-11 12:43:40 +10:00
Rob H
44f4ee822c Move dynamic placeholder logic to directive so that it can be used for master variants too 2014-06-11 12:41:51 +10:00
Will Marshall
74b3c026d2 Merging in maps 2014-06-10 14:54:12 +10:00
Will Marshall
75f1bf4f54 Merging in master 2014-06-10 14:53:49 +10:00
Will Marshall
373f698676 Adding loading infrastructure 2014-06-10 14:52:27 +10:00
Will Marshall
21b6e91913 Moving OFN flash to fixed block 2014-06-10 12:29:31 +10:00
Will Marshall
dbf4f503a9 Restoring my clever flash refactoring 2014-06-10 11:14:52 +10:00
Will Marshall
c07809d328 Rescoping the accordion as well 2014-06-10 11:14:52 +10:00
Rohan Mitchell
be644bdcc3 Revert "Reworking flash messages hooray" 
This reverts commit c9d0091cd9.
 2014-06-06 16:59:47 +10:00
Will Marshall
c9d0091cd9 Reworking flash messages hooray 2014-06-06 16:41:28 +10:00
Rob H
6e04eeba07 Adding dynamic text to display as placeholder 2014-06-06 15:43:05 +10:00
Will Marshall
0c313c0dcb Defaulting cart count to zero if undefined 2014-06-06 14:47:12 +10:00
Will Marshall
2545b06b2d Adding first and last name read-only fields to credit card 2014-06-06 14:28:33 +10:00
Will Marshall
92eca72f4f Fixing a couple of paths and clearing localStorage when changing distributor 2014-06-06 14:04:48 +10:00
Will Marshall
54cdc545a4 adding distributor id to localStorage 2014-06-06 14:04:47 +10:00
Will Marshall
afabda788e Adding the close 2014-06-06 14:04:47 +10:00
Will Marshall
ebe40d3b3d New icon 2014-06-06 14:04:46 +10:00
Will Marshall
f881197a74 New icons and some more enterprise data 2014-06-06 14:04:46 +10:00
Will Marshall
ddb5150e77 Automatically resizing to fit 2014-06-06 14:04:46 +10:00
Will Marshall
6f2e841100 Adding modals for the map 2014-06-06 14:04:46 +10:00
Will Marshall
c9c1b4709b Basic but hacky way to get events out of map 2014-06-06 14:04:46 +10:00
Will Marshall
82ab14a33e Starting on on the map 2014-06-06 14:04:45 +10:00
summerscope
0c501b58a5 Adjust layout for 12 column grid for Hub details and order cycle info plus adjust CSS to allow for different break points 2014-06-06 11:19:15 +10:00
Rob H
43c5c37326 Add fields for variant display name and display as to bpe 2014-06-06 10:10:41 +10:00
Will Marshall
c75da1ce0d New icon 2014-06-05 17:14:11 +10:00
Will Marshall
8b1c2b1e9e New icons and some more enterprise data 2014-06-05 17:12:38 +10:00