Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8FA7119A83 for ; Tue, 1 Mar 2016 10:39:49 +0000 (UTC) Received: (qmail 85022 invoked by uid 500); 1 Mar 2016 10:39:49 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 84992 invoked by uid 500); 1 Mar 2016 10:39:49 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 84983 invoked by uid 99); 1 Mar 2016 10:39:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2016 10:39:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1D587DFC3C; Tue, 1 Mar 2016 10:39:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pallavkul@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-15217. Folder name spills out of Upload file window (pallavkul) Date: Tue, 1 Mar 2016 10:39:49 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/branch-2.2 640fec717 -> d32d9bd8c AMBARI-15217. Folder name spills out of Upload file window (pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d32d9bd8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d32d9bd8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d32d9bd8 Branch: refs/heads/branch-2.2 Commit: d32d9bd8cb1047d8e08cb8e5520a3c32e795b898 Parents: 640fec7 Author: Pallav Kulshreshtha Authored: Tue Mar 1 16:09:14 2016 +0530 Committer: Pallav Kulshreshtha Committed: Tue Mar 1 16:09:14 2016 +0530 ---------------------------------------------------------------------- .../views/files/src/main/resources/ui/app/styles/app.less | 9 +++++++++ .../resources/ui/app/templates/components/alert-message.hbs | 4 ++-- .../resources/ui/app/templates/components/upload-file.hbs | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d32d9bd8/contrib/views/files/src/main/resources/ui/app/styles/app.less ---------------------------------------------------------------------- diff --git a/contrib/views/files/src/main/resources/ui/app/styles/app.less b/contrib/views/files/src/main/resources/ui/app/styles/app.less index 3adb91f..564ebe6 100644 --- a/contrib/views/files/src/main/resources/ui/app/styles/app.less +++ b/contrib/views/files/src/main/resources/ui/app/styles/app.less @@ -194,3 +194,12 @@ div.text-danger pre{ overflow-y: auto; height: 350px; } + +.modal-dialog > .modal-content > .modal-header, .wrap-message { + word-break: break-all; +} + +.sub-heading{ + font-size: 14px; + font-weight: normal; +} http://git-wip-us.apache.org/repos/asf/ambari/blob/d32d9bd8/contrib/views/files/src/main/resources/ui/app/templates/components/alert-message.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/files/src/main/resources/ui/app/templates/components/alert-message.hbs b/contrib/views/files/src/main/resources/ui/app/templates/components/alert-message.hbs index 29a5fa0..ce8d941 100644 --- a/contrib/views/files/src/main/resources/ui/app/templates/components/alert-message.hbs +++ b/contrib/views/files/src/main/resources/ui/app/templates/components/alert-message.hbs @@ -18,13 +18,13 @@
-
+
{{#fa-stack size=2}} {{fa-icon "circle-thin" stack=2}} {{fa-icon (alert-message-icon-class flash.type) stack=1}} {{/fa-stack}}
-
+
{{{flash.message}}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d32d9bd8/contrib/views/files/src/main/resources/ui/app/templates/components/upload-file.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/files/src/main/resources/ui/app/templates/components/upload-file.hbs b/contrib/views/files/src/main/resources/ui/app/templates/components/upload-file.hbs index c9b5f1c..9563406 100644 --- a/contrib/views/files/src/main/resources/ui/app/templates/components/upload-file.hbs +++ b/contrib/views/files/src/main/resources/ui/app/templates/components/upload-file.hbs @@ -26,7 +26,7 @@