Ingo Schommer ac45e5b9c0 Merge branch 'integration' ...

Conflicts:
	admin/css/ie8.css
	admin/css/screen.css
	admin/scss/_style.scss
	dev/install/config-form.html
	dev/install/install.css
	dev/install/php5-required.html

2012-04-11 16:31:12 +02:00

..

btn-icon

BUGFIX:consolidated the btn_icons folder with the btn_icon folder in ../sapphire/admin/images

2012-04-10 14:17:47 +02:00

menu-icons

ENHANCEMENT Using native jQuery UI buttons and icon styling for a less coupled implementation (e.g. assuming that a "constructive" button always has a specific icon, or one at all). All CMS UI buttons switched to use <button> markup, which allows for inline icons and correctly aligned multi-line button labels.

2012-02-17 15:58:32 +01:00

sprites-32x32

MINOR Added more fugue sprites

2012-02-23 23:29:59 +01:00

textures

MINOR Tree and content toolbar styling fixes (SSF-138, SSF-71)

2012-02-13 09:53:00 +01:00

alert-bad.gif

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:02 +02:00

alert-good.gif

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:02 +02:00

arrow_refresh.gif

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:02 +02:00

arrows.png

MINOR: (SSF-106) Added the images of the previous commit

2012-02-29 13:55:48 +13:00

btn_arrow_down_grey.png

MINOR CSS styles for admin buttons. Color defintions set into _default.scss

2011-07-08 15:36:47 +02:00

btn-icon-s41050dc384.png

BUGFIX:Trac #6854 / #7115 - fixed styling issues with filter panel across CMS - fixed the issue with the width of the date fields - aligned action buttons in filter panel with the designs.

2012-04-11 16:00:56 +12:00

btn-icon-s9416553f5b.png

BUGFIX:consolidated the btn_icons folder with the btn_icon folder in ../sapphire/admin/images

2012-04-10 12:20:13 +12:00

content-header-tabs-sprite.png

MINOR Tree and content toolbar styling fixes (SSF-138, SSF-71)

2012-02-13 09:53:00 +01:00

filter-icons.png

BUGFIX:SSF-53 - fixed filter and reset buttons in ie7 and ie8 plus fixed an array of other ie7/8 styling bugs

2012-03-08 16:40:04 +13:00

logo_small.png

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:02 +02:00

logo.gif

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:02 +02:00

menu-arrow-deselected-up.png

MINOR Deselected menu toggles

2012-01-06 00:06:34 +01:00

question.png

ENHANCEMENT:replaced text "Toggle Formatting Help" with a ? icon on edit profile Popup - Trac #6904

2012-03-27 17:02:17 +02:00

sitetree_ss_default_icons.png

MINOR Cleaner tree icons

2012-02-03 15:27:33 +01:00

sitetree_ss_pageclass_icons_default.png

MINOR CSS styles for tree and misc. form elements

2011-07-08 15:36:47 +02:00

spinner.gif

MINOR: Added new spinner

2012-02-28 18:07:24 +13:00

spinner.psd

MINOR: (SSF-106) Added the images of the previous commit

2012-02-29 13:55:48 +13:00

sprites_32x32-s98eda4974b.png

MINOR More spriting in CMS styles

2012-01-06 11:59:14 +01:00

sprites-32x32-sa4e142f7f0.png

MINOR Merge errors

2012-02-28 18:09:30 +01:00