kallithea Changeset - 1c3f8bbc3584

Changeset - 1c3f8bbc3584

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 2 0

Andrew Shadura - 11 years ago 2015-04-23 09:03:37
andrew@shadura.me

Merge with stable

2 files changed with 38 insertions and 14 deletions:

kallithea/model/comment.py

kallithea/public/css/style.css

0 comments (0 inline, 0 general)

kallithea/model/comment.py

➞

Show inline comments

@@ @@ -19,25 +19,25 @@ comments model for Kallithea @@
 This file was forked by the Kallithea project in July 2014.
 Original author and date, and relevant copyright and licensing information is below:
 :created_on: Nov 11, 2011
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 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
 from kallithea.model import BaseModel
 from kallithea.model.db import ChangesetComment, User, \
     Notification, PullRequest
 from kallithea.model.notification import NotificationModel
 from kallithea.model.meta import Session
 log = logging.getLogger(__name__)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -4923,25 +4923,25 @@ table.code-difftable .lineno { @@
     border-bottom: none !important;
     vertical-align: middle !important;
+}
 table.code-difftable .lineno.new {
+}
 table.code-difftable .lineno.old {
+}
 table.code-difftable .lineno a {
     color: #aaa !important;
     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;
+}
 table.code-difftable .lineno-inline {
     background: none repeat scroll 0 0 #FFF !important;
     padding-left: 2px;
     padding-right: 2px;
     text-align: right;
     width: 30px;
     -moz-user-select: none;
@@ @@ -4949,59 +4949,83 @@ table.code-difftable .lineno-inline { @@
+}
 /** CODE **/
 table.code-difftable .code {
     display: block;
     width: 100%;
+}
 table.code-difftable .code td {
     margin: 0;
     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;
+}
 .lineno:target a {
     border: solid 2px #ee0 !important;
     margin: -2px;
+}
 .btn-image-diff-show,
 .btn-image-diff-swap {
     margin: 5px;

0 comments (0 inline, 0 general)