Merge "Clarify the ambiguity of the "more actions" dropdown."

This commit is contained in:
Jenkins 2013-01-21 08:54:45 +00:00 committed by Gerrit Code Review
commit b8071bcce7
2 changed files with 8 additions and 10 deletions

View File

@ -1,4 +1,4 @@
{% load horizon %} {% load horizon i18n %}
{% spaceless %} {# This makes sure whitespace doesn't affect positioning for dropdown. #} {% spaceless %} {# This makes sure whitespace doesn't affect positioning for dropdown. #}
{% if row_actions|length > 1 %} {% if row_actions|length > 1 %}
@ -6,7 +6,8 @@
{% for action in row_actions %} {% for action in row_actions %}
{% if forloop.first %} {% if forloop.first %}
{% include "horizon/common/_data_table_row_action.html" %} {% include "horizon/common/_data_table_row_action.html" %}
<a class="btn dropdown-toggle {{ action.class_string|safe }}" data-toggle="dropdown" href="#"> <a class="btn btn-small dropdown-toggle {{ action.class_string|safe }}" data-toggle="dropdown" href="#">
{% trans "More" %}
<span class="caret"></span> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu row_actions clearfix"> <ul class="dropdown-menu row_actions clearfix">

View File

@ -828,17 +828,14 @@ td.select {
/* Actions dropdown */ /* Actions dropdown */
td.actions_column { td.actions_column {
width: 150px; white-space: nowrap;
padding: 10px; padding: 10px;
position: relative; position: relative;
min-width: 140px; width: 200px;
min-height: 20px;
} }
#floating_ips td.actions_column {
width: 180px; td.actions_column .btn-group {
} display: inline-block;
#instances td.actions_column {
width: 175px;
} }
td.actions_column .row_actions a, td.actions_column .row_actions a,