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
702a56a1
Commit
702a56a1
authored
May 21, 2019
by
Arnaud Bey
Browse files
update jquery
parent
92152051
Changes
4
Hide whitespace changes
Inline
Side-by-side
application/app/Resources/views/base.html.twig
View file @
702a56a1
...
...
@@ -14,8 +14,8 @@
<link
rel=
"stylesheet"
href=
"
{{
asset
(
'css/main.css'
)
}}
"
type=
"text/css"
/>
{%
block
stylesheets
%}{%
endblock
%}
<link
rel=
"icon"
type=
"image/x-icon"
href=
"
{{
asset
(
'favicon.ico'
)
}}
"
/>
<!--
{%
if
generalParameters.piwikUrl
%}
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
...
...
@@ -29,8 +29,8 @@
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Piwik Code -->
{%
endif
%}
-->
</head>
<body>
{%
block
topToHideWhilePlaying
%}
...
...
application/app/config/config.yml
View file @
702a56a1
...
...
@@ -33,7 +33,7 @@ framework:
fragments
:
~
http_method_override
:
true
assets
:
version
:
v201
70614
A
version
:
v201
90521
A
packages
:
noversion
:
version
:
~
...
...
application/bower.json
View file @
702a56a1
...
...
@@ -11,7 +11,7 @@
"bootstrap"
:
"~4"
,
"font-awesome"
:
"~4"
,
"FlipClock"
:
"*"
,
"jquery"
:
"~
2.1
.4"
,
"jquery"
:
"~
3
.4"
,
"jquery-ui"
:
"*"
,
"animate.css"
:
"^3.5.2"
,
"howler.js"
:
"howler#^2.0.0"
,
...
...
application/src/MagicWordBundle/Resources/views/Round/play.html.twig
View file @
702a56a1
...
...
@@ -21,7 +21,7 @@
</div>
<div
class=
"row"
>
<div
id=
"grid-container"
class=
"col
-md-12 col-xs-12 col-lg-12
"
>
<div
id=
"grid-container"
class=
"col"
>
{%
include
"MagicWordBundle:Round/Play:grid.html.twig"
%}
</div>
</div>
...
...
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