Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mathieu Loiseau
MagicWord
Commits
77d17d2c
Commit
77d17d2c
authored
May 20, 2019
by
Arnaud Bey
Browse files
fixes...
parent
38b4a8dd
Changes
4
Hide whitespace changes
Inline
Side-by-side
application/src/MagicWordBundle/Resources/public/css/play.css
View file @
77d17d2c
...
...
@@ -96,13 +96,6 @@
border-bottom
:
lightgrey
1px
dotted
;
}
#objectives
{
width
:
100%
;
height
:
100px
;
border-radius
:
3px
;
margin-bottom
:
2%
;
}
#inflections-found
{
font-family
:
'bloggersans'
,
Arial
,
sans-serif
;
display
:
block
;
...
...
application/src/MagicWordBundle/Resources/views/Game/Massive/builder.html.twig
View file @
77d17d2c
...
...
@@ -31,7 +31,7 @@
<div
class=
"tab-pane fade show active"
id=
"rounds"
>
<div
class=
"row"
>
<div
class=
"col mt-3"
>
<h5>
<h5
class=
"text-right"
>
<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>
...
...
@@ -44,10 +44,9 @@
<ul
class=
"list-group"
>
{%
for
i
,
round
in
massive.rounds
%}
<li
class=
"list-group-item round"
>
<span
class=
"label label-default"
>
{{
round.discr
|
trans
}}
</span>
<span
class=
"label label-default"
>
{{
round.language.value
|
trans
}}
</span>
{%
set
order
=
i
+
1
%}
{{
round.title
?
round.title
:
"round"
|
trans
~
" "
~
order
}}
{{
order
}}
-
{{
round.discr
|
trans
}}
-
{{
round.language.value
|
trans
}}
-
{{
round.title
?
round.title
:
"(pas de titre)"
}}
{%
if
round.description
%}
<span
class=
"text-muted"
>
(
{{
round.description
}}
)
</span>
{%
endif
%}
<span
class=
"pull-right btns"
>
<div
class=
"btn-group"
>
...
...
application/src/MagicWordBundle/Resources/views/Round/Conquer/edit.html.twig
View file @
77d17d2c
{%
set
hasObj
=
conquer.objectives
|
length
>
0
?
true
:
false
%}
<div
class=
"row"
>
{# OBJECTIVES #}
<div
class=
"row mb-3"
>
<div
class=
"col"
>
<ul
class=
"nav nav-tabs nav-justified nav-fill"
role=
"tablist"
>
<li
role=
"presentation"
class=
"nav-item"
>
...
...
@@ -71,7 +73,7 @@
</div>
<div
id=
"foundables"
class=
"col"
>
{%
if
grid.foundableForms
is
defined
%}
{%
include
'MagicWordBundle:Grid:possible-inflections.html.twig'
with
{
'foundableForms'
:
grid.foundableForms
,
'btn'
:
true
}
%}
{%
include
'MagicWordBundle:Grid:possible-inflections.html.twig'
with
{
'foundableForms'
:
grid.foundableForms
,
'btn'
:
true
}
%}
{%
endif
%}
</div>
</div>
...
...
application/src/MagicWordBundle/Resources/views/Round/misc.html.twig
View file @
77d17d2c
{{
form
(
miscForm
)
}}
<span
class=
"btn btn-primary"
onclick=
"roundHandler.saveMisc()"
>
Sauvegarder
</span>
<span
class=
"btn btn-primary
mt-2
"
onclick=
"roundHandler.saveMisc()"
>
Sauvegarder
</span>
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment