tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6003 from open-sausages/pulls/4.0/readonly-field-icon

Browse Source 
Adjustment for icons within readonly fields
This commit is contained in:
Ingo Schommer 2016-09-14 16:06:20 +12:00 committed by GitHub
commit c2292a4cc1
5 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Image.php
View File

@ -75,7 +75,7 @@ class Image extends File implements ShortcodeHandler {
'ClickableURL', 'ClickableURL',
_t('AssetTableField.URL','URL'), _t('AssetTableField.URL','URL'),
sprintf('<i class="%s"></i><a href="%s" target="_blank">%s</a>', sprintf('<i class="%s"></i><a href="%s" target="_blank">%s</a>',
'icon font-icon-link editor__url-icon', $link, $link) 'font-icon-link btn--icon-large form-control-static__icon', $link, $link)
) )
), ),
Tab::create('Usage', Tab::create('Usage',

10
admin/client/dist/styles/bundle.css vendored
View File

File diff suppressed because one or more lines are too long

7
admin/client/src/components/Form/Form.scss
View File

@ -92,6 +92,13 @@
} }
} }
// Icons used in readonly fields (eg URL field in assetAdmin)
.form-control-static__icon::before {
color: lighten($text-muted, 20%);
vertical-align: middle;
margin-right: 6px;
}
// Readonlys should be converted to an input // Readonlys should be converted to an input
// scss-lint:disable all // scss-lint:disable all

2
client/dist/styles/AssetUploadField.css vendored
View File

File diff suppressed because one or more lines are too long

6
client/dist/styles/GridField.css vendored
View File

File diff suppressed because one or more lines are too long