Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@gmail.com>2015-02-05 04:16:23 +0300
committerThomas Steur <thomas.steur@gmail.com>2015-02-05 04:16:23 +0300
commitdd76c9f7f5164fd39ea8d754ffcb579954c53f70 (patch)
treec228f869b980d550d8ed181a10c9246ca85c66f5 /plugins/Live
parent66f478f0b5aab39be308e1095185773294f0b1f5 (diff)
refs #5233 prevent line break after event icon and fix position of event icon
Diffstat (limited to 'plugins/Live')
-rw-r--r--plugins/Live/stylesheets/live.less11
-rw-r--r--plugins/Live/templates/_actionsList.twig4
2 files changed, 12 insertions, 3 deletions
diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less
index 9e0f628904..1d2b2fb9b9 100644
--- a/plugins/Live/stylesheets/live.less
+++ b/plugins/Live/stylesheets/live.less
@@ -82,6 +82,11 @@ ol.visitorLog {
display:inline-block;
max-width:90%;
overflow: -moz-hidden-unscrollable;
+
+ &.event {
+ margin-top: 1px;
+ margin-right: 15px;
+ }
}
ol.visitorLog li {
@@ -207,7 +212,7 @@ a.visitor-log-visitor-profile-link {
.visitorLog,.visitor-profile-actions {
> li > div {
display:inline-block;
- width:85%;
+ width:90%;
vertical-align:top;
}
}
@@ -215,6 +220,10 @@ a.visitor-log-visitor-profile-link {
.action-list-action-icon {
float:left;
margin-top:6px;
+
+ &.event {
+ margin-top: 1px;
+ }
}
.action-list-url {
diff --git a/plugins/Live/templates/_actionsList.twig b/plugins/Live/templates/_actionsList.twig
index 0598c2608f..a2bce2ab9a 100644
--- a/plugins/Live/templates/_actionsList.twig
+++ b/plugins/Live/templates/_actionsList.twig
@@ -88,8 +88,8 @@
<span class="truncated-text-line">{{ action.siteSearchKeyword }}</span>
{% endif %}
{% if action.eventCategory|default(false) is not empty %}
- <img src='{{ action.icon }}' title='{{ 'Events_Event'|translate }}' class="action-list-action-icon">
- <span class="truncated-text-line">{{ action.eventCategory|rawSafeDecoded }} - {{ action.eventAction|rawSafeDecoded }} {% if action.eventName is defined %}- {{ action.eventName|rawSafeDecoded }}{% endif %} {% if action.eventValue is defined %}[{{ action.eventValue }}]{% endif %}</span>
+ <img src='{{ action.icon }}' title='{{ 'Events_Event'|translate }}' class="action-list-action-icon event">
+ <span class="truncated-text-line event">{{ action.eventCategory|rawSafeDecoded }} - {{ action.eventAction|rawSafeDecoded }} {% if action.eventName is defined %}- {{ action.eventName|rawSafeDecoded }}{% endif %} {% if action.eventValue is defined %}[{{ action.eventValue }}]{% endif %}</span>
{% endif %}
{% if action.url is not empty %}
{% if action.type == 'action' and action.pageTitle|default(false) is not empty %}<p>{% endif %}