Merge pull request #8817 from piwik/8748_icon_placements

Fix some icon placement issues
matomo-org · Oct 4, 2015 · 0dc0e31 · 0dc0e31
2 parents 8281590 + b4c46b3
commit 0dc0e31
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
@@ -42,6 +42,10 @@ table.dataTable img {
   margin-left: 0.5em;
 }
 
+table.subDataTable img.link {
+  transform: translateY(-50%);
+}
+
 table.dataTable tr.subDataTable {
   cursor: pointer;
 

diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less
@@ -251,10 +251,17 @@ a.visitor-log-visitor-profile-link {
 
 .action-list-action-icon {
     float:left;
-    margin-top:6px;
 
     &.event {
-      margin-top: 1px;
+      margin-top: 0;
+    }
+    &.outlink {
+      margin-top: 4px;
+      margin-right: 4px;
+      margin-left: 4px;
+    }
+    &.search {
+      margin-right: 4px;
     }
 }
 

diff --git a/plugins/Live/templates/_actionsList.twig b/plugins/Live/templates/_actionsList.twig
@@ -83,7 +83,7 @@
             {% endif %}
             {% if action.siteSearchKeyword is defined %}
                 {% if action.type == 'search' %}
-                    <img src='{{ action.icon }}' title='{{ 'Actions_SubmenuSitesearch'|translate }}' class="action-list-action-icon">
+                    <img src='{{ action.icon }}' title='{{ 'Actions_SubmenuSitesearch'|translate }}' class="action-list-action-icon search">
                 {% endif %}
                 <span class="truncated-text-line">{{ action.siteSearchKeyword }}</span>
             {% endif %}
@@ -94,7 +94,7 @@
             {% if action.url is not empty %}
                 {% if action.type == 'action' and action.pageTitle|default(false) is not empty %}<p>{% endif %}
                 {% if action.type == 'download' or action.type == 'outlink' %}
-                    <img src='{{ action.icon }}' class="action-list-action-icon">
+                    <img src='{{ action.icon }}' class="action-list-action-icon {{ action.type }}">
                 {% endif %}
 
                 {% if action.eventCategory|default(false) is not empty