raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 17 Branches 455 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

3145 Commits

Author SHA1 Message Date
Will Marshall
58e810a736 Using enterprise in modals 2014-06-19 12:38:30 +10:00
Will Marshall
8fcc2b0c62 Merge branch 'refactoring_services' into laura_and_will 2014-06-19 12:10:28 +10:00
Will Marshall
8905b45333 Fixing a minor regression 2014-06-19 12:10:05 +10:00
Will Marshall
b9561ecf20 Minor refactoring from code review with Rohan 2014-06-19 11:41:24 +10:00
summerscope
47775b13fc Tweak IE old warning css to remove css anims (not supported old browsers anyway) 2014-06-19 11:32:30 +10:00
summerscope
710abf96eb Changing Producer modal markup to reflect new design. WIP commit, 2014-06-18 18:53:31 +10:00
summerscope
a62ab98f53 Update images styling to make more generic / modular and remove styling specific to producers to make more scalable. 2014-06-18 18:53:02 +10:00
summerscope
f89418c0d6 Update follow markup to reflect new design WIP commit 2014-06-18 18:52:29 +10:00
summerscope
54983845c4 Update contact markup to reflect new design 2014-06-18 18:52:07 +10:00
summerscope
fcd0096843 Changing markup to Hub modal (map) to reflect new design 2014-06-18 18:50:59 +10:00
summerscope
e924d8d5dc Adding stylesheet to manage modals for Hubs and Producers 2014-06-18 18:50:40 +10:00
Will Marshall
c02c7cf7ca Further patches to the damned RABL system, patching everything up to use our new Service structure 2014-06-18 17:54:13 +10:00
summerscope
83e7225ef8 Add browser logos for IE message 2014-06-18 17:11:57 +10:00
summerscope
2acf3bf382 Styling for old IE upgrade / warning message 2014-06-18 17:10:47 +10:00
Will Marshall
224a70c11f Refactoring JSON injection a bit further 2014-06-18 16:43:57 +10:00
Will Marshall
45404f1475 Adding dereferencing on construct to Enterprises service - this is MAGIC 2014-06-18 15:48:24 +10:00
Will Marshall
deb6c8a05a Refactoring the RABL injection and the Hubs/Producers/Enterprises services 2014-06-18 15:40:02 +10:00
Will Marshall
e7c301da83 Reworking the RABL templates for simplicity AND fixing up all the tests 2014-06-18 13:05:44 +10:00
summerscope
e200b192d4 Tweak styling and add animation-in function for Loading text message 2014-06-18 12:37:11 +10:00
Will Marshall
f54834da01 Changing our composition of producers and hubs 2014-06-17 16:33:43 +10:00
Will Marshall
37fee5c316 Reworking the empties cart and active table link stuff 2014-06-17 16:33:31 +10:00
Will Marshall
9bbfc0a393 Starting a set of small functional changes 2014-06-17 12:35:03 +10:00
Will Marshall
e697a544e5 Merge branch 'master' into laura_and_will 2014-06-17 11:45:04 +10:00
summerscope
923a615dfa Site tagline constrain width on large screens to improve text flow 2014-06-14 21:00:32 +10:00
Will Marshall
17682dbc58 fixing issue 750 2014-06-13 14:31:55 +10:00
summerscope
b069311475 New animation mixin 2014-06-13 14:20:58 +10:00
summerscope
f1497c9c5a Remove SVG styling from this scss - now in taxons.css.sass 2014-06-13 14:20:47 +10:00
summerscope
3f72c8601b Remove SVG styling from this scss - now in taxons.css.sass 2014-06-13 14:20:31 +10:00
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