allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hei...@apache.org
Subject [07/50] [abbrv] allura git commit: [#7924] ticket:858 Use x* for icons wherever needed
Date Wed, 28 Oct 2015 18:01:29 GMT
[#7924] ticket:858 Use x* for icons wherever needed


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/0608f1e4
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/0608f1e4
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/0608f1e4

Branch: refs/heads/hs/7919
Commit: 0608f1e454873d28a58945d2c534239afc018133
Parents: 13e194a
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Tue Oct 27 17:19:19 2015 +0200
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Tue Oct 27 17:19:19 2015 +0200

----------------------------------------------------------------------
 .../ext/admin/templates/admin_widgets/card_field.html   |  2 +-
 Allura/allura/ext/admin/templates/project_groups.html   |  2 +-
 Allura/allura/templates/jinja_master/lib.html           | 12 ++++++------
 ForgeActivity/forgeactivity/templates/macros.html       |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/0608f1e4/Allura/allura/ext/admin/templates/admin_widgets/card_field.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/admin_widgets/card_field.html b/Allura/allura/ext/admin/templates/admin_widgets/card_field.html
index 657f6a0..2e7ba6e 100644
--- a/Allura/allura/ext/admin/templates/admin_widgets/card_field.html
+++ b/Allura/allura/ext/admin/templates/admin_widgets/card_field.html
@@ -27,7 +27,7 @@
           extra_css='admin_modal',
           title='{} Settings'.format(name)) }}
       {% endif %}
-      <p style="padding-bottom: 0">{{ g.icons[icon_name].render(tag='b', style='font-size:24px;')
}}</p>
+      <p style="padding-bottom: 0">{{ g.icons[icon_name].render(tag='span', extra_css='x24')
}}</p>
       {% if desc %}
       <p>{{ desc }}</p>
       {% endif %}

http://git-wip-us.apache.org/repos/asf/allura/blob/0608f1e4/Allura/allura/ext/admin/templates/project_groups.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_groups.html b/Allura/allura/ext/admin/templates/project_groups.html
index afe91fd..8a5c56d 100644
--- a/Allura/allura/ext/admin/templates/project_groups.html
+++ b/Allura/allura/ext/admin/templates/project_groups.html
@@ -37,7 +37,7 @@
   </ul>
 {% endmacro %}
 {% macro group_icon(icon) %}
-<p style="padding-bottom: 0">{{ g.icons[icon].render(tag='b', style='font-size:24px;')
}}</p>
+<p style="padding-bottom: 0">{{ g.icons[icon].render(tag='span', extra_css='x24') }}</p>
 {% endmacro %}
 
 {% block content %}

http://git-wip-us.apache.org/repos/asf/allura/blob/0608f1e4/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index 5bfd192..b3626e9 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -61,9 +61,9 @@
          class="emboss{% if size %} x{{size}}{% endif %}{% if className %} {{className}}{%
endif %}">
   {% else %}
     {{ g.icons['user'].render(
-        tag='b',
-        style='font-size:{}px;text-align:center;'.format(size) if size else '',
-        extra_css='emboss {}'.format(className or '')) }}
+        tag='span',
+        style='text-align:center;',
+        extra_css='emboss {} x{}'.format(className or '', size or '')) }}
   {% endif %}
 {%- endmacro %}
 
@@ -82,9 +82,9 @@
          class="emboss {% if size %} x{{size}}{% endif %}">
   {% else %}
     {{ g.icons['user'].render(
-        tag='b',
-        style='font-size:{}px;text-align:center;'.format(size) if size else '',
-        extra_css='emboss') }}
+        tag='span',
+        style='text-align:center;',
+        extra_css='emboss x{}'.format(size or '')) }}
   {% endif %}
 {%- endmacro %}
 

http://git-wip-us.apache.org/repos/asf/allura/blob/0608f1e4/ForgeActivity/forgeactivity/templates/macros.html
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/templates/macros.html b/ForgeActivity/forgeactivity/templates/macros.html
index d6578e2..25fed79 100644
--- a/ForgeActivity/forgeactivity/templates/macros.html
+++ b/ForgeActivity/forgeactivity/templates/macros.html
@@ -33,8 +33,8 @@
          class="emboss{% if size %} x{{size}}{% endif %}{% if className %} {{className}}{%
endif %}">
   {% else %}
     {{ g.icons['user'].render(
-        tag='b',
-        style='font-size:{}px;text-align:center;'.format(size) if size else '',
-        extra_css='emboss {}'.format(className or '')) }}
+        tag='span',
+        style='text-align:center;',
+        extra_css='emboss {} x{}'.format(className or '', size or '')) }}
   {% endif %}
 {%- endmacro %}


Mime
View raw message