Commit 9f62349a authored by alexandre's avatar alexandre

fix a few css

parent 42fa45ba
...@@ -318,7 +318,7 @@ section.hidden { display: none; } ...@@ -318,7 +318,7 @@ section.hidden { display: none; }
.main-header__create { flex-grow: 1; } .main-header__create { flex-grow: 1; }
.main-header__logo { margin-bottom: 42px; } .main-header__logo { margin-bottom: calc(var(--line-height) * 4); }
.logo__name { .logo__name {
font-size: 3rem; font-size: 3rem;
...@@ -373,6 +373,10 @@ section.hidden { display: none; } ...@@ -373,6 +373,10 @@ section.hidden { display: none; }
margin-bottom: calc(var(--line-height) / 2); margin-bottom: calc(var(--line-height) / 2);
} }
.menu--primary .menu__item:before {
content: "• ";
}
.menu--inline .menu__item { .menu--inline .menu__item {
display: inline; display: inline;
margin-right: 1em; margin-right: 1em;
...@@ -604,6 +608,7 @@ section.hidden { display: none; } ...@@ -604,6 +608,7 @@ section.hidden { display: none; }
.score__slider { .score__slider {
position: sticky; position: sticky;
border-top: .45rem solid var(--background-color);
top: 5.0rem; top: 5.0rem;
margin-bottom: 2rem; margin-bottom: 2rem;
white-space: nowrap; white-space: nowrap;
...@@ -614,7 +619,7 @@ section.hidden { display: none; } ...@@ -614,7 +619,7 @@ section.hidden { display: none; }
.slider__level { .slider__level {
display: inline-block; display: inline-block;
width: var(--row-indent); width: var(--row-indent);
height: var(--axis-tag-size); height: calc(var(--axis-tag-size) / 2);
position: relative; position: relative;
} }
...@@ -709,7 +714,7 @@ section.hidden { display: none; } ...@@ -709,7 +714,7 @@ section.hidden { display: none; }
.score__mainline { .score__mainline {
position: relative; 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; } .score__mainline { --row-color: var(--color-01); --row-color-next: var(--color-02); --indent: 0px; --form-indent: 40px; }
...@@ -755,11 +760,15 @@ li.axis { position: relative; } ...@@ -755,11 +760,15 @@ li.axis { position: relative; }
cursor: not-allowed; cursor: not-allowed;
} }
.score__mainline {
top: calc(var(--axis-padding) * -1);
}
.score__mainline ol { padding-left: var(--row-indent); } .score__mainline ol { padding-left: var(--row-indent); }
.score__line { .score__line {
padding-top: var(--axis-padding); padding-top: var(--axis-padding);
padding-bottom: var(--axis-padding); /* padding-bottom: var(--axis-padding); */
} }
.axis-row { .axis-row {
...@@ -788,7 +797,7 @@ li.axis { position: relative; } ...@@ -788,7 +797,7 @@ li.axis { position: relative; }
} }
.score__mainline > .score__line > .axis-row > .axis-row--background-wrapper::before { .score__mainline > .score__line > .axis-row > .axis-row--background-wrapper::before {
left: 36px; left: calc(var(--row-indent) / 2);
} }
...@@ -1184,7 +1193,7 @@ li + li .alt-symbol { display: none; } ...@@ -1184,7 +1193,7 @@ li + li .alt-symbol { display: none; }
} }
.line__condition { .line__condition {
margin-left: 1.4rem; margin-left: 1.93rem;
} }
...@@ -1226,7 +1235,7 @@ li + li .alt-symbol { display: none; } ...@@ -1226,7 +1235,7 @@ li + li .alt-symbol { display: none; }
.line__indications .label, .line__indications .label,
.line__condition .label, .line__condition .label,
.line__terme .label { .line__terme .label {
font-weight: 400; font-weight: 500;
box-shadow: 2px 2px 0 var(--background-color); box-shadow: 2px 2px 0 var(--background-color);
display: none; display: none;
position: absolute; position: absolute;
...@@ -1237,9 +1246,13 @@ li + li .alt-symbol { display: none; } ...@@ -1237,9 +1246,13 @@ li + li .alt-symbol { display: none; }
z-index: 2; z-index: 2;
} }
.line__indications p + p {
margin-top: calc(var(--line-height) / 2);
}
.indications-label { .indications-label {
display: block; /* display: block; */
font-weight: 500; font-weight: 400;
} }
.indications-label:nth-child(n+2) { margin-top: 1em; } .indications-label:nth-child(n+2) { margin-top: 1em; }
...@@ -1517,7 +1530,6 @@ ol[data-alternative]:before { ...@@ -1517,7 +1530,6 @@ ol[data-alternative]:before {
.help__content { .help__content {
color: #173a42; color: #173a42;
background-color: white; background-color: white;
font-size: var(--font-size);
line-height: var(--line-height); line-height: var(--line-height);
} }
...@@ -1616,6 +1628,10 @@ ol[data-alternative]:before { ...@@ -1616,6 +1628,10 @@ ol[data-alternative]:before {
color: var(--button-color-disabled); color: var(--button-color-disabled);
} }
.filter--tags .filter__item:before {
content: "#";
}
.filter__item { .filter__item {
display: inline-block; display: inline-block;
margin-right: 14px; margin-right: 14px;
......
...@@ -54,7 +54,7 @@ window.W.utils = window.W.utils || {}; ...@@ -54,7 +54,7 @@ window.W.utils = window.W.utils || {};
if (string in entries) { if (string in entries) {
return entries[string]; return entries[string];
} else { } else {
// console.log(string + " n'est pas traduit"); console.log(string + " n'est pas traduit");
return string; return string;
} }
} }
......
...@@ -1961,6 +1961,7 @@ window.W = window.W || {}; ...@@ -1961,6 +1961,7 @@ window.W = window.W || {};
this.getRegion('mainline').$el.nestedSortable({ this.getRegion('mainline').$el.nestedSortable({
placeholder: 'axis placeholder', placeholder: 'axis placeholder',
forcePlaceholderSize: true, forcePlaceholderSize: true,
opacity: 0.25,
helper: 'clone', helper: 'clone',
handle: '.icon--handle', handle: '.icon--handle',
isTree: true, isTree: true,
...@@ -1988,8 +1989,6 @@ window.W = window.W || {}; ...@@ -1988,8 +1989,6 @@ window.W = window.W || {};
return n.getAttribute('data-id'); return n.getAttribute('data-id');
}); });
if (_.intersection(parentIds, childrenIds).length > 0) { if (_.intersection(parentIds, childrenIds).length > 0) {
return false 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"> <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> <input class="create__textfield panel-form__textfield" type="text" name="title" placeholder="<%- t('Titre') %>" required>
......
...@@ -31,25 +31,25 @@ ...@@ -31,25 +31,25 @@
<% if (hasIndications) { %> <% if (hasIndications) { %>
<span class="line__indications"> <span class="line__indications">
<span class="label"> <span class="label">
<span class="indication">
<% if (indications) { %> <% 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) { %> <% if (commandement) { %>
<span class="indications-label"><%- t('Commandement') %>:</span> <p><span class="indications-label"><%- t('Commandement') %>: </span>
<%- commandement %> <%- commandement %></p>
<% } %> <% } %>
<% if (destination) { %> <% if (destination) { %>
<span class="indications-label"><%- t('Destination') %>:</span> <p><span class="indications-label"><%- t('Destination') %>: </span>
<%- destination %> <%- destination %></p>
<% } %> <% } %>
<% if (code) { %> <% if (code) { %>
<span class="indications-label"><%- t('Code') %>:</span> <p><span class="indications-label"><%- t('Code') %>: </span>
<%- code %> <%- code %></p>
<% } %> <% } %>
</span> </span>
</span> </span>
......
...@@ -62,10 +62,11 @@ ...@@ -62,10 +62,11 @@
<!-- Permissions --> <!-- Permissions -->
<label> <label>
<span class="label-text"><%- t('Est public?') %>: </span>
<input type="checkbox" name="is_public" <% if (is_public) { %>checked<% } %>> <input type="checkbox" name="is_public" <% if (is_public) { %>checked<% } %>>
<span class="label-text" style="display: inline"><%- t('Publiée?') %>: </span>
</label> </label>
<span class="label-text"><%- t('Partager avec') %>: </span>
<div id="share_with"></div> <div id="share_with"></div>
<button data-name="close"><%- t('Annuler') %></button> <button data-name="close"><%- t('Annuler') %></button>
......
...@@ -100,12 +100,14 @@ ...@@ -100,12 +100,14 @@
<% } %> <% } %>
<dl class="score-meta"> <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> <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> <dd class="score-meta__def"><%- formatTimestamp(updated_at) %></dd>
</dl> </dl>
<p><% if (is_public) { %>Cette partition est public<% } else { %>Cette partition est privée<% } %></p>
{% comment %} {% comment %}
<dl class="score-meta"> <dl class="score-meta">
<dt class="score-meta__term score-meta__term--inline"><%- t('Créé par') %></dt> <dt class="score-meta__term score-meta__term--inline"><%- t('Créé par') %></dt>
...@@ -118,11 +120,16 @@ ...@@ -118,11 +120,16 @@
<% } %> <% } %>
</ul> </ul>
</dd> </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> <dd class="score-meta__def"><%- is_public %></dd>
</dl> </dl>
{% endcomment %} {% 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> <div id="permissions"></div>
<form></form> <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