From e9a7c06db2261ef288656c72d5a56ab74d9da8a0 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Fri, 25 Apr 2014 01:43:29 +0200
Subject: [PATCH 1/4] Tweak update-dialog style

---
 src/styles/brackets_patterns_override.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less
index 45e1e2ff614..7ab9f258307 100644
--- a/src/styles/brackets_patterns_override.less
+++ b/src/styles/brackets_patterns_override.less
@@ -694,6 +694,7 @@ a[href^="http"] {
 
 /* Update dialog */
 .update-dialog .modal-body {
+    padding-bottom: 0;
     position: relative;
     .update-icon {
         position: absolute;
@@ -707,7 +708,7 @@ a[href^="http"] {
         margin: 0 10px 0 123px;
 
         .update-info {
-            max-height: 200px;
+            max-height: 280px;
             overflow: auto;
 
             // Enable text selection

From fb7ed90d5f67b8b75c6053e030a115c68a452d2b Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Wed, 30 Apr 2014 22:12:36 +0200
Subject: [PATCH 2/4] Scrollbars fill the whole dialog

---
 src/htmlContent/update-dialog.html         |  2 +-
 src/styles/brackets_patterns_override.less | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/htmlContent/update-dialog.html b/src/htmlContent/update-dialog.html
index b15a3c42625..0355a413445 100644
--- a/src/htmlContent/update-dialog.html
+++ b/src/htmlContent/update-dialog.html
@@ -2,7 +2,7 @@
     <div class="modal-header">
         <h1 class="dialog-title">{{UPDATE_AVAILABLE_TITLE}}</h1>
     </div>
-    <div class="modal-body">
+    <div class="modal-body no-padding">
         <img class="update-icon" src="styles/images/update_large_icon.svg">
         <div class="update-text">
             <p class="dialog-message">{{UPDATE_MESSAGE}}</p>
diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less
index 7ab9f258307..095d38d9c25 100644
--- a/src/styles/brackets_patterns_override.less
+++ b/src/styles/brackets_patterns_override.less
@@ -694,7 +694,7 @@ a[href^="http"] {
 
 /* Update dialog */
 .update-dialog .modal-body {
-    padding-bottom: 0;
+    margin-right: 0; // the scrollbar should be at the right edge
     position: relative;
     .update-icon {
         position: absolute;
@@ -705,12 +705,14 @@ a[href^="http"] {
     }
     .update-text {
         // Icon is 120px, so we need at least that much left padding/margin to avoid overlap
-        margin: 0 10px 0 123px;
+        margin: 0 0 0 123px;
 
-        .update-info {
-            max-height: 280px;
-            overflow: auto;
+        padding-top: 20px;
+        max-height: 280px;
+        overflow: auto;
 
+        .update-info {
+            margin-right: 10px;
             // Enable text selection
             cursor: auto;
             .user-select(text);

From d17827ea7138de426226ac0add69d93d7b5ec8cb Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Wed, 30 Apr 2014 22:20:12 +0200
Subject: [PATCH 3/4] Tweak about-dialog style

---
 src/htmlContent/about-dialog.html          | 2 +-
 src/styles/brackets_patterns_override.less | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/htmlContent/about-dialog.html b/src/htmlContent/about-dialog.html
index 3e959b5fd02..7380cca2fec 100644
--- a/src/htmlContent/about-dialog.html
+++ b/src/htmlContent/about-dialog.html
@@ -2,7 +2,7 @@
     <div class="modal-header">
         <h1 class="dialog-title">{{Strings.ABOUT}}</h1>
     </div>
-    <div class="modal-body">
+    <div class="modal-body no-padding">
         <img class="about-icon" src="{{ABOUT_ICON}}">
         <div class="about-text">
             <h2>{{APP_NAME_ABOUT_BOX}}</h2>
diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less
index 095d38d9c25..e5b949bf0d3 100644
--- a/src/styles/brackets_patterns_override.less
+++ b/src/styles/brackets_patterns_override.less
@@ -694,7 +694,6 @@ a[href^="http"] {
 
 /* Update dialog */
 .update-dialog .modal-body {
-    margin-right: 0; // the scrollbar should be at the right edge
     position: relative;
     .update-icon {
         position: absolute;
@@ -705,7 +704,7 @@ a[href^="http"] {
     }
     .update-text {
         // Icon is 120px, so we need at least that much left padding/margin to avoid overlap
-        margin: 0 0 0 123px;
+        margin-left: 123px;
 
         padding-top: 20px;
         max-height: 280px;
@@ -967,14 +966,15 @@ a[href^="http"] {
     }
     .about-text {
         // Icon is 120px, so we need at least that much left padding/margin to avoid overlap
-        margin: 0 10px 0 123px;
+        margin-left: 123px;
+        overflow: auto;
 
         #about-build-number {
             color: @tc-light-weight-quiet-text;
         }
         .about-info {
             max-height: 300px;
-            overflow: auto;
+            margin-right: 10px;
         }
         .about-contributors {
             min-height: 100px;

From 556df41b5d7b7b3df4be1cffe189a68fd5b9baf6 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Thu, 1 May 2014 01:41:20 +0200
Subject: [PATCH 4/4] Code review changes

---
 src/styles/brackets_patterns_override.less | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less
index e5b949bf0d3..bfd14cc8b3d 100644
--- a/src/styles/brackets_patterns_override.less
+++ b/src/styles/brackets_patterns_override.less
@@ -704,7 +704,7 @@ a[href^="http"] {
     }
     .update-text {
         // Icon is 120px, so we need at least that much left padding/margin to avoid overlap
-        margin-left: 123px;
+        margin-left: 130px;
 
         padding-top: 20px;
         max-height: 280px;
@@ -966,7 +966,7 @@ a[href^="http"] {
     }
     .about-text {
         // Icon is 120px, so we need at least that much left padding/margin to avoid overlap
-        margin-left: 123px;
+        margin-left: 130px;
         overflow: auto;
 
         #about-build-number {
@@ -978,6 +978,7 @@ a[href^="http"] {
         }
         .about-contributors {
             min-height: 100px;
+            padding-bottom: 13px;
 
             a {
                 text-decoration: none;
@@ -996,7 +997,7 @@ a[href^="http"] {
         font-weight: normal;
         font-size: 25px;
         margin-bottom: -4px;
-        margin-top: 3px;
+        margin-top: 13px;
     }
     .dialog-message {
         font-size: 14px;