Commit a2cb604d authored by gijs's avatar gijs

Merge branch 'master' of gitlab.constantvzw.org:osp/work.w

parents 4eac9336 9f62349a
......@@ -324,7 +324,7 @@ section.hidden { display: none; }
.main-header__create { flex-grow: 1; }
.main-header__logo { margin-bottom: 42px; }
.main-header__logo { margin-bottom: calc(var(--line-height) * 4); }
.logo__name {
font-size: 3rem;
......@@ -379,6 +379,10 @@ section.hidden { display: none; }
margin-bottom: calc(var(--line-height) / 2);
}
.menu--primary .menu__item:before {
content: "• ";
}
.menu--inline .menu__item {
display: inline;
margin-right: 1em;
......@@ -610,6 +614,7 @@ section.hidden { display: none; }
.score__slider {
position: sticky;
border-top: .45rem solid var(--background-color);
top: 5.0rem;
margin-bottom: 2rem;
white-space: nowrap;
......@@ -620,7 +625,7 @@ section.hidden { display: none; }
.slider__level {
display: inline-block;
width: var(--row-indent);
height: var(--axis-tag-size);
height: calc(var(--axis-tag-size) / 2);
position: relative;
}
......@@ -715,7 +720,7 @@ section.hidden { display: none; }
.score__mainline {
position: relative;
left: calc(-1.9rem - 8px);
left: calc(var(--row-indent) * -.5);
}
.score__mainline { --row-color: var(--color-01); --row-color-next: var(--color-02); --indent: 0px; --form-indent: 40px; }
......@@ -761,6 +766,10 @@ li.axis { position: relative; }
cursor: not-allowed;
}
.score__mainline {
top: calc(var(--axis-padding) * -1);
}
.score__mainline ol { padding-left: var(--row-indent); }
.score__line {
......@@ -794,7 +803,7 @@ li.axis { position: relative; }
}
.score__mainline > .score__line > .axis-row > .axis-row--background-wrapper::before {
left: 36px;
left: calc(var(--row-indent) / 2);
}
......@@ -1191,7 +1200,7 @@ li + li .alt-symbol { display: none; }
}
.line__condition {
margin-left: 1.4rem;
margin-left: 1.93rem;
}
......@@ -1233,7 +1242,7 @@ li + li .alt-symbol { display: none; }
.line__indications .label,
.line__condition .label,
.line__terme .label {
font-weight: 400;
font-weight: 500;
box-shadow: 2px 2px 0 var(--background-color);
display: none;
position: absolute;
......@@ -1244,9 +1253,13 @@ li + li .alt-symbol { display: none; }
z-index: 2;
}
.line__indications p + p {
margin-top: calc(var(--line-height) / 2);
}
.indications-label {
display: block;
font-weight: 500;
/* display: block; */
font-weight: 400;
}
.indications-label:nth-child(n+2) { margin-top: 1em; }
......@@ -1528,7 +1541,6 @@ ol[data-alternative]:before {
.help__content {
color: #173a42;
background-color: white;
font-size: var(--font-size);
line-height: var(--line-height);
}
......@@ -1627,6 +1639,10 @@ ol[data-alternative]:before {
color: var(--button-color-disabled);
}
.filter--tags .filter__item:before {
content: "#";
}
.filter__item {
display: inline-block;
margin-right: 14px;
......
......@@ -54,7 +54,7 @@ window.W.utils = window.W.utils || {};
if (string in entries) {
return entries[string];
} else {
// console.log(string + " n'est pas traduit");
console.log(string + " n'est pas traduit");
return string;
}
}
......
......@@ -1970,6 +1970,7 @@ window.W = window.W || {};
this.getRegion('mainline').$el.nestedSortable({
placeholder: 'axis placeholder',
forcePlaceholderSize: true,
opacity: 0.25,
helper: 'clone',
handle: '.icon--handle',
isTree: true,
......@@ -1997,8 +1998,6 @@ window.W = window.W || {};
return n.getAttribute('data-id');
});
if (_.intersection(parentIds, childrenIds).length > 0) {
return false
}
......
<h1 class="create__heading"><a href="#"><%- t('Créer une partition') %></a></h1>
<h1 class="create__heading"><a href="#"><%- t('Créer une partition') %></a></h1>
<form class="create__form create__form--inactive panel-form" action="" method="post">
<input class="create__textfield panel-form__textfield" type="text" name="title" placeholder="<%- t('Titre') %>" required>
......
......@@ -31,25 +31,25 @@
<% if (hasIndications) { %>
<span class="line__indications">
<span class="label">
<span class="indication">
<% if (indications) { %>
<%= indications.replace(/(?:\r\n|\r|\n)/g, '<br>') %>
<p><span class="indications-label"><%- t('Indications') %>: </span>
<%= indications.replace(/(?:\r\n|\r|\n)/g, '<br>') %></p>
<% } %>
</span>
<% if (commandement) { %>
<span class="indications-label"><%- t('Commandement') %>:</span>
<%- commandement %>
<p><span class="indications-label"><%- t('Commandement') %>: </span>
<%- commandement %></p>
<% } %>
<% if (destination) { %>
<span class="indications-label"><%- t('Destination') %>:</span>
<%- destination %>
<p><span class="indications-label"><%- t('Destination') %>: </span>
<%- destination %></p>
<% } %>
<% if (code) { %>
<span class="indications-label"><%- t('Code') %>:</span>
<%- code %>
<p><span class="indications-label"><%- t('Code') %>: </span>
<%- code %></p>
<% } %>
</span>
</span>
......
......@@ -62,10 +62,11 @@
<!-- Permissions -->
<label>
<span class="label-text"><%- t('Est public?') %>: </span>
<input type="checkbox" name="is_public" <% if (is_public) { %>checked<% } %>>
<span class="label-text" style="display: inline"><%- t('Publiée?') %>: </span>
</label>
<span class="label-text"><%- t('Partager avec') %>: </span>
<div id="share_with"></div>
<button data-name="close"><%- t('Annuler') %></button>
......
......@@ -100,12 +100,14 @@
<% } %>
<dl class="score-meta">
<dt class="score-meta__term score-meta__term--inline"><%- t('Publié le') %></dt>
<dt class="score-meta__term score-meta__term--inline"><%- t('Créée le') %></dt>
<dd class="score-meta__def"><%- formatTimestamp(created_at) %></dd>
<dt class="score-meta__term score-meta__term--inline"><%- t('Modifié le') %></dt>
<dt class="score-meta__term score-meta__term--inline"><%- t('Modifiée le') %></dt>
<dd class="score-meta__def"><%- formatTimestamp(updated_at) %></dd>
</dl>
<p><% if (is_public) { %>Cette partition est public<% } else { %>Cette partition est privée<% } %></p>
{% comment %}
<dl class="score-meta">
<dt class="score-meta__term score-meta__term--inline"><%- t('Créé par') %></dt>
......@@ -118,11 +120,16 @@
<% } %>
</ul>
</dd>
<dt class="score-meta__term score-meta__term--inline"><%- t('Est public?') %></dt>
<dt class="score-meta__term score-meta__term--inline"><%- t('Publiée?') %></dt>
<dd class="score-meta__def"><%- is_public %></dd>
</dl>
{% endcomment %}
<dl class="score-meta">
<dt class="score-meta__term score-meta__term--inline"><%- t('Publiée?') %></dt>
<dd class="score-meta__def"><%- is_public %></dd>
</dl>
<div id="permissions"></div>
<form></form>
......
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