tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 20:59:23 +02:00
Code Issues Projects Releases Wiki Activity

MINOR jQuery UI icons for GridField buttons (with spriting), added new icon to GridFieldRelationDelete to dustinguish it visually from GridFieldAction_Delete

Browse Source
This commit is contained in:
Ingo Schommer 2012-03-06 17:24:46 +01:00
parent 1c344db339
commit 8efaf75375
14 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
admin/css/screen.css
View File

@ -31,7 +31,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
/** ---------------------------------------------------- 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-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-download-csv, .ui-state-default .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .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-se62d8b345b.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-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-download-csv, .ui-state-default .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .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-sb5d07676ff.png') no-repeat; }
.ui-state-default .btn-icon-accept { background-position: 0 0; }
.ui-state-default .btn-icon-accept_disabled { background-position: 0 -17px; }
@ -42,30 +42,38 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
.ui-state-default .btn-icon-arrow-circle-135-left { background-position: 0 -104px; }
.ui-state-default .btn-icon-back { background-position: 0 -120px; }
.ui-state-default .btn-icon-back_disabled { background-position: 0 -135px; }
.ui-state-default .btn-icon-cross-circle { background-position: 0 -150px; }
.ui-state-default .btn-icon-cross-circle_disabled { background-position: 0 -166px; }
.ui-state-default .btn-icon-decline { background-position: 0 -182px; }
.ui-state-default .btn-icon-decline_disabled { background-position: 0 -199px; }
.ui-state-default .btn-icon-download-csv { background-position: 0 -216px; }
.ui-state-default .btn-icon-drive-upload { background-position: 0 -234px; }
.ui-state-default .btn-icon-drive-upload_disabled { background-position: 0 -250px; }
.ui-state-default .btn-icon-magnifier { background-position: 0 -266px; }
.ui-state-default .btn-icon-minus-circle { background-position: 0 -282px; }
.ui-state-default .btn-icon-minus-circle_disabled { background-position: 0 -298px; }
.ui-state-default .btn-icon-navigation { background-position: 0 -314px; }
.ui-state-default .btn-icon-navigation_disabled { background-position: 0 -330px; }
.ui-state-default .btn-icon-network-cloud { background-position: 0 -346px; }
.ui-state-default .btn-icon-network-cloud_disabled { background-position: 0 -362px; }
.ui-state-default .btn-icon-pencil { background-position: 0 -378px; }
.ui-state-default .btn-icon-pencil_disabled { background-position: 0 -394px; }
.ui-state-default .btn-icon-plug-disconnect-prohibition { background-position: 0 -410px; }
.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -426px; }
.ui-state-default .btn-icon-preview { background-position: 0 -442px; }
.ui-state-default .btn-icon-preview_disabled { background-position: 0 -459px; }
.ui-state-default .btn-icon-settings { background-position: 0 -476px; }
.ui-state-default .btn-icon-settings_disabled { background-position: 0 -492px; }
.ui-state-default .btn-icon-unpublish { background-position: 0 -508px; }
.ui-state-default .btn-icon-unpublish_disabled { background-position: 0 -526px; }
.ui-state-default .btn-icon-chain--arrow { background-position: 0 -150px; }
.ui-state-default .btn-icon-chain--exclamation { background-position: 0 -166px; }
.ui-state-default .btn-icon-chain--minus { background-position: 0 -182px; }
.ui-state-default .btn-icon-chain--pencil { background-position: 0 -198px; }
.ui-state-default .btn-icon-chain--plus { background-position: 0 -214px; }
.ui-state-default .btn-icon-chain-small { background-position: 0 -230px; }
.ui-state-default .btn-icon-chain-unchain { background-position: 0 -246px; }
.ui-state-default .btn-icon-chain { background-position: 0 -262px; }
.ui-state-default .btn-icon-cross-circle { background-position: 0 -278px; }
.ui-state-default .btn-icon-cross-circle_disabled { background-position: 0 -294px; }
.ui-state-default .btn-icon-decline { background-position: 0 -310px; }
.ui-state-default .btn-icon-decline_disabled { background-position: 0 -327px; }
.ui-state-default .btn-icon-download-csv { background-position: 0 -344px; }
.ui-state-default .btn-icon-drive-upload { background-position: 0 -362px; }
.ui-state-default .btn-icon-drive-upload_disabled { background-position: 0 -378px; }
.ui-state-default .btn-icon-magnifier { background-position: 0 -394px; }
.ui-state-default .btn-icon-minus-circle { background-position: 0 -410px; }
.ui-state-default .btn-icon-minus-circle_disabled { background-position: 0 -426px; }
.ui-state-default .btn-icon-navigation { background-position: 0 -442px; }
.ui-state-default .btn-icon-navigation_disabled { background-position: 0 -458px; }
.ui-state-default .btn-icon-network-cloud { background-position: 0 -474px; }
.ui-state-default .btn-icon-network-cloud_disabled { background-position: 0 -490px; }
.ui-state-default .btn-icon-pencil { background-position: 0 -506px; }
.ui-state-default .btn-icon-pencil_disabled { background-position: 0 -522px; }
.ui-state-default .btn-icon-plug-disconnect-prohibition { background-position: 0 -538px; }
.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -554px; }
.ui-state-default .btn-icon-preview { background-position: 0 -570px; }
.ui-state-default .btn-icon-preview_disabled { background-position: 0 -587px; }
.ui-state-default .btn-icon-settings { background-position: 0 -604px; }
.ui-state-default .btn-icon-settings_disabled { background-position: 0 -620px; }
.ui-state-default .btn-icon-unpublish { background-position: 0 -636px; }
.ui-state-default .btn-icon-unpublish_disabled { background-position: 0 -654px; }
.icon { text-indent: -9999px; border: none; outline: none; }
.icon.icon-24 { width: 24px; height: 24px; background: url('../images/menu-icons/24x24-s546fcae8fd.png'); }

BIN
admin/images/btn-icon-sb5d07676ff.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
admin/images/btn-icon-se62d8b345b.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
admin/images/btn-icon/chain--arrow.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 584 B

BIN
admin/images/btn-icon/chain--exclamation.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 707 B

BIN
admin/images/btn-icon/chain--minus.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 483 B

BIN
admin/images/btn-icon/chain--pencil.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 620 B

BIN
admin/images/btn-icon/chain--plus.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 586 B

BIN
admin/images/btn-icon/chain-small.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 354 B

BIN
admin/images/btn-icon/chain-unchain.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 722 B

BIN
admin/images/btn-icon/chain.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 430 B

3
css/GridField.css
View File

@ -5,10 +5,7 @@
.cms table.ss-gridfield-table { display: table; box-shadow: none; padding: 0; border-collapse: separate; border-bottom: 0 none; width: 100%; }
.cms table.ss-gridfield-table thead { color: #1d2224; background: transparent; }
.cms table.ss-gridfield-table tbody { background: #FFF; }
.cms table.ss-gridfield-table tbody td { /* Emulate a link by default */ }
.cms table.ss-gridfield-table tbody td button { border: none; background: none; margin: 0 0 0 2px; padding: 0; width: auto; text-shadow: none; }
.cms table.ss-gridfield-table tbody td button.ui-state-hover { background: none; border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
.cms table.ss-gridfield-table tbody td button span.ui-button-text { text-indent: -9999em; background: url(../images/icons/decline.png) no-repeat 0 2px; padding: 0; width: 20px; height: 20px; }
.cms table.ss-gridfield-table tbody td a.edit-link { display: inline-block; width: 20px; height: 20px; text-indent: -9999em; background: url(../images/icons/document--pencil.png) no-repeat 0 1px; }
.cms table.ss-gridfield-table tfoot { color: #1d2224; }
.cms table.ss-gridfield-table tfoot tr td { background: #95a5ab; padding: .7em; border-bottom: 1px solid rgba(0, 0, 0, 0.1); }

3
forms/gridfield/GridFieldRelationDelete.php
View File

@ -80,7 +80,8 @@ class GridFieldRelationDelete implements GridField_ColumnProvider, GridField_Act
"unlinkrelation",
array('RecordID' => $record->ID)
)
->setAttribute('title', _t('GridAction.UnlinkRelation', "Unlink"));
->setAttribute('title', _t('GridAction.UnlinkRelation', "Unlink"))
->setAttribute('data-icon', 'chain--minus');
return $field->Field();
}

13
scss/GridField.scss
View File

@ -70,7 +70,6 @@ $gf_grid_x: 16px;
tbody {
background: #FFF;
td {
/* Emulate a link by default */
button {
border: none;
background: none;
@ -78,18 +77,6 @@ $gf_grid_x: 16px;
padding: 0;
width: auto;
text-shadow: none;
&.ui-state-hover {
background:none;
border:none;
@include box-shadow-none;
}
span.ui-button-text {
text-indent:-9999em;
background: url(../images/icons/decline.png) no-repeat 0 2px;
padding:0;
width:$gf_grid_x + 4;
height:$gf_grid_y*2 - 4;
}
}
a.edit-link {
display:inline-block;