Skip to content

GitLab

Commit 13f5db9f authored by Arnaud Bey's avatar Arnaud Bey
Browse files

WIP bootstrap 4

parent b7c30f05
Expand all Hide whitespace changes
Inline Side-by-side
application/package-lock.json
View file @ 13f5db9f
This diff is collapsed.
application/src/MagicWordBundle/Resources/public/css/main.css
View file @ 13f5db9f
......@@ -25,8 +25,8 @@
font-weight: bold;
}
.panel-heading {
font-family: 'bloggersans', Arial, sans-serif;
.card-header {
/*font-family: 'bloggersans', Arial, sans-serif;*/
text-transform: uppercase;
}
......@@ -45,7 +45,6 @@ body {
}
div#header-logo {
//background-color: #005497;
background-color: #A7CB19;
background-image: url(../img/logo.png);
background-repeat: no-repeat;
......@@ -53,7 +52,6 @@ div#header-logo {
background-position: 25% 50%;
width: 100%;
height: 90px;
//border-bottom: 2px solid white;
}
.header-buttons {
......@@ -64,57 +62,20 @@ div#header-logo {
.noselect {
-webkit-touch-callout: none;
/* iOS Safari */
-webkit-user-select: none;
/* Chrome/Safari/Opera */
-khtml-user-select: none;
/* Konqueror */
-moz-user-select: none;
/* Firefox */
-ms-user-select: none;
/* Internet Explorer/Edge */
user-select: none;
/* Non-prefixed version, currently not supported by any browser */
}
#please-wait .modal-body {
#please-wait .modal-body, #info-modal .modal-body {
text-align: center;
background-color: white;
color: black;
text-transform: uppercase;
}
#info-modal .modal-body {
text-align: center;
background-color: white;
color: black;
text-transform: uppercase;
}
.vertical-alignment-helper {
display: table;
height: 100%;
width: 100%;
pointer-events: none;
/* This makes sure that we can still click outside of the modal to close it */
}
.vertical-align-center {
/* To center vertically */
display: table-cell;
vertical-align: middle;
pointer-events: none;
}
.modal-content {
/* Bootstrap sets the size of the modal in the modal-dialog class, we need to inherit it */
width: inherit;
height: inherit;
/* To center horizontally */
margin: 0 auto;
pointer-events: all;
}
#footer {
background-color: #222222;
color: #999;
......@@ -128,6 +89,7 @@ div#header-logo {
padding-right: 40px;
}
/* vimeo video container*/
.embed-container {
position: relative;
padding-bottom: 56.25%;
......
application/src/MagicWordBundle/Resources/views/Administration/combopoint-edit.html.twig
View file @ 13f5db9f
......@@ -5,10 +5,8 @@
{% block body -%}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ "combopoints" | trans }} - {{ combopoints.length }}
</h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ "combopoints" | trans }} - {{ combopoints.length }}
</div>
<div class="card-body">
{{ form(form) }}
......
application/src/MagicWordBundle/Resources/views/Common/details-modal.html.twig
View file @ 13f5db9f
<div class="modal fade" id="round-details-modal" tabindex="-1" role="dialog" aria-labelledby="round-details-modal">
<div class="vertical-alignment-helper">
<div class="modal-dialog vertical-align-center" role="document">
<div class="modal-content ">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">{{ "details" | trans }}</h4>
</div>
<div class="modal-body details">
</div>
</div>
</div>
<div id="round-details-modal" class="modal fade" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="myModalLabel">{{ "details" | trans }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body details">
</div>
</div>
</div>
</div>
application/src/MagicWordBundle/Resources/views/Game/Massive/form.html.twig
View file @ 13f5db9f
......@@ -5,16 +5,14 @@
{% block body -%}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'new_massive' | trans }}
<span class="pull-right">
<a class="btn btn-outline-secondary" href="{{ path('json_import_form') }}">
<i class="fa fa-caret-square-o-right" aria-hidden="true"></i>
{{ "json_import" | trans }}
</a>
</span>
</h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'new_massive' | trans }}
<span class="pull-right">
<a class="btn btn-outline-secondary" href="{{ path('json_import_form') }}">
<i class="fa fa-caret-square-o-right" aria-hidden="true"></i>
{{ "json_import" | trans }}
</a>
</span>
</div>
<div class="card-body">
{{ form(form) }}
......
application/src/MagicWordBundle/Resources/views/Game/Massive/list.html.twig
View file @ 13f5db9f
......@@ -5,24 +5,22 @@
{% block body -%}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'massives' | trans }}
<span class="pull-right">
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('popularity', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "popularity" | trans }}
</button>
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('roundCount', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "roundCount" | trans }}
</button>
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('author', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "author" | trans }}
</button>
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('date', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "date" | trans }}
</button>
</span>
</h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'massives' | trans }}
<span class="pull-right">
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('popularity', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "popularity" | trans }}
</button>
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('roundCount', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "roundCount" | trans }}
</button>
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('author', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "author" | trans }}
</button>
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('date', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "date" | trans }}
</button>
</span>
</div>
<div class="panel-group games" id="accordion" role="tablist" aria-multiselectable="true">
{% for massive in massives if massive not in app.user.endedGames and massive not in app.user.startedGames and massive.author != app.user %}
......
application/src/MagicWordBundle/Resources/views/Game/Massive/my-list.html.twig
View file @ 13f5db9f
......@@ -5,10 +5,8 @@
{% block body -%}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'my_massives_under_construction' | trans }}
</h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'my_massives_under_construction' | trans }}
</div>
<ul class="list-group">
{% for massive in massives %}
......
application/src/MagicWordBundle/Resources/views/Game/Massive/my-published-list.html.twig
View file @ 13f5db9f
......@@ -5,10 +5,8 @@
{% block body -%}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'my_massives_published' | trans }}
</h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'my_massives_published' | trans }}
</div>
<ul class="list-group">
{% for massive in massives %}
......
application/src/MagicWordBundle/Resources/views/Game/Massive/partials/export-modal.html.twig
View file @ 13f5db9f
<div class="modal fade" id="export-modal" tabindex="-1" role="dialog" aria-labelledby="export-modal">
<div class="vertical-alignment-helper">
<div class="modal-dialog vertical-align-center" role="document">
<div class="modal-content ">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">{{ "export_game" | trans }}</h4>
</div>
<div class="modal-body">
<textarea style="width:100%; height:200px;" id="json-export"></textarea>
</div>
</div>
</div>
<div class="modal fade" id="export-modal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 id="myModalLabel" class="modal-title">{{ "export_game" | trans }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<textarea style="width:100%; height:200px;" id="json-export"></textarea>
</div>
</div>
</div>
</div>
application/src/MagicWordBundle/Resources/views/Game/end.html.twig
View file @ 13f5db9f
......@@ -5,19 +5,17 @@
{% block body -%}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'game_end' | trans }} <strong>{{ massive.name }}</strong>
</h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'game_end' | trans }} <strong>{{ massive.name }}</strong>
</div>
<div class="card-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs " role="tablist">
<li role="presentation" class="active"><a href="#ranking" aria-controls="ranking" role="tab" data-toggle="tab">{{ "ranking" | trans }}</a></li>
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#ranking" aria-controls="ranking" role="tab" data-toggle="tab">{{ "ranking" | trans }}</a></li>
</ul>
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="ranking">
<div role="tabpanel" class="tab-pane active show" id="ranking">
{% include "MagicWordBundle:Game/Massive/partials:ranking.html.twig" %}
</div>
</div>
......
application/src/MagicWordBundle/Resources/views/Game/ended.html.twig
View file @ 13f5db9f
......@@ -6,17 +6,15 @@
{% import _self as my_macros %}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'rankings' | trans }}
</h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'rankings' | trans }}
</div>
<!-- Nav tabs -->
<ul class="nav nav-tabs nav-justified" role="tablist">
<li role="presentation" class="active"><a href="#massives" aria-controls="massives" role="tab" data-toggle="tab">{{ "massives" | trans }}</a></li>
<li role="presentation"><a href="#challenges" aria-controls="challenges" role="tab" data-toggle="tab">{{"challenges" | trans }}</a></li>
<li role="presentation"><a href="#ranking" aria-controls="ranking" role="tab" data-toggle="tab">{{ "ranking" | trans}}</a></li>
<li class="nav-item" role="presentation"><a class="nav-link active" href="#massives" aria-controls="massives" role="tab" data-toggle="tab">{{ "massives" | trans }}</a></li>
<li class="nav-item" role="presentation"><a class="nav-link" href="#challenges" aria-controls="challenges" role="tab" data-toggle="tab">{{"challenges" | trans }}</a></li>
<li class="nav-item" role="presentation"><a class="nav-link" href="#ranking" aria-controls="ranking" role="tab" data-toggle="tab">{{ "ranking" | trans}}</a></li>
</ul>
<!-- Tab panes -->
......
application/src/MagicWordBundle/Resources/views/Game/import.html.twig
View file @ 13f5db9f
......@@ -3,15 +3,13 @@
{% block body -%}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'json_import' | trans }}
<span class="pull-right">
<a class="btn btn-outline-secondary" href="{{ path('massive') }}">
<i class="fa fa-plus" aria-hidden="true"></i> {{ 'new_massive' | trans }}
</a>
</span>
</h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'json_import' | trans }}
<span class="pull-right">
<a class="btn btn-outline-secondary" href="{{ path('massive') }}">
<i class="fa fa-plus" aria-hidden="true"></i> {{ 'new_massive' | trans }}
</a>
</span>
</div>
<div class="card-body">
<textarea required="required" id="import-json" style="width:100%; height:200px;"></textarea>
......
application/src/MagicWordBundle/Resources/views/Game/started.html.twig
View file @ 13f5db9f
......@@ -6,24 +6,22 @@
{% import _self as my_macros %}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'games_started' | trans }}
<span class="pull-right">
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('gametype', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "gametype" | trans }}
</button>
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('popularity', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "popularity" | trans }}
</button>
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('roundCount', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "roundCount" | trans }}
</button>
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('author', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "author" | trans }}
</button>
</span>
</h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'games_started' | trans }}
<span class="pull-right">
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('gametype', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "gametype" | trans }}
</button>
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('popularity', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "popularity" | trans }}
</button>
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('roundCount', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "roundCount" | trans }}
</button>
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('author', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "author" | trans }}
</button>
</span>
</div>
<div class="panel-group games" id="accordion" role="tablist" aria-multiselectable="true">
{% for game in games if game.discr != "training" %}
......
application/src/MagicWordBundle/Resources/views/Grid/grid-pattern-edit.html.twig
View file @ 13f5db9f
{% import _self as macros %}
<span onclick="gridPatternHandler.list();" class="btn btn-outline-secondary">
<span onclick="gridPatternHandler.list();" class="btn btn-sm btn-outline-secondary">
<i class="fa fa-chevron-left" aria-hidden="true"></i>
{{"back_to_patterns_list" | trans}}
</span>
<span id="pattern-save-btn" onclick="{{ pattern.id ? "gridPatternHandler.save()" : "gridPatternHandler.create()"}}" class="btn btn-primary">
<span id="pattern-save-btn" onclick="{{ pattern.id ? "gridPatternHandler.save()" : "gridPatternHandler.create()"}}" class="btn btn-sm btn-primary">
<i class="fa fa-floppy-o" aria-hidden="true"></i>
{{ "save" | trans }}
</span>
......
application/src/MagicWordBundle/Resources/views/Grid/grid-pattern-list.html.twig
View file @ 13f5db9f
<span class="btn btn-outline-secondary btn-outline-secondary" onclick="gridPatternHandler.displayCreateForm()">
<span class="btn btn-outline-secondary btn-sm" onclick="gridPatternHandler.displayCreateForm()">
<i class="fa fa-plus" aria-hidden="true"></i>
{{ "pattern_create" | trans }}
</span>
......
application/src/MagicWordBundle/Resources/views/Lexicon/root.html.twig
View file @ 13f5db9f
......@@ -3,15 +3,13 @@
{% block body -%}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ "lemma_info" | trans}} <strong>{{ root.value }}</strong>
<span class="pull-right">
{% if isInWordbox(root) == false %}
<a class="btn btn-outline-secondary" href="{{ path('add-to-wordbox', {"id": root.id }) }}">{{ "add_to_wordbox" | trans}}</a>
{% endif %}
</span>
</h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ "lemma_info" | trans}} <strong>{{ root.value }}</strong>
<span class="pull-right">
{% if isInWordbox(root) == false %}
<a class="btn btn-outline-secondary" href="{{ path('add-to-wordbox', {"id": root.id }) }}">{{ "add_to_wordbox" | trans}}</a>
{% endif %}
</span>
</div>
<div class="card-body">
{#
......
application/src/MagicWordBundle/Resources/views/Lexicon/word.html.twig
View file @ 13f5db9f
......@@ -3,13 +3,11 @@
{% block body -%}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ "inflexion_info" | trans}} {{ word.value }}
<span class="pull-right">
<a class="btn btn-outline-secondary" href="{{ path('add-to-wordbox', {"id": word.root.id }) }}">{{ "add_to_wordbox" | trans}}</a>
</span>
</h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ "inflexion_info" | trans}} {{ word.value }}
<span class="pull-right">
<a class="btn btn-outline-secondary" href="{{ path('add-to-wordbox', {"id": word.root.id }) }}">{{ "add_to_wordbox" | trans}}</a>
</span>
</div>
<div class="card-body">
<h2>{{ "root" | trans}}</h2>
......
application/src/MagicWordBundle/Resources/views/Player/friends.html.twig
View file @ 13f5db9f
......@@ -3,10 +3,8 @@
{% block body -%}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'my_friends' | trans }}
</h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'my_friends' | trans }}
</div>
<ul class="list-group">
{% for player in app.user.friends %}
......
application/src/MagicWordBundle/Resources/views/Player/parameters.html.twig
View file @ 13f5db9f
......@@ -3,13 +3,11 @@
{% block body -%}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'parameters' | trans }}
<span class="pull-right">
<a class="btn btn-outline-secondary"href="{{ path('fos_user_change_password') }}">{{ 'edit_password' | trans }}</a>
<a class="btn btn-sm btn-outline-secondary"href="{{ path('fos_user_change_password') }}">{{ 'edit_password' | trans }}</a>
</span>
</h4>
</div>
<div class="card-body">
{{ form_start(form) }}
......
application/src/MagicWordBundle/Resources/views/Player/profile.html.twig
View file @ 13f5db9f
......@@ -3,28 +3,26 @@
{% block body -%}
<div class="card">
<div class="card-header">
<h4>
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'profile_of' | trans }} {{ user.username }}
<span class="pull-right">
{% if user == app.user %}
<a class="btn btn-outline-secondary" href="{{ path('profile_edit') }}">
<a class="btn btn-outline-secondary btn-sm" href="{{ path('profile_edit') }}">
<i class="fa fa-pencil-square-o" aria-hidden="true"></i>
{{ 'edit_profile' | trans }}
</a>
{% else %}
<a class="btn btn-outline-secondary" href="{{ path('challenge_someone', {"id": user.id}) }}">
<a class="btn btn-outline-secondary btn-sm" href="{{ path('challenge_someone', {"id": user.id}) }}">
<i class="fa fa-bolt" aria-hidden="true"></i>
{{ 'challenge!' | trans }}
</a>
{% if user in app.user.friends %}
<a class="btn btn-outline-secondary" href="{{ path('remove_friend', {"id": user.id}) }}">{{ 'remove__from_friends' | trans }}</a>
<a class="btn btn-outline-secondary btn-sm" href="{{ path('remove_friend', {"id": user.id}) }}">{{ 'remove__from_friends' | trans }}</a>
{% else %}
<a class="btn btn-outline-secondary" href="{{ path('add_friend', {"id": user.id}) }}">{{ 'add_to_friends' | trans }}</a>
<a class="btn btn-outline-secondary btn-sm" href="{{ path('add_friend', {"id": user.id}) }}">{{ 'add_to_friends' | trans }}</a>
{% endif %}
{% endif %}
</span>
</h4>
</div>
<div class="card-body">
{% if user.profilepicPath %}
......
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