diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-06-09 10:16:25 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-06-09 10:16:25 +0000 |
commit | 7c40b29298a6330586a73d243be6cd755b4498d0 (patch) | |
tree | 8d981a9a2d05827fc41683cea967ef0a76d6ae33 | |
parent | 0575944b6e7a911e84f25ffb5dd95cdde7774423 (diff) | |
parent | 3e54a6ff68bc8d53cf9921b55fba8cae7e26c6f9 (diff) | |
download | tuskar-ui-7c40b29298a6330586a73d243be6cd755b4498d0.tar.gz |
Merge "Suggested Flavors displaying tweaks"
-rw-r--r-- | tuskar_ui/infrastructure/flavors/templates/flavors/index.html | 26 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/static/infrastructure/scss/_individual_pages.scss | 4 |
2 files changed, 9 insertions, 21 deletions
diff --git a/tuskar_ui/infrastructure/flavors/templates/flavors/index.html b/tuskar_ui/infrastructure/flavors/templates/flavors/index.html index 88bbed6c..830efc7b 100644 --- a/tuskar_ui/infrastructure/flavors/templates/flavors/index.html +++ b/tuskar_ui/infrastructure/flavors/templates/flavors/index.html @@ -9,23 +9,15 @@ {% block main %} {% if suggested_flavors_count %} -<table id="suggested-flavors-header" class="table"> - <thead> - <tr data-toggle="collapse" href="#suggested-flavors"> - <th class="col-xs-11"> - <a href="#suggested-flavors">{{ suggested_flavors_count }}× Suggested Flavor</a> - </th> - <th class="col-xs-1"> - <a class="pull-right" href="#suggested-flavors"> - <span class="caret"></span> - </a> - </th> - </tr> - </thead> -</table> - -<div id="suggested-flavors" class="panel-collapse collapse"> - {{ suggested_flavors_table.render }} +<div class="panel panel-default"> + <div class="panel-heading" data-toggle="collapse" href="#suggestedFlavors"> + <a href="#suggestedFlavors">{{ suggested_flavors_count }}× Suggested Flavor</a> + </div> + <div class="panel-collapse collapse" id="suggestedFlavors"> + <div class="panel-body"> + {{ suggested_flavors_table.render }} + </div> + </div> </div> {% endif %} diff --git a/tuskar_ui/infrastructure/static/infrastructure/scss/_individual_pages.scss b/tuskar_ui/infrastructure/static/infrastructure/scss/_individual_pages.scss index f0d6c346..b9cdfcdd 100644 --- a/tuskar_ui/infrastructure/static/infrastructure/scss/_individual_pages.scss +++ b/tuskar_ui/infrastructure/static/infrastructure/scss/_individual_pages.scss @@ -203,10 +203,6 @@ $link-color: #428bca; margin-left: -50px; } -#suggested-flavors-header { - margin-bottom: 0px; -} - /* Configuration parameters */ table .data-table-config-label { width: 20em; |