Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 38b4a8dd authored by Arnaud Bey's avatar Arnaud Bey
Browse files

misc. fixes

parent 13f5db9f
......@@ -30,6 +30,11 @@
text-transform: uppercase;
}
.card-header .btn{
/*font-family: 'bloggersans', Arial, sans-serif;*/
text-transform: none;
}
.container {
padding-top: 15px;
}
......
......@@ -17,7 +17,9 @@
<div class="card">
<div data-toggle="collapse" data-target="#{{ type ~ '-' ~ foundable.id }}" class="btn card-header {% if activity and foundable in activity.foundForms and type == "foundable" %}bg-success{% endif %}" >
{{ foundable.form | upper }} <span class="text-muted">({{ foundable.points}})</span>
<span class="pull-right">{{ percent }}</span>
<span class="pull-right">
<span class="badge badge-light">{{ percent }}</span>
</span>
</div>
<div id="{{ type ~ '-' ~ foundable.id }}" class="collapse" data-parent="#accordion{{type}}">
<ul class="list-group list-group-flush">
......@@ -25,13 +27,13 @@
<li class="list-group-item">
{{ inflection.value }} ({{ inflection.root.value }})
<span class="pull-right">
<span class="btn btn-sm" onClick="wiktionnary.getDef('{{ inflection.root.value }}', '{{ foundable.grid.language.value |slice(0,2) }}')">
<button role="button" class="btn btn-sm" onClick="wiktionnary.getDef('{{ inflection.root.value }}', '{{ foundable.grid.language.value |slice(0,2) }}')">
<i class="fa fa-wikipedia-w" aria-hidden="true"></i>
</span>
</button>
{% if isInWordbox(inflection.root) == false %}
<span class="btn btn-sm" onclick="addToWordbox({{ inflection.root.id }}, this);">
<button class="btn btn-sm" onclick="addToWordbox({{ inflection.root.id }}, this);">
<i class="fa fa-plus" aria-hidden="true"></i>
</span>
</button>
{% endif %}
</span>
</li>
......
......@@ -19,7 +19,11 @@
</div>
<div class="card-body">
<ul class="nav nav-tabs nav-fill" role="tablist">
<li class="active nav-item"><a href="#rounds" class="nav-link" aria-controls="rounds" role="tab" data-toggle="tab">{{ "rounds" | trans }}</a></li>
<li class="nav-item">
<a href="#rounds" class="nav-link active" aria-controls="rounds" role="tab" data-toggle="tab">
{{ "rounds" | trans }} ({{ massive.rounds|length }})
</a>
</li>
<li class="nav-item"><a href="#misc" class="nav-link" aria-controls="misc" role="tab" data-toggle="tab">{{ "properties" | trans }}</a></li>
</ul>
......@@ -27,7 +31,7 @@
<div class="tab-pane fade show active" id="rounds">
<div class="row">
<div class="col mt-3">
<h5>{{ 'round' | trans }} ({{ massive.rounds|length }})
<h5>
<button type="button" class="btn btn-sm btn-secondary dropdown-toggle" data-toggle="dropdown" id="dropdownMenuButton" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-plus" aria-hidden="true"></i> {{ 'add_round' | trans }}
</button>
......@@ -54,7 +58,7 @@
<i class="fa fa-arrow-down" aria-hidden="true"></i>
</a>
</div>
<a class="btn btn-outline-secondary btn-sm" href="{{ path('round_edit', {"id": round.id }) }}">
<a class="btn btn-secondary btn-sm" href="{{ path('round_edit', {"id": round.id }) }}">
<i class="fa fa-pencil" aria-hidden="true"></i>
{{ 'edit_round' | trans }}
</a>
......@@ -71,7 +75,6 @@
<div class="tab-pane fade" id="misc">
<div class="row">
<div class="col mt-3">
<h5>Propriétés</h5>
{{ form(form) }}
</div>
</div>
......
......@@ -40,22 +40,19 @@
<div class="row">
<div class="col-5">
<div class="card">
<div class="card-header">
{{ 'grid' | trans }}
<span class="pull-right">
<span class="btn btn-outline-secondary btn-sm" onclick="gridPatternHandler.list()">
<i class="fa fa-magic" aria-hidden="true"></i>
{{ 'patterns' | trans }}
</span>
<span class="btn btn-outline-secondary btn-sm" onclick="gridHandler.autofill()">
<i class="fa fa-magic" aria-hidden="true"></i>
{{ 'autofill_grid' | trans }}
</span>
<span class='btn btn-primary btn-sm' onclick="gridHandler.save()">
<i class="fa fa-floppy-o" aria-hidden="true"></i>
{{ 'save_grid' | trans }}
</span>
</span>
<div class="card-header text-center">
<span class="btn btn-outline-secondary btn-sm" onclick="gridPatternHandler.list()">
<i class="fa fa-magic" aria-hidden="true"></i>
{{ 'patterns' | trans }}
</span>
<span class="btn btn-outline-secondary btn-sm" onclick="gridHandler.autofill()">
<i class="fa fa-magic" aria-hidden="true"></i>
{{ 'autofill_grid' | trans }}
</span>
<span class='btn btn-primary btn-sm' onclick="gridHandler.save()">
<i class="fa fa-floppy-o" aria-hidden="true"></i>
{{ 'save_grid' | trans }}
</span>
</div>
<div class="card-body">
<div id="language-inconsistency" style="display:none" class="alert alert-warning" role="alert">
......
<div class="alert alert-success text-center" role="alert">
<div class="alert alert-success text-center p-4" role="alert">
<h1>Votre score est de {{ activity.points }} points !</h1>
{% if round.discr == "rush" and activity.comboPoints != 0 %}
dont {{ activity.comboPoints }} points de bonus de combo
......
......@@ -10,20 +10,22 @@
<div class="card">
<div class="card-header">
Récapitulatif manche {{ round.displayOrder + 1 }} / {{ round.game.rounds|length}} - {{ gameType | trans }}
Manche {{ round.displayOrder + 1 }} / {{ round.game.rounds|length}} - {{ gameType | trans }}
<span class="pull-right">
{% include "MagicWordBundle:Round/End:next-"~gameType~".html.twig" %}
</span>
</div>
<div class="card-body">
<div class="jumbotron">
<div class="row">
<div class="col">
{% include "MagicWordBundle:Round/End:summary.html.twig" %}
</div>
<div class="col">
{% include "MagicWordBundle:Round/End:grid.html.twig" %}
</div>
<div class="jumbotron jumbotron-fluid p-1">
<div class="container">
<div class="row">
<div class="col m-auto">
{% include "MagicWordBundle:Round/End:summary.html.twig" %}
</div>
<div class="col m-auto">
{% include "MagicWordBundle:Round/End:grid.html.twig" %}
</div>
</div>
</div>
</div>
......@@ -92,7 +94,3 @@
</div>
</div>
{% endblock %}
{% block javascripts -%}
<script type="text/javascript" src="{{ asset('js/round.js') }}"></script>
{% endblock %}
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