kallithea Changeset - 58d27c7ad80e

Changeset - 58d27c7ad80e

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

domruf - 8 years ago 2017-10-10 21:33:16
dominikruf@gmail.com

gravatar: use icon-gravatar for default gravatar sizing and styling instead of icon-empty

We may want to use a different style for gravatar then for icon-empty,
so we should give it its own class, but still consider it an icon, like the
default icon-user is.

3 files changed with 3 insertions and 3 deletions:

kallithea/lib/helpers.py

kallithea/public/css/contextbar.css

kallithea/public/js/base.js

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -869,25 +869,25 @@ def gravatar(email_address, cls='', size @@
     empty then we fallback to using an icon.
     """
     from tg import tmpl_context as c
     if not c.visual.use_gravatar:
         return ''
     src = gravatar_url(email_address, size * 2)
     if src:
         # here it makes sense to use style="width: ..." (instead of, say, a
         # stylesheet) because we using this to generate a high-res (retina) size
-        html = ('<i class="icon-empty {cls}"'
+        html = ('<i class="icon-gravatar {cls}"'
                 ' style="font-size: {size}px;background-size: {size}px;background-image: url(\'{src}\')"'
                 '></i>').format(cls=cls, size=size, src=src)
     else:
         # if src is empty then there was no gravatar, so we use a font icon
         html = ("""<i class="icon-user {cls}" style="font-size: {size}px;"></i>"""
             .format(cls=cls, size=size, src=src))
     return literal(html)
 def gravatar_url(email_address, size=30, default=''):

kallithea/public/css/contextbar.css

➞

Show inline comments

 /**
  * Stylesheets for the context bar
  */
 i[class^='icon-'] {
   background-repeat: no-repeat;
   background-position: center;
   display: inline-block;
   min-width: 16px;
   min-height: 16px;
   margin: -2px 0 -4px 0;
   /* background-color: red; /* for debugging */
 }
-/* Note: class 'icon-empty' can be used to get this styling without an actual glyph */
+/* Note: class 'icon-empty' or 'icon-gravatar' can be used to get icon styling without an actual glyph */
 /* css classes for diff file status ... it'd be nice if css had a way to
    inherit from another class but alas, we must make sure this content is the
    same from the icon font file */
 .icon-diff-M:before {
   font-family: 'kallithea';
   content: '\22a1';
   color: #d0b44c;
 }
 .icon-diff-D:before {
   font-family: 'kallithea';
   content: '\229f';
   color: #bd2c00;

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1061,25 +1061,25 @@ var autocompleteHighlightMatch = functio @@
         + full.substr(matchindex, snippet.length)
         + '</span>' + full.substring(matchindex + snippet.length);
 };
 // Return html snippet for showing the provided gravatar url
 var gravatar = function(gravatar_lnk, size, cssclass) {
     if (!gravatar_lnk) {
         return '';
+    }
     if (gravatar_lnk == 'default') {
         return '<i class="icon-user {1}" style="font-size: {0}px;"></i>'.format(size, cssclass);
+    }
-    return ('<i class="icon-empty {2}"' +
+    return ('<i class="icon-gravatar {2}"' +
             ' style="font-size: {0}px;background-image: url(\'{1}\'); background-size: {0}px"' +
             '></i>').format(size, gravatar_lnk, cssclass);
+}
 var autocompleteGravatar = function(res, gravatar_lnk, size, group) {
     var elem;
     if (group !== undefined) {
         elem = '<i class="perm-gravatar-ac icon-users"></i>';
     } else {
         elem = gravatar(gravatar_lnk, size, "perm-gravatar-ac");
+    }
     return '<div class="ac-container-wrap">{0}{1}</div>'.format(elem, res);

0 comments (0 inline, 0 general)