Gitlab CSE Unil

Commit 962407cd authored by M. Chardon's avatar M. Chardon
Browse files

correction sur les makers (env anodate)

parent f6b5b798
......@@ -244,7 +244,7 @@ define([
// Register Event handlers
view.events.annotationsLoaded.add(function(annotations, currentUserId) {
_.each(annotations, function(annotation){
if (currentUserId && annotation.data.type === 'marker')
if (currentUserId && annotation && annotation.data.type === 'marker')
createMarkerLabel(annotation, false);
});
});
......
......@@ -1098,6 +1098,10 @@ canvas {
color: rgba(253, 253, 253, 0.67);
box-shadow: 0 1px 2px -1px #555555 inset, 0 -1px 1px -1px #CCCCCC inset;
}
.category-list .btn-cat {
overflow: hidden;
text-overflow: ellipsis;
}
.category-list .btn-cat.active {
color: #FFFFFF !important;
box-shadow: 0 0 1px 2px rgba(255, 255, 255, 0.75) inset;
......@@ -3881,10 +3885,6 @@ fieldset[disabled] .btn-adim-layer.focus {
background-color: #626262;
border-color: #909090;
}
.btn-adim-layer[data-category="cat_1"][data-env="adim-env-anodate"] .btn-adim-layer-label,
.btn-adim-layer[data-category="cat_3"][data-env="adim-env-anodate"] .btn-adim-layer-label{
font-size:0.96em;
}
.theme-light .btn-adim-layer {
font-weight: bold;
letter-spacing: 0.3px;
......
......@@ -134,7 +134,7 @@
data-env="{{ adim_env }}"
data-category="{{ cat.id }}"
title="Afficher/masquer la catégorie «{{ cat.label }}»">
<span class="fa fa-tag" style="color:{{ cat.color }};"></span><span class="btn-adim-layer-label">{{ cat.label }}</span>
<span class="fa fa-tag" style="color:{{ cat.color }};"></span><span class="btn-adim-layer-label"> {{ cat.label }}</span>
</button>
</div>
{% ifequal compteur 1 %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment