Mercurial > kallithea

changeset 5057:1c3f8bbc3584

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Andrew Shadura <andrew@shadura.me>
date Thu, 23 Apr 2015 09:03:37 +0200
parents 8bbc0ee9d43a (current diff) a06804c28d74 (diff)
children c5829bc7d090
files kallithea/public/css/style.css
diffstat 2 files changed, 38 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/model/comment.py	Wed Apr 22 16:38:26 2015 +0200
+++ b/kallithea/model/comment.py	Thu Apr 23 09:03:37 2015 +0200
@@ -28,7 +28,7 @@
 import logging
 
 from pylons.i18n.translation import _
-from sqlalchemy.util.compat import defaultdict
+from collections import defaultdict
 
 from kallithea.lib.utils2 import extract_mentioned_users, safe_unicode
 from kallithea.lib import helpers as h
--- a/kallithea/public/css/style.css	Wed Apr 22 16:38:26 2015 +0200
+++ b/kallithea/public/css/style.css	Thu Apr 23 09:03:37 2015 +0200
@@ -4932,7 +4932,7 @@
     font: 11px Consolas, Monaco, Inconsolata, Liberation Mono, monospace !important;
     letter-spacing: -1px;
     text-align: right;
-    padding-right: 2px;
+    padding-right: 8px;
     cursor: pointer;
     display: block;
     width: 30px;
@@ -4958,41 +4958,65 @@
     padding: 0;
 }
 table.code-difftable .code pre {
-    margin: 0;
+    margin: 0 0 0 12px;
     padding: 0;
     min-height: 17px;
     line-height: 17px;
     white-space: pre-wrap;
 }
 
+table.code-difftable .del .code pre:before {
+    content: "-";
+    color: #550000;
+}
+ 
+table.code-difftable .add .code pre:before {
+    content: "+";
+    color: #005500;
+}
+ 
+table.code-difftable .unmod .code pre:before {
+    content: " ";
+}
+ 
 .add-bubble {
+    position: relative;
     display: none;
     float: left;
     width: 0px;
     height: 0px;
-}
-
-tr.line.add td.code:hover .add-bubble,
-tr.line.del td.code:hover .add-bubble,
-tr.line.unmod td.code:hover .add-bubble {
-    display: inherit;
+    left: -8px;
+    box-sizing: border-box;
+}
+
+tr.line.add:hover td .add-bubble,
+tr.line.del:hover td .add-bubble,
+tr.line.unmod:hover td .add-bubble {
+    display: block;
 }
 
 .add-bubble div {
-    position: relative;
-    left: -32px;
-    width: 32px;
-    height: 32px;
+    background: #577632;
+    width: 16px;
+    height: 16px;
     cursor: pointer;
+    padding: 0 2px 2px 0.5px;
+    border: 1px solid #577632;
+    border-radius: 3px;
+    box-sizing: border-box;
 }
 
 .add-bubble div:before {
     font-size: 14px;
-    color: #577632;
+    color: #ffffff;
     font-family: "kallithea";
     content: '\1f5ea';
 }
 
+.add-bubble div:hover {
+    transform: scale(1.2, 1.2);
+}
+
 div.comment:target>.comment-wrapp {
     border: solid 2px #ee0 !important;
 }