Merge pull request #395 from silverstripe-big-o/sapphire

---

...tAdmin + regenerated css files.
This commit is contained in:
Ingo Schommer 2012-05-03 11:26:12 +02:00
commit 0d1e4cece5
6 changed files with 49 additions and 38 deletions

View File

@ -35,7 +35,7 @@ If more variables exist in the future, consider creating a variables file.*/
/** ---------------------------------------------------- Double tone borders http://daverupert.com/2011/06/two-tone-borders-with-css3/ ----------------------------------------------------- */
/** ----------------------------- Sprite images ----------------------------- */
/** Helper SCSS file for generating sprites for the interface. */
.btn-icon-sprite, .ui-state-default .btn-icon-accept, .ui-state-default .btn-icon-accept_disabled, .ui-state-default .btn-icon-add, .ui-state-default .btn-icon-add_disabled, .ui-state-default .btn-icon-addpage, .ui-state-default .btn-icon-addpage_disabled, .ui-state-default .btn-icon-arrow-circle-135-left, .ui-state-default .btn-icon-back, .ui-state-default .btn-icon-back_disabled, .ui-state-default .btn-icon-chain--arrow, .ui-state-default .btn-icon-chain--exclamation, .ui-state-default .btn-icon-chain--minus, .ui-state-default .btn-icon-chain--pencil, .ui-state-default .btn-icon-chain--plus, .ui-state-default .btn-icon-chain-small, .ui-state-default .btn-icon-chain-unchain, .ui-state-default .btn-icon-chain, .ui-state-default .btn-icon-cross-circle, .ui-state-default .btn-icon-cross-circle_disabled, .ui-state-default .btn-icon-decline, .ui-state-default .btn-icon-decline_disabled, .ui-state-default .btn-icon-document--pencil, .ui-state-default .btn-icon-download-csv, .ui-state-default .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .ui-state-default .btn-icon-grid_print, .ui-state-default .btn-icon-magnifier, .ui-state-default .btn-icon-minus-circle, .ui-state-default .btn-icon-minus-circle_disabled, .ui-state-default .btn-icon-navigation, .ui-state-default .btn-icon-navigation_disabled, .ui-state-default .btn-icon-network-cloud, .ui-state-default .btn-icon-network-cloud_disabled, .ui-state-default .btn-icon-pencil, .ui-state-default .btn-icon-pencil_disabled, .ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-state-default .btn-icon-preview, .ui-state-default .btn-icon-preview_disabled, .ui-state-default .btn-icon-settings, .ui-state-default .btn-icon-settings_disabled, .ui-state-default .btn-icon-unpublish, .ui-state-default .btn-icon-unpublish_disabled { background: url('../images/btn-icon-s9416553f5b.png') no-repeat; }
.btn-icon-sprite, .ui-state-default .btn-icon-accept, .ui-state-default .btn-icon-accept_disabled, .ui-state-default .btn-icon-add, .ui-state-default .btn-icon-add_disabled, .ui-state-default .btn-icon-addpage, .ui-state-default .btn-icon-addpage_disabled, .ui-state-default .btn-icon-arrow-circle-135-left, .ui-state-default .btn-icon-arrow-circle-double, .ui-state-default .btn-icon-back, .ui-state-default .btn-icon-back_disabled, .ui-state-default .btn-icon-chain--arrow, .ui-state-default .btn-icon-chain--exclamation, .ui-state-default .btn-icon-chain--minus, .ui-state-default .btn-icon-chain--pencil, .ui-state-default .btn-icon-chain--plus, .ui-state-default .btn-icon-chain-small, .ui-state-default .btn-icon-chain-unchain, .ui-state-default .btn-icon-chain, .ui-state-default .btn-icon-cross-circle, .ui-state-default .btn-icon-cross-circle_disabled, .ui-state-default .btn-icon-decline, .ui-state-default .btn-icon-decline_disabled, .ui-state-default .btn-icon-document--pencil, .ui-state-default .btn-icon-download-csv, .ui-state-default .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .ui-state-default .btn-icon-grid_print, .ui-state-default .btn-icon-magnifier, .ui-state-default .btn-icon-minus-circle, .ui-state-default .btn-icon-minus-circle_disabled, .ui-state-default .btn-icon-navigation, .ui-state-default .btn-icon-navigation_disabled, .ui-state-default .btn-icon-network-cloud, .ui-state-default .btn-icon-network-cloud_disabled, .ui-state-default .btn-icon-pencil, .ui-state-default .btn-icon-pencil_disabled, .ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-state-default .btn-icon-preview, .ui-state-default .btn-icon-preview_disabled, .ui-state-default .btn-icon-settings, .ui-state-default .btn-icon-settings_disabled, .ui-state-default .btn-icon-unpublish, .ui-state-default .btn-icon-unpublish_disabled { background: url('../images/btn-icon-s6f28ccb4de.png') no-repeat; }
.ui-state-default .btn-icon-accept { background-position: 0 0; }
.ui-state-default .btn-icon-accept_disabled { background-position: 0 -17px; }
@ -44,42 +44,43 @@ If more variables exist in the future, consider creating a variables file.*/
.ui-state-default .btn-icon-addpage { background-position: 0 -70px; }
.ui-state-default .btn-icon-addpage_disabled { background-position: 0 -86px; }
.ui-state-default .btn-icon-arrow-circle-135-left { background-position: 0 -102px; }
.ui-state-default .btn-icon-back { background-position: 0 -118px; }
.ui-state-default .btn-icon-back_disabled { background-position: 0 -134px; }
.ui-state-default .btn-icon-chain--arrow { background-position: 0 -149px; }
.ui-state-default .btn-icon-chain--exclamation { background-position: 0 -165px; }
.ui-state-default .btn-icon-chain--minus { background-position: 0 -181px; }
.ui-state-default .btn-icon-chain--pencil { background-position: 0 -197px; }
.ui-state-default .btn-icon-chain--plus { background-position: 0 -213px; }
.ui-state-default .btn-icon-chain-small { background-position: 0 -229px; }
.ui-state-default .btn-icon-chain-unchain { background-position: 0 -245px; }
.ui-state-default .btn-icon-chain { background-position: 0 -261px; }
.ui-state-default .btn-icon-cross-circle { background-position: 0 -277px; }
.ui-state-default .btn-icon-cross-circle_disabled { background-position: 0 -293px; }
.ui-state-default .btn-icon-decline { background-position: 0 -309px; }
.ui-state-default .btn-icon-decline_disabled { background-position: 0 -326px; }
.ui-state-default .btn-icon-document--pencil { background-position: 0 -343px; }
.ui-state-default .btn-icon-download-csv { background-position: 0 -359px; }
.ui-state-default .btn-icon-drive-upload { background-position: 0 -377px; }
.ui-state-default .btn-icon-drive-upload_disabled { background-position: 0 -393px; }
.ui-state-default .btn-icon-grid_print { background-position: 0 -409px; }
.ui-state-default .btn-icon-magnifier { background-position: 0 -425px; }
.ui-state-default .btn-icon-minus-circle { background-position: 0 -441px; }
.ui-state-default .btn-icon-minus-circle_disabled { background-position: 0 -457px; }
.ui-state-default .btn-icon-navigation { background-position: 0 -473px; }
.ui-state-default .btn-icon-navigation_disabled { background-position: 0 -489px; }
.ui-state-default .btn-icon-network-cloud { background-position: 0 -505px; }
.ui-state-default .btn-icon-network-cloud_disabled { background-position: 0 -521px; }
.ui-state-default .btn-icon-pencil { background-position: 0 -537px; }
.ui-state-default .btn-icon-pencil_disabled { background-position: 0 -553px; }
.ui-state-default .btn-icon-plug-disconnect-prohibition { background-position: 0 -569px; }
.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -585px; }
.ui-state-default .btn-icon-preview { background-position: 0 -601px; }
.ui-state-default .btn-icon-preview_disabled { background-position: 0 -618px; }
.ui-state-default .btn-icon-settings { background-position: 0 -635px; }
.ui-state-default .btn-icon-settings_disabled { background-position: 0 -651px; }
.ui-state-default .btn-icon-unpublish { background-position: 0 -667px; }
.ui-state-default .btn-icon-unpublish_disabled { background-position: 0 -685px; }
.ui-state-default .btn-icon-arrow-circle-double { background-position: 0 -118px; }
.ui-state-default .btn-icon-back { background-position: 0 -134px; }
.ui-state-default .btn-icon-back_disabled { background-position: 0 -150px; }
.ui-state-default .btn-icon-chain--arrow { background-position: 0 -165px; }
.ui-state-default .btn-icon-chain--exclamation { background-position: 0 -181px; }
.ui-state-default .btn-icon-chain--minus { background-position: 0 -197px; }
.ui-state-default .btn-icon-chain--pencil { background-position: 0 -213px; }
.ui-state-default .btn-icon-chain--plus { background-position: 0 -229px; }
.ui-state-default .btn-icon-chain-small { background-position: 0 -245px; }
.ui-state-default .btn-icon-chain-unchain { background-position: 0 -261px; }
.ui-state-default .btn-icon-chain { background-position: 0 -277px; }
.ui-state-default .btn-icon-cross-circle { background-position: 0 -293px; }
.ui-state-default .btn-icon-cross-circle_disabled { background-position: 0 -309px; }
.ui-state-default .btn-icon-decline { background-position: 0 -325px; }
.ui-state-default .btn-icon-decline_disabled { background-position: 0 -342px; }
.ui-state-default .btn-icon-document--pencil { background-position: 0 -359px; }
.ui-state-default .btn-icon-download-csv { background-position: 0 -375px; }
.ui-state-default .btn-icon-drive-upload { background-position: 0 -393px; }
.ui-state-default .btn-icon-drive-upload_disabled { background-position: 0 -409px; }
.ui-state-default .btn-icon-grid_print { background-position: 0 -425px; }
.ui-state-default .btn-icon-magnifier { background-position: 0 -441px; }
.ui-state-default .btn-icon-minus-circle { background-position: 0 -457px; }
.ui-state-default .btn-icon-minus-circle_disabled { background-position: 0 -473px; }
.ui-state-default .btn-icon-navigation { background-position: 0 -489px; }
.ui-state-default .btn-icon-navigation_disabled { background-position: 0 -505px; }
.ui-state-default .btn-icon-network-cloud { background-position: 0 -521px; }
.ui-state-default .btn-icon-network-cloud_disabled { background-position: 0 -537px; }
.ui-state-default .btn-icon-pencil { background-position: 0 -553px; }
.ui-state-default .btn-icon-pencil_disabled { background-position: 0 -569px; }
.ui-state-default .btn-icon-plug-disconnect-prohibition { background-position: 0 -585px; }
.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -601px; }
.ui-state-default .btn-icon-preview { background-position: 0 -617px; }
.ui-state-default .btn-icon-preview_disabled { background-position: 0 -634px; }
.ui-state-default .btn-icon-settings { background-position: 0 -651px; }
.ui-state-default .btn-icon-settings_disabled { background-position: 0 -667px; }
.ui-state-default .btn-icon-unpublish { background-position: 0 -683px; }
.ui-state-default .btn-icon-unpublish_disabled { background-position: 0 -701px; }
.icon { text-indent: -9999px; border: none; outline: none; }
.icon.icon-24 { width: 24px; height: 24px; background: url('../images/menu-icons/24x24-s546fcae8fd.png'); }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 836 B

View File

@ -3,7 +3,17 @@
<% end_if %>
<div class="cms-content-header north">
<div>
<% with Controller %>
<% if class=CMSFileAddController %>
<span class="section-icon icon icon-24 icon-assetadmin"></span>
<% else %>
<% with ToplevelController %>
<% if class=SecurityAdmin %>
<span class="section-icon icon icon-24 icon-securityadmin"></span>
<% end_if %>
<% end_with %>
<% end_if %>
<% end_with %>
<% include BackLink_Button %>
<h2 id="page-title-heading">