You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/05/02 05:56:20 UTC
git commit: AMBARI-5657. Ambari Web layout issues on IE 9. (yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk d0081327b -> 75505c635
AMBARI-5657. Ambari Web layout issues on IE 9. (yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/75505c63
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/75505c63
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/75505c63
Branch: refs/heads/trunk
Commit: 75505c635f31222af4763a72cc835f6a412ed5f9
Parents: d008132
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu May 1 20:46:50 2014 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu May 1 20:47:05 2014 -0700
----------------------------------------------------------------------
ambari-web/app/assets/index.html | 1 +
.../templates/main/host/bulk_operation_menu.hbs | 24 ++++++++------------
ambari-web/config.coffee | 4 +++-
3 files changed, 13 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/75505c63/ambari-web/app/assets/index.html
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/index.html b/ambari-web/app/assets/index.html
index d9f22a8..848df40 100644
--- a/ambari-web/app/assets/index.html
+++ b/ambari-web/app/assets/index.html
@@ -23,6 +23,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <link rel="stylesheet" href="stylesheets/vendor.css">
<link rel="stylesheet" href="stylesheets/app.css">
<script src="javascripts/vendor.js"></script>
<script src="javascripts/app.js"></script>
http://git-wip-us.apache.org/repos/asf/ambari/blob/75505c63/ambari-web/app/templates/main/host/bulk_operation_menu.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/bulk_operation_menu.hbs b/ambari-web/app/templates/main/host/bulk_operation_menu.hbs
index f5d8fec..c5da03a 100644
--- a/ambari-web/app/templates/main/host/bulk_operation_menu.hbs
+++ b/ambari-web/app/templates/main/host/bulk_operation_menu.hbs
@@ -32,11 +32,9 @@
<ul class="dropdown-menu">
{{#each operation in view.operationsInfo}}
{{#if operation.label.length}}
- <li>
- {{#view view.operationView contentBinding="operation.operationData" selection="s"}}
- <a href="javascript:void(null);">{{operation.label}}</a>
- {{/view}}
- </li>
+ {{#view view.operationView contentBinding="operation.operationData" selection="s"}}
+ <a href="javascript:void(null);">{{operation.label}}</a>
+ {{/view}}
{{/if}}
{{/each}}
</ul>
@@ -70,11 +68,9 @@
<ul class="dropdown-menu">
{{#each operation in view.operationsInfo}}
{{#if operation.label.length}}
- <li>
- {{#view view.operationView contentBinding="operation.operationData" selection="f"}}
- <a href="javascript:void(null);">{{operation.label}}</a>
- {{/view}}
- </li>
+ {{#view view.operationView contentBinding="operation.operationData" selection="f"}}
+ <a href="javascript:void(null);">{{operation.label}}</a>
+ {{/view}}
{{/if}}
{{/each}}
</ul>
@@ -108,11 +104,9 @@
<ul class="dropdown-menu">
{{#each operation in view.operationsInfo}}
{{#if operation.label.length}}
- <li>
- {{#view view.operationView contentBinding="operation.operationData" selection="a"}}
- <a href="javascript:void(null);">{{operation.label}}</a>
- {{/view}}
- </li>
+ {{#view view.operationView contentBinding="operation.operationData" selection="a"}}
+ <a href="javascript:void(null);">{{operation.label}}</a>
+ {{/view}}
{{/if}}
{{/each}}
</ul>
http://git-wip-us.apache.org/repos/asf/ambari/blob/75505c63/ambari-web/config.coffee
----------------------------------------------------------------------
diff --git a/ambari-web/config.coffee b/ambari-web/config.coffee
index 5ba91d3..c7a3239 100644
--- a/ambari-web/config.coffee
+++ b/ambari-web/config.coffee
@@ -63,7 +63,9 @@ exports.config =
stylesheets:
defaultExtension: 'css'
- joinTo: 'stylesheets/app.css'
+ joinTo:
+ 'stylesheets/app.css': /^app/
+ 'stylesheets/vendor.css': /^vendor/
order:
before: [
'vendor/styles/bootstrap.css',