changeset 5544:feef81a369b3

compare: clean up revision selector HTML/CSS This fixes margins and vertical alignment.
author Søren Løvborg <sorenl@unity3d.com>
date Mon, 24 Aug 2015 22:51:07 +0200
parents d9b78d8f1db3
children ba30adf2fb8a
files kallithea/public/css/style.css kallithea/templates/compare/compare_diff.html
diffstat 2 files changed, 22 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/style.css	Wed Sep 09 12:41:20 2015 +0200
+++ b/kallithea/public/css/style.css	Mon Aug 24 22:51:07 2015 +0200
@@ -4554,6 +4554,19 @@
     overflow: hidden;
 }
 
+.compare-revision-selector {
+    font-weight: bold;
+    font-size: 14px;
+}
+.compare-revision-selector > div {
+    display: inline-block;
+    margin-left: 8px;
+    vertical-align: middle;
+}
+.compare-revision-selector .btn {
+    margin-bottom: 0;
+}
+
 
 div.diffblock {
     overflow: auto;
@@ -4569,6 +4582,7 @@
 div.diffblock.margined {
     margin: 0px 20px 0px 20px;
 }
+.compare-revision-selector,
 div.diffblock .code-header {
     border-bottom: 1px solid #CCCCCC;
     background: #EEEEEE;
--- a/kallithea/templates/compare/compare_diff.html	Wed Sep 09 12:41:20 2015 +0200
+++ b/kallithea/templates/compare/compare_diff.html	Mon Aug 24 22:51:07 2015 +0200
@@ -26,9 +26,15 @@
     </div>
     <div class="table">
         <div id="body" class="diffblock">
-            <div class="code-header">
+            <div class="compare-revision-selector">
+                ## divs are "inline-block" and cannot have whitespace between them.
                 <div>
-                    ${h.hidden('compare_org')} <i class="icon-right"></i> ${h.hidden('compare_other')}
+                    ${h.hidden('compare_org')}
+                </div><div>
+                    <i class="icon-right"></i>
+                </div><div>
+                    ${h.hidden('compare_other')}
+                </div><div>
                     %if not c.compare_home:
                         <a class="btn btn-small" href="${c.swap_url}"><i class="icon-arrows-cw"></i> ${_('Swap')}</a>
                     %endif