فهرست منبع

Fix firefox text trailing

Denis K 8 سال پیش
والد
کامیت
8415155d8e

+ 2 - 2
jet/dashboard/templates/jet.dashboard/modules/feed.html

@@ -3,9 +3,9 @@
 <ul>
     {% if module.children %}
         {% for child in module.children %}
-            <li class="nowrap">
+            <li>
                 {% if child.date %}<span class="float-right dim">{{ child.date|date }}</span>{% endif %}
-                {% if child.warning %}<span class="warning">{{ child.title }}</span>{% else %}<a href="{{ child.link }}" target="_blank"><span class="icon-open-external"></span> {{ child.title }}</a>{% endif %}
+                {% if child.warning %}<span class="warning">{{ child.title }}</span>{% else %}<a href="{{ child.link }}" target="_blank" class="nowrap"><span class="icon-open-external"></span> {{ child.title }}</a>{% endif %}
             </li>
         {% endfor %}
     {% else %}

+ 22 - 20
jet/dashboard/templates/jet.dashboard/modules/recent_actions.html

@@ -7,33 +7,35 @@
         </li>
     {% else %}
         {% for entry in module.children %}
-            <li class="nowrap">
+            <li>
                 <span class="float-right">
                     <span class="icon-user tooltip" title="{{ entry.user }}"></span>
                     <span class="icon-clock tooltip" title="{{ entry.action_time }}"></span>
                 </span>
 
-                {% if entry.is_addition %}
-                    <span class="icon-add3"></span>
-                {% endif %}
-                {% if entry.is_change %}
-                    <span class="icon-edit"></span>
-                {% endif %}
-                {% if entry.is_deletion %}
-                    <span class="icon-cross"></span>
-                {% endif %}
+                <div class="nowrap">
+                    {% if entry.is_addition %}
+                        <span class="icon-add3"></span>
+                    {% endif %}
+                    {% if entry.is_change %}
+                        <span class="icon-edit"></span>
+                    {% endif %}
+                    {% if entry.is_deletion %}
+                        <span class="icon-cross"></span>
+                    {% endif %}
 
-                {% if entry.content_type %}
-                    <span>{% filter capfirst %}{{ entry.content_type }}{% endfilter %}</span>
-                {% else %}
-                    <span>{% trans 'Unknown content' %}</span>
-                {% endif %}
+                    {% if entry.content_type %}
+                        <span>{% filter capfirst %}{{ entry.content_type }}{% endfilter %}</span>
+                    {% else %}
+                        <span>{% trans 'Unknown content' %}</span>
+                    {% endif %}
 
-                {% if entry.is_deletion or not entry.get_admin_url %}
-                    {{ entry.object_repr }}
-                {% else %}
-                    <a href="{{ entry.get_admin_url }}">{{ entry.object_repr }}</a>
-                {% endif %}
+                    {% if entry.is_deletion or not entry.get_admin_url %}
+                        {{ entry.object_repr }}
+                    {% else %}
+                        <a href="{{ entry.get_admin_url }}">{{ entry.object_repr }}</a>
+                    {% endif %}
+                </div>
             </li>
         {% endfor %}
     {% endif %}

+ 7 - 6
jet/static/jet/css/_dashboard.scss

@@ -266,12 +266,6 @@ ul.actionlist li {
           font-size: 13px;
           padding: 8px;
 
-          &.nowrap {
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-          }
-
           &.contrast {
             background: $content-contrast2-background-color;
             font-size: 12px;
@@ -353,6 +347,13 @@ ul.actionlist li {
         color: $dim-text-color;
       }
 
+      .nowrap {
+        display: block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
       canvas {
         .chart {
           &-fillColor {