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
|
69c9ad1428
|
Merge remote-tracking branch 'origin/3'
# Conflicts:
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/scss/_style.scss
# css/AssetUploadField.css
# css/GridField.css.map
# docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md
# lang/fi.yml
|
2016-01-25 16:15:41 +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
|
5f56f204f1
|
Update view mode section w/ font icons
|
2015-09-01 10:54:52 +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 |
|