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
|
d5b4c90cb4
|
Merge remote-tracking branch 'origin/3.3' into 3
# Conflicts:
# admin/css/screen.css
# admin/css/screen.css.map
# admin/scss/_fonts.scss
# admin/scss/_retina.scss
|
2016-02-09 18:25:47 +13:00 |
|
Damian Mooyman
|
35b5c03fbc
|
Merge branch 3.3.0 into 3.3
|
2016-02-09 18:22:58 +13:00 |
|
Loz Calver
|
70f8343475
|
Re-instate back button for item edit forms
|
2016-02-05 09:39:57 +00:00 |
|
scott1702
|
f39989a396
|
Add new font icons to set
Add .no-text class for icons which have no text
|
2016-02-04 10:34:30 +13:00 |
|
scott1702
|
15fba5a4cb
|
Remove old logout icon on retina screens
Remove background rules for old preview icons
|
2016-02-03 16:36:21 +13:00 |
|
Daniel Hensby
|
c5fc9dd650
|
FIX CMS actions alignment
|
2016-01-26 14:38:48 +00: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 |
|
Damian Mooyman
|
e091bb8474
|
Merge remote-tracking branch 'origin/3.3' into 3
# Conflicts:
# admin/scss/_forms.scss
# admin/scss/_style.scss
# tests/model/VersionedTest.yml
|
2016-01-25 15:57:37 +13:00 |
|
scott1702
|
1a1c7b2f55
|
Update background colors
|
2016-01-22 17:50:01 +13:00 |
|
Meeeeeeow
|
d8ee25c39c
|
Minor: Remove Boxshadows
|
2016-01-22 17:18:02 +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
|
38e2cb5b6d
|
Search Icon Hover/Active/Focus changes
Changed the color of the search icon when it is in Hover/Active/Focus state and removed backgroup color changes in these states
|
2016-01-20 14:35:54 +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
|
4a0e157479
|
Remove focus outline when clicking tabs
|
2016-01-08 15:11:17 +13:00 |
|
scott1702
|
b64d73dcbf
|
color updates to meet contrast requirements
|
2016-01-05 11:20:30 +13:00 |
|
scott1702
|
78190f213d
|
Update icon-button-group css
|
2015-12-11 18:20:33 +13:00 |
|
scott1702
|
48c48d703d
|
Disable split view mode when not enough room
|
2015-09-15 10:28:37 +12:00 |
|
scott1702
|
9cbb235daa
|
update cms notifications
New style - text now wraps instead of overflowing
Now stay on screen longer
Hovering causes notification to stay on screen
|
2015-09-02 15:47:48 +12: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 |
|
scott1702
|
6180788f9d
|
Fix alignment of logout area
|
2015-08-28 12:20:00 +12:00 |
|
scott1702
|
7bbe258b44
|
update the filtered tree styling
|
2015-08-25 13:01:17 +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 |
|