Commit abdf6fabd03ebf9c9985eab1f1f1aca7619ba342
1 parent
5ff853b4
Exists in
master
and in
29 other branches
Moved style of elements to CSS file
Also removed wrong class from link-title (ActionItem2925)
Showing
2 changed files
with
8 additions
and
4 deletions
Show diff stats
app/views/box_organizer/_link_list_block.rhtml
1 | <strong><%= _('Links') %></strong> | 1 | <strong><%= _('Links') %></strong> |
2 | -<div id='edit-link-list-block' style='width: 820px;'> | ||
3 | -<table id='links' class='noborder' style="width:auto;"> | 2 | +<div id='edit-link-list-block'> |
3 | +<table id='links' class='noborder'> | ||
4 | <tr> | 4 | <tr> |
5 | <th><%= _('Icon') %></th> | 5 | <th><%= _('Icon') %></th> |
6 | <th><%= _('Name') %></th> | 6 | <th><%= _('Name') %></th> |
@@ -25,7 +25,7 @@ | @@ -25,7 +25,7 @@ | ||
25 | content_tag('td', icon_selector('ok')) + | 25 | content_tag('td', icon_selector('ok')) + |
26 | content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) + | 26 | content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) + |
27 | content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') + | 27 | content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') + |
28 | - content_tag('td', text_field_tag('block[links][][title]', '', :class => 'link-title'), :class => 'cel-address' ) + | 28 | + content_tag('td', text_field_tag('block[links][][title]', '', :class => 'link-title')) + |
29 | content_tag('td', select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, '_self'))) | 29 | content_tag('td', select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, '_self'))) |
30 | ) + | 30 | ) + |
31 | javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight") | 31 | javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight") |
public/stylesheets/application.css
@@ -1834,8 +1834,12 @@ a.button.disabled, input.disabled { | @@ -1834,8 +1834,12 @@ a.button.disabled, input.disabled { | ||
1834 | } | 1834 | } |
1835 | /* ==> blocks/link-list-block.css <<= */ | 1835 | /* ==> blocks/link-list-block.css <<= */ |
1836 | 1836 | ||
1837 | +#edit-link-list-block { | ||
1838 | + width: 820px; | ||
1839 | +} | ||
1840 | + | ||
1837 | #edit-link-list-block table { | 1841 | #edit-link-list-block table { |
1838 | - width: 100%; | 1842 | + width: auto; |
1839 | margin-bottom: 10px; | 1843 | margin-bottom: 10px; |
1840 | } | 1844 | } |
1841 | #edit-link-list-block table .cel-address { | 1845 | #edit-link-list-block table .cel-address { |