ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pallav...@apache.org
Subject ambari git commit: AMBARI-15217. Folder name spills out of Upload file window (pallavkul)
Date Tue, 01 Mar 2016 10:39:49 GMT
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 <pallav.kul@gmail.com>
Authored: Tue Mar 1 16:09:14 2016 +0530
Committer: Pallav Kulshreshtha <pallav.kul@gmail.com>
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 @@
 
 <div class={{alert-message-context-class flash.type "clearfix alert alert-dismissible
alert-"}}>
   <button type="button" class="close" {{action "closeAlert"}}><span aria-hidden="true">&times;</span></button>
-  <div class="alert-icon">
+  <div class="alert-icon wrap-message">
     {{#fa-stack size=2}}
       {{fa-icon "circle-thin" stack=2}}
       {{fa-icon (alert-message-icon-class flash.type) stack=1}}
     {{/fa-stack}}
   </div>
-  <div class="alert-message-wrap">
+  <div class="alert-message-wrap wrap-message">
     <div class="alert-message">
       {{{flash.message}}}
     </div>

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 @@
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="fa fa-times pull-right" {{action 'close'}}></button>
-          <h4>{{fa-icon "upload"}} Upload file to {{path}}</h4>
+          <h4>{{fa-icon "upload"}} Upload file to <span class="sub-heading">{{path}}</span></h4>
         </div>
         <div class="modal-body">
           {{#unless isUploading}}


Mime
View raw message