Will Marshall
|
ddb5150e77
|
Automatically resizing to fit
|
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
|
039108a07d
|
Styling label on taxons on fat view of active table for hubs (add a little padding to right)
|
2014-06-04 17:16:47 +10:00 |
|
summerscope
|
77f847dcbe
|
Adding in new icon fonts to menu system. Adding drop down cog to simplify top menu.
|
2014-06-04 16:06:24 +10:00 |
|
summerscope
|
8caccfc5b0
|
Merge laura_and_will into icon_font
|
2014-05-30 17:01:49 +10:00 |
|
summerscope
|
ef5b36cddd
|
Styling producers
|
2014-05-30 16:39:07 +10:00 |
|
summerscope
|
b19ca3b9c4
|
Remove whitespace
|
2014-05-30 16:38:27 +10:00 |
|
Will Marshall
|
5f163eef1c
|
Tweaking the contact thingy
|
2014-05-30 16:10:45 +10:00 |
|
summerscope
|
91224ed0a4
|
Merge issues. Removing position fixed on modal window styling.
|
2014-05-30 14:27:37 +10:00 |
|
summerscope
|
5f6b8c9b5b
|
Merge branch 'laura_and_will' into icon_font
|
2014-05-30 13:19:54 +10:00 |
|
summerscope
|
5bdb38e293
|
Merge issues. Removing position fixed on modal window styling.
|
2014-05-30 13:19:47 +10:00 |
|
Will Marshall
|
85ee33517a
|
Restoring another deleted file
|
2014-05-30 13:19:23 +10:00 |
|
summerscope
|
2c334a0180
|
Styling for trash icon on checkout page
|
2014-05-30 13:02:34 +10:00 |
|
summerscope
|
5a7df20a2e
|
Update icon font for mixins
|
2014-05-30 12:32:46 +10:00 |
|
summerscope
|
589188d21e
|
Update icons for Tabs on hub shopping page
|
2014-05-30 12:32:28 +10:00 |
|
summerscope
|
5c44413ae9
|
Merge branch 'laura_and_will' into icon_font
|
2014-05-30 12:18:29 +10:00 |
|
summerscope
|
10418b6035
|
Merge issues. Removing position fixed on modal window styling.
|
2014-05-30 12:17:44 +10:00 |
|
summerscope
|
15cde6c372
|
Merge branch 'laura_and_will' into icon_font
Conflicts:
app/views/groups/index.html.haml
app/views/modals/_producers.html.haml
|
2014-05-30 12:12:07 +10:00 |
|
summerscope
|
e064aa3173
|
Restyling labels for new icons in checkout process
|
2014-05-30 11:49:32 +10:00 |
|
summerscope
|
a7a8c3ecee
|
Change icon for bullet point for list style
|
2014-05-30 11:30:52 +10:00 |
|
summerscope
|
0eb4e35ee4
|
New version of icon font
|
2014-05-30 11:30:30 +10:00 |
|
summerscope
|
c0cb9857cc
|
Style and template adjustments to shopfront top of page to get content hierarchy looking right. Removed change location link as new menu system supercedes this.
|
2014-05-29 16:42:05 +10:00 |
|
summerscope
|
c81631118d
|
Add styling to include the search icon in big input searches for Hubs and Producers
|
2014-05-29 12:00:16 +10:00 |
|
Will Marshall
|
74211cbfc7
|
Merge branch 'master' into fixing_modals
Conflicts:
app/assets/javascripts/darkswarm/all.js.coffee
app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
app/assets/javascripts/darkswarm/directives/modal.js.coffee
app/views/modals/_producer.html.haml
app/views/modals/_product.html.haml
app/views/shop/products.rabl
|
2014-05-29 11:14:16 +10:00 |
|
summerscope
|
3f36a3785b
|
Adding in icon for list style from new OFN icon font
|
2014-05-28 17:06:34 +10:00 |
|
summerscope
|
6ea7988f4e
|
New version fonts
|
2014-05-28 17:06:06 +10:00 |
|
summerscope
|
0c2a7ac247
|
Adding style sheet to allow access to custom font
|
2014-05-28 16:32:37 +10:00 |
|
summerscope
|
1a79b966e9
|
Adding in links to homepage buttons for Groups & Producers
|
2014-05-28 12:21:25 +10:00 |
|
summerscope
|
3c3409bc1f
|
Tweaks to styling on groups page
|
2014-05-27 18:03:12 +10:00 |
|
summerscope
|
9fe4bef7df
|
Adding groups icon into background for visual consistency
|
2014-05-27 17:55:51 +10:00 |
|
summerscope
|
2130470eaf
|
Styling for groups page
|
2014-05-27 17:11:42 +10:00 |
|
Rohan Mitchell
|
e951f80070
|
Merge branch 'new-product-form'
Conflicts:
app/assets/javascripts/admin/admin.js.coffee
|
2014-05-24 17:14:32 +10:00 |
|
Rohan Mitchell
|
69e0e71eb6
|
Revert "Styling for shop page product modal"
This reverts commit 84b6f99321.
Conflicts:
app/assets/stylesheets/darkswarm/images.css.sass
app/views/modals/_producer.html.haml
|
2014-05-24 09:12:24 +10:00 |
|
summerscope
|
4657285769
|
Producers modal styling and markup
|
2014-05-22 16:35:48 +10:00 |
|
Rob H
|
47f6d32055
|
Make list items the same height
|
2014-05-22 15:47:50 +10:00 |
|
Rob H
|
ed3c23cd90
|
Split 'My Enterprises' dashboard item into Hubs and Producers
|
2014-05-22 15:28:25 +10:00 |
|
summerscope
|
d7bc1a9b95
|
Styling for shop page product modal
|
2014-05-22 14:40:35 +10:00 |
|
Will Marshall
|
250b76ec79
|
Merge branch 'master' into new_shop
|
2014-05-22 10:43:02 +10:00 |
|
Rohan Mitchell
|
0c647841a6
|
Add dynamic filter to enterprise relationships
|
2014-05-21 16:18:07 +10:00 |
|
Rohan Mitchell
|
aa965e3752
|
Show a CSS3 animation when a row is added
|
2014-05-21 11:29:11 +10:00 |
|
summerscope
|
d874855aa1
|
Update styling on empty cart
|
2014-05-20 16:40:23 +10:00 |
|
summerscope
|
0957edee5d
|
Styling for shopping cart page
|
2014-05-20 15:50:03 +10:00 |
|
summerscope
|
52345d9bb3
|
Improvements to shoptfront page styling
|
2014-05-20 14:11:41 +10:00 |
|
summerscope
|
1dd9f6326b
|
Tweaking the markup and styling for shop page.
|
2014-05-16 15:59:53 +10:00 |
|
Will Marshall
|
eab9c28d2e
|
Adding groups to this branch, also tidying up the shop stuff for Laura
|
2014-05-16 14:00:33 +10:00 |
|
Rob H
|
6979644af7
|
Fiddle with colors and scrolling in admin enterpise sidebar
|
2014-05-16 11:28:02 +10:00 |
|
Will Marshall
|
12ddbb6a32
|
Reworking the shop page
|
2014-05-16 10:23:31 +10:00 |
|
Rob H
|
19aa79fc27
|
Add max height to admin sidebar items
|
2014-05-16 10:06:20 +10:00 |
|
Rob H
|
fd6f4d04df
|
Merge branch 'master' into ent-makeover
|
2014-05-15 17:05:05 +10:00 |
|
Rob H
|
7cdfb4bab2
|
Add methods and fees to sidebar on enterprise edit page
|
2014-05-15 14:52:19 +10:00 |
|