Damian Mooyman
|
230d017677
|
Merge remote-tracking branch 'origin/3'
# Conflicts:
# admin/css/ie7.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/font/icon-reference.html
# admin/font/silverstripe.eot
# admin/font/silverstripe.svg
# admin/font/silverstripe.ttf
# admin/font/silverstripe.woff
# admin/scss/_forms.scss
# admin/scss/_style.scss
|
2016-02-12 15:41:45 +13:00 |
|
Damian Mooyman
|
35b5c03fbc
|
Merge branch 3.3.0 into 3.3
|
2016-02-09 18:22:58 +13:00 |
|
scott1702
|
1a1c7b2f55
|
Update background colors
|
2016-01-22 17:50:01 +13:00 |
|
divzpatel123@gmail.com
|
fbc68f433f
|
Minor: update background colors
|
2016-01-22 16:32:52 +13:00 |
|
divzpatel123@gmail.com
|
4dee924432
|
Minor:updated the menu on the top left; changed styles
|
2016-01-20 15:44:40 +13:00 |
|
Luke Ryley
|
2701248387
|
Minor: Unbolded labels in CMS
- updated _forms.scss removed font-weight
- also removed drop-shadow include
Luke Ryley - open source academy
|
2016-01-19 12:04:55 +13:00 |
|
scott1702
|
9f9d0089df
|
Send user to new area when inserting url
|
2015-10-29 11:37:59 +13:00 |
|
scott1702
|
5f56f204f1
|
Update view mode section w/ font icons
|
2015-09-01 10:54:52 +12:00 |
|
scott1702
|
17ab371ffa
|
Update font icon library
|
2015-08-28 15:15:06 +12:00 |
|
Dan Hensby
|
c5c8a6a720
|
Merge remote-tracking branch '3.2' into 3
Conflicts:
admin/templates/Includes/ModelAdmin_ImportSpec.ss
css/GridField.css
|
2015-08-17 11:59:24 +00:00 |
|
scott1702
|
c51c52f61f
|
Update button and tab styles
|
2015-07-15 10:35:21 +12:00 |
|
David Craig
|
e4447698b5
|
Update compass config
- Add sourcemaps for debugging
- More consistant builds across environments
|
2015-07-09 10:11:00 +12:00 |
|