Ver Fonte

AMBARI-5657. Ambari Web layout issues on IE 9. (yusaku)

Yusaku Sako há 11 anos atrás
pai
commit
75505c635f

+ 1 - 0
ambari-web/app/assets/index.html

@@ -23,6 +23,7 @@
   <meta charset="utf-8">
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <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">
   <link rel="stylesheet" href="stylesheets/app.css">
   <script src="javascripts/vendor.js"></script>
   <script src="javascripts/vendor.js"></script>
   <script src="javascripts/app.js"></script>
   <script src="javascripts/app.js"></script>

+ 9 - 15
ambari-web/app/templates/main/host/bulk_operation_menu.hbs

@@ -32,11 +32,9 @@
               <ul class="dropdown-menu">
               <ul class="dropdown-menu">
                 {{#each operation in view.operationsInfo}}
                 {{#each operation in view.operationsInfo}}
                   {{#if operation.label.length}}
                   {{#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}}
                   {{/if}}
                 {{/each}}
                 {{/each}}
               </ul>
               </ul>
@@ -70,11 +68,9 @@
             <ul class="dropdown-menu">
             <ul class="dropdown-menu">
               {{#each operation in view.operationsInfo}}
               {{#each operation in view.operationsInfo}}
                 {{#if operation.label.length}}
                 {{#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}}
                 {{/if}}
               {{/each}}
               {{/each}}
             </ul>
             </ul>
@@ -108,11 +104,9 @@
               <ul class="dropdown-menu">
               <ul class="dropdown-menu">
                 {{#each operation in view.operationsInfo}}
                 {{#each operation in view.operationsInfo}}
                   {{#if operation.label.length}}
                   {{#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}}
                   {{/if}}
                 {{/each}}
                 {{/each}}
               </ul>
               </ul>

+ 3 - 1
ambari-web/config.coffee

@@ -63,7 +63,9 @@ exports.config =
 
 
     stylesheets:
     stylesheets:
       defaultExtension: 'css'
       defaultExtension: 'css'
-      joinTo: 'stylesheets/app.css'
+      joinTo:
+        'stylesheets/app.css': /^app/
+        'stylesheets/vendor.css': /^vendor/
       order:
       order:
         before: [
         before: [
           'vendor/styles/bootstrap.css',
           'vendor/styles/bootstrap.css',