ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-12531. RU: pre-requisite dialog isn't word-wrapping correctly (alexantonenko)
Date Mon, 27 Jul 2015 17:08:28 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 71d34fe28 -> e8f27c332


AMBARI-12531. RU: pre-requisite dialog isn't word-wrapping correctly (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8f27c33
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8f27c33
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8f27c33

Branch: refs/heads/trunk
Commit: e8f27c332078892b4eeaf07a5d4d55ec801c2650
Parents: 71d34fe
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Mon Jul 27 19:50:44 2015 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Mon Jul 27 20:08:22 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/styles/application.less          | 31 ++++++++++++++++++--
 ambari-web/app/styles/common.less               | 23 ---------------
 .../common/modal_popups/cluster_check_popup.js  |  2 +-
 3 files changed, 29 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f27c33/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index b9cad9e..fc2c687 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -5844,8 +5844,33 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox
{
   }
 }
 
-#pre-upgrade-check {
-  .icon-warning-sign {
-    color: @health-status-yellow;
+.cluster-check-popup {
+  .modal {
+    width: 950px;
+    margin-left: -475px;
+    #pre-upgrade-check {
+      .icon-warning-sign {
+        color: @health-status-yellow;
+      }
+      pre {
+        word-break: keep-all;
+      }
+      .configs-table {
+        table-layout: fixed;
+        font-size: 0.95em;
+        td {
+          word-wrap: break-word;
+          &.no-value {
+            font-style: italic;
+          }
+        }
+        td:first-child, td:first-child + td, th:first-child, th:first-child + th {
+          width: 12.5%;
+        }
+        td:first-child + td + td, td:first-child + td + td + td, td:first-child + td + td
+ td + td, th:first-child + th + th, th:first-child + th + th + th, th:first-child + th +
th + th + th {
+          width: 25%;
+        }
+      }
+    }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f27c33/ambari-web/app/styles/common.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/common.less b/ambari-web/app/styles/common.less
index 0edec5f..e828653 100644
--- a/ambari-web/app/styles/common.less
+++ b/ambari-web/app/styles/common.less
@@ -348,27 +348,4 @@
       padding: 0;
     }
   }
-}
-
-.configs-merge-warnings {
-  .modal {
-    width: 950px;
-    margin-left: -475px;
-  }
-  .configs-table {
-    table-layout: fixed;
-    font-size: 0.95em;
-    td {
-      word-wrap: break-word;
-      &.no-value {
-        font-style: italic;
-      }
-    }
-    td:first-child, td:first-child + td, th:first-child, th:first-child + th {
-      width: 12.5%;
-    }
-    td:first-child + td + td, td:first-child + td + td + td, td:first-child + td + td + td
+ td, th:first-child + th + th, th:first-child + th + th + th, th:first-child + th + th +
th + th {
-      width: 25%;
-    }
-  }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/e8f27c33/ambari-web/app/views/common/modal_popups/cluster_check_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/modal_popups/cluster_check_popup.js b/ambari-web/app/views/common/modal_popups/cluster_check_popup.js
index d4907ed..6e99102 100644
--- a/ambari-web/app/views/common/modal_popups/cluster_check_popup.js
+++ b/ambari-web/app/views/common/modal_popups/cluster_check_popup.js
@@ -61,7 +61,7 @@ App.showClusterCheckPopup = function (data, header, failTitle, failAlert,
warnin
     primary: fails.length ? Em.I18n.t('common.dismiss') : Em.I18n.t('common.proceedAnyway'),
     secondary: fails.length ? false : Em.I18n.t('common.cancel'),
     header: header,
-    classNames: hasConfigsMergeConflicts ? ['configs-merge-warnings'] : [],
+    classNames: ['cluster-check-popup'],
     bodyClass: Em.View.extend(popupBody),
     onPrimary: function () {
       if (!fails.length && callback) {


Mime
View raw message