Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mathieu Loiseau
MagicWord
Commits
01f6dac4
Commit
01f6dac4
authored
May 23, 2019
by
Arnaud Bey
Browse files
fix colors, some btns, etc.
parent
026914f3
Changes
15
Hide whitespace changes
Inline
Side-by-side
application/app/Resources/views/base.html.twig
View file @
01f6dac4
...
...
@@ -23,23 +23,25 @@
<div
class=
"header-buttons"
>
<div
class=
"btn-group-sm btn-group-vertical"
>
{%
if
logged
%}
<a
href=
"
{{
path
(
'fos_user_security_logout'
)
}}
"
class=
"btn btn-
prim
ary btn-sm"
>
<a
href=
"
{{
path
(
'fos_user_security_logout'
)
}}
"
class=
"btn btn-
second
ary btn-sm"
>
<i
class=
"fas fa-sign-out-alt"
></i>
<span
class=
"
hidden-xs
"
>
{{
'logout'
|
trans
}}
</span>
<span
class=
"
d-none d-md-inline
"
>
{{
'logout'
|
trans
}}
</span>
</a>
{%
if
is_granted
(
'ROLE_ADMIN'
)
%}
<a
class=
"btn btn-primary btn-sm"
href=
"
{{
path
(
'admin_index'
)
}}
"
>
Administration
</a>
<a
class=
"btn btn-secondary btn-sm"
href=
"
{{
path
(
'admin_index'
)
}}
"
>
<i
class=
"fas fa-tools"
></i>
Administration
</a>
{%
endif
%}
{%
else
%}
{%
if
getGeneralParameters
()
.
selfRegistration
%}
<a
href=
"
{{
path
(
'fos_user_registration_register'
)
}}
"
class=
"btn btn-
prim
ary btn-sm"
>
<a
href=
"
{{
path
(
'fos_user_registration_register'
)
}}
"
class=
"btn btn-
second
ary btn-sm"
>
<i
class=
"fa fa-user-plus"
aria-hidden=
"true"
></i>
<span
class=
"
hidden-xs
"
>
{{
'register'
|
trans
}}
</span>
<span
class=
"
d-none d-md-inline
"
>
{{
'register'
|
trans
}}
</span>
</a>
{%
endif
%}
<a
href=
"
{{
path
(
'fos_user_security_login'
)
}}
"
class=
"btn btn-
prim
ary btn-sm"
>
<a
href=
"
{{
path
(
'fos_user_security_login'
)
}}
"
class=
"btn btn-
second
ary btn-sm"
>
<i
class=
"fas fa-sign-in-alt"
></i>
<span
class=
"
hidden-xs
"
>
{{
'login'
|
trans
}}
</span>
<span
class=
"
d-none d-md-inline
"
>
{{
'login'
|
trans
}}
</span>
</a>
{%
endif
%}
</div>
...
...
@@ -83,10 +85,10 @@
<div
id=
"users-device-size"
>
<div
id=
"xs"
class=
"d-block d-sm-none"
></div>
<div
id=
"sm"
class=
"d-none d-sm-
block
d-md-none"
></div>
<div
id=
"md"
class=
"d-none d-md-
block
d-lg-none"
></div>
<div
id=
"lg"
class=
"d-none d-lg-
block
d-xl-none"
></div>
<div
id=
"xl"
class=
".d-none d-xl-
block
"
></div>
<div
id=
"sm"
class=
"d-none d-sm-
inline
d-md-none"
></div>
<div
id=
"md"
class=
"d-none d-md-
inline
d-lg-none"
></div>
<div
id=
"lg"
class=
"d-none d-lg-
inline
d-xl-none"
></div>
<div
id=
"xl"
class=
".d-none d-xl-
inline
"
></div>
</div>
<script
type=
"text/javascript"
src=
"
{{
asset
(
'js/translations.js'
)
}}
"
></script>
...
...
application/src/MagicWordBundle/Resources/public/css/main.css
View file @
01f6dac4
...
...
@@ -35,6 +35,22 @@
text-transform
:
none
;
}
.btn-primary
{
background-color
:
#A7CB19
;
color
:
black
;
border-color
:
#A7CB19
;
}
.btn-primary
:hover
{
background-color
:
white
;
color
:
black
;
border-color
:
#A7CB19
;
}
a
{
color
:
#1822fb
;
}
.container
{
padding-top
:
15px
;
}
...
...
application/src/MagicWordBundle/Resources/views/Administration/combopoints.html.twig
View file @
01f6dac4
...
...
@@ -13,7 +13,7 @@
{{
combopoint.length
}}
{{
'forms'
|
trans
}}
-
{{
combopoint.points
}}
pts
<span
class=
"float-right"
>
<a
href=
"
{{
path
(
'combopoint_edit'
,
{
"id"
:
combopoint.id
}
)
}}
"
class=
"btn btn-outline-secondary btn-sm"
>
<i
class=
"fa fa-
pencil
"
aria-hidden=
"true"
></i>
Editer
<i
class=
"fa
s
fa-
edit
"
aria-hidden=
"true"
></i>
Editer
</a>
</span>
</li>
...
...
application/src/MagicWordBundle/Resources/views/Administration/general-parameters.html.twig
View file @
01f6dac4
...
...
@@ -9,7 +9,7 @@
{{
"general_parameters"
|
trans
}}
<span
class=
"float-right"
>
<a
class=
"btn btn-sm btn-outline-secondary"
href=
"
{{
path
(
'general_parameters_edit'
)
}}
"
>
<i
class=
"fa fa-
pencil
"
aria-hidden=
"true"
></i>
<i
class=
"fa
s
fa-
edit
"
aria-hidden=
"true"
></i>
{{
"edit"
|
trans
}}
</a>
</span>
...
...
application/src/MagicWordBundle/Resources/views/Administration/letterslanguage.html.twig
View file @
01f6dac4
...
...
@@ -13,7 +13,7 @@
{{
letter.value
|
upper
}}
-
{{
letter.value
}}
-
{{
letter.points
}}
pts
<span
class=
"float-right"
>
<a
href=
"
{{
path
(
'letter_edit'
,
{
"id"
:
letter.id
}
)
}}
"
class=
"btn btn-outline-secondary btn-sm"
>
<i
class=
"fa fa-
pencil
"
aria-hidden=
"true"
></i>
Editer
<i
class=
"fa
s
fa-
edit
"
aria-hidden=
"true"
></i>
Editer
</a>
</span>
</li>
...
...
application/src/MagicWordBundle/Resources/views/Administration/wordlength.html.twig
View file @
01f6dac4
...
...
@@ -13,7 +13,7 @@
{{
wordlength.length
}}
lettres -
{{
wordlength.points
}}
pts
<span
class=
"float-right"
>
<a
href=
"
{{
path
(
'wordlength_edit'
,
{
"id"
:
wordlength.id
}
)
}}
"
class=
"btn btn-outline-secondary btn-sm"
>
<i
class=
"fa fa-
pencil
"
aria-hidden=
"true"
></i>
Editer
<i
class=
"fa
s
fa-
edit
"
aria-hidden=
"true"
></i>
Editer
</a>
</span>
</li>
...
...
application/src/MagicWordBundle/Resources/views/Game/Massive/builder.html.twig
View file @
01f6dac4
...
...
@@ -17,12 +17,12 @@
<div
class=
"card-header"
>
<span
class=
"float-right"
>
<span
class=
"btn btn-outline-secondary btn-sm"
onclick=
"builder.export(
{{
massive.id
}}
)"
>
<i
class=
"fa fa-
clipboard"
aria-hidden=
"true
"
></i>
{{
"export_game"
|
trans
}}
<i
class=
"fa
s
fa-
file-export
"
></i>
Exporter
</span>
<a
class=
"btn btn-outline-secondary btn-sm"
href=
"
{{
path
(
'massive_publish'
,
{
"id"
:
massive.id
}
)
}}
"
>
<i
class=
"fa fa-c
aret-square-o-right"
aria-hidden=
"true
"
></i>
Publier
la partie
<i
class=
"fa
s
fa-c
lipboard-check
"
></i>
Publier
</a>
</span>
</div>
...
...
@@ -71,8 +71,8 @@
</a>
</div>
<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
}}
<i
class=
"fa
s
fa-
edit
"
aria-hidden=
"true"
></i>
<span
class=
"d-none d-md-inline"
>
{{
'edit_round'
|
trans
}}
</span>
</a>
<a
class=
"btn btn-sm btn-danger"
href=
"
{{
path
(
'massive_remove_round'
,
{
"massiveId"
:
massive.id
,
"roundId"
:
round.id
}
)
}}
"
>
<i
class=
"fa fa-times"
aria-hidden=
"true"
></i>
...
...
application/src/MagicWordBundle/Resources/views/Game/Massive/form.html.twig
View file @
01f6dac4
...
...
@@ -16,7 +16,7 @@
<div
class=
"card-header"
>
<span
class=
"float-right"
>
<a
class=
"btn btn-outline-secondary"
href=
"
{{
path
(
'json_import_form'
)
}}
"
>
<i
class=
"fa fa-
caret-square-o-right"
aria-hidden=
"true
"
></i>
<i
class=
"fa
s
fa-
file-upload
"
></i>
{{
"json_import"
|
trans
}}
</a>
</span>
...
...
application/src/MagicWordBundle/Resources/views/Game/Massive/list.html.twig
View file @
01f6dac4
...
...
@@ -41,15 +41,15 @@
<span
class=
"float-right"
>
<span
class=
"label label-info"
>
<i
class=
"fa fa-users"
aria-hidden=
"true"
></i>
<span
class=
"
hidden-xs
"
>
{{
"popularity"
|
trans
}}
:
</span>
{{
popularity
}}
<span
class=
"
d-none d-md-block
"
>
{{
"popularity"
|
trans
}}
:
</span>
{{
popularity
}}
</span>
<a
class=
"btn btn-outline-secondary btn-sm"
role=
"button"
data-toggle=
"collapse"
data-parent=
"#accordion"
href=
"#
{{
massive.id
}}
"
aria-expanded=
"true"
aria-controls=
"
{{
massive.id
}}
"
>
<i
class=
"fa fa-info"
aria-hidden=
"true"
></i>
<span
class=
"
hidden-xs
"
>
Infos
</span>
<span
class=
"
d-none d-md-block
"
>
Infos
</span>
</a>
<a
class=
"btn btn-outline-secondary btn-sm"
href=
"
{{
path
(
'massive_play'
,
{
"code"
:
massive.code
}
)
}}
"
>
<i
class=
"fa fa-gamepad"
aria-hidden=
"true"
></i>
<span
class=
"
hidden-xs
"
>
Jouer
</span>
<span
class=
"
d-none d-md-block
"
>
Jouer
</span>
</a>
</span>
</h4>
...
...
application/src/MagicWordBundle/Resources/views/Game/Massive/my-published-list.html.twig
View file @
01f6dac4
...
...
@@ -22,7 +22,7 @@
<span
class=
"float-right"
>
<span
class=
"label label-info"
>
<i
class=
"fa fa-users"
aria-hidden=
"true"
></i>
<span
class=
"
hidden-xs
"
>
{{
"popularity"
|
trans
}}
:
</span>
{{
getActivityCount
(
massive
)
}}
<span
class=
"
d-none d-md-block
"
>
{{
"popularity"
|
trans
}}
:
</span>
{{
getActivityCount
(
massive
)
}}
</span>
<span
class=
"label label-default"
>
{{
massive.accessType.name
|
trans
}}
...
...
application/src/MagicWordBundle/Resources/views/Grid/grid-pattern-list.html.twig
View file @
01f6dac4
...
...
@@ -12,7 +12,7 @@
<span
class=
"float-right"
>
{%
if
pattern.author
==
app.user
%}
<span
class=
"btn btn-outline-secondary btn-sm"
onclick=
"gridPatternHandler.edit(
{{
pattern.id
}}
)"
>
<i
class=
"fa fa-
pencil-square-o
"
aria-hidden=
"true"
></i>
<i
class=
"fa
s
fa-
edit
"
aria-hidden=
"true"
></i>
{{
"edit"
|
trans
}}
</span>
{%
endif
%}
...
...
application/src/MagicWordBundle/Resources/views/Lexicon/root.html.twig
View file @
01f6dac4
...
...
@@ -3,7 +3,6 @@
{%
block
body
-
%}
<div
class=
"card"
>
<div
class=
"card-header"
>
{%
include
"MagicWordBundle:Common:backtohome.html.twig"
%}
{{
"lemma_info"
|
trans
}}
<strong>
{{
root.value
}}
</strong>
<span
class=
"float-right"
>
{%
if
isInWordbox
(
root
)
==
false
%}
...
...
application/src/MagicWordBundle/Resources/views/Lexicon/word.html.twig
View file @
01f6dac4
...
...
@@ -3,7 +3,6 @@
{%
block
body
-
%}
<div
class=
"card"
>
<div
class=
"card-header"
>
{%
include
"MagicWordBundle:Common:backtohome.html.twig"
%}
{{
"inflexion_info"
|
trans
}}
{{
word.value
}}
<span
class=
"float-right"
>
<a
class=
"btn btn-outline-secondary"
href=
"
{{
path
(
'add-to-wordbox'
,
{
"id"
:
word.root.id
}
)
}}
"
>
{{
"add_to_wordbox"
|
trans
}}
</a>
...
...
application/src/MagicWordBundle/Resources/views/Player/profile.html.twig
View file @
01f6dac4
...
...
@@ -19,7 +19,7 @@
<span
class=
"float-right"
>
{%
if
user
==
app.user
%}
<a
class=
"btn btn-outline-secondary btn-sm"
href=
"
{{
path
(
'profile_edit'
)
}}
"
>
<i
class=
"fa fa-
pencil-square-o
"
aria-hidden=
"true"
></i>
<i
class=
"fa
s
fa-
edit
"
aria-hidden=
"true"
></i>
{{
'edit_profile'
|
trans
}}
</a>
{%
else
%}
...
...
application/src/MagicWordBundle/Resources/views/Round/End/next-training.html.twig
View file @
01f6dac4
<a
class=
"please-wait btn btn-sm btn-secondary"
data-message=
"Génération de la grille"
href=
"
{{
path
(
'train'
,
{
id
:
round.grid.language.id
}
)
}}
"
>
<i
class=
"fas fa-redo-alt"
></i>
<span
class=
"
hidden-xs
"
>
{{
"train_again"
|
trans
}}
</span>
<span
class=
"
d-none d-md-block
"
>
{{
"train_again"
|
trans
}}
</span>
</a>
{%
include
"MagicWordBundle:Common:backtohome.html.twig"
%}
Write
Preview
Markdown
is supported
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