Skip to content

Commit 847e9a8

Browse files
laurentabballaurentabbal
committed
~
1 parent 348371a commit 847e9a8

File tree

7 files changed

+18
-47
lines changed

7 files changed

+18
-47
lines changed

‎public/css/custom.css

+4-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ h2 {
103103
border:solid 1px #ced4da;
104104
background-color:#fafcfe;
105105
border-radius:4px;
106-
font-size:80% !important;
106+
}
107+
108+
.markdown_content code {
109+
font-size:85% !important;
107110
}
108111

109112

‎public/css/easymde-custom.css

+4-1
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,8 @@
9090
border:solid 1px #ced4da;
9191
background-color:#fafcfe;
9292
border-radius:4px;
93-
font-size:80%;
93+
}
94+
95+
.editor-preview code {
96+
font-size:85%;
9497
}

‎public/img/opengraph/DYU5W.png

-10 KB
Loading

‎resources/views/console-defis.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<div class="mt-3 text-monospace small">{{__('CONSIGNES')}}</div>
153153
@endif
154154
@if ($defi->consignes_eleve !== NULL)
155-
<div class="markdown_content border rounded bg-light text-monospace p-3">{{ $defi->consignes_eleve }}</div>
155+
<div class="markdown_content border rounded bg-light p-3">{{ $defi->consignes_eleve }}</div>
156156
@endif
157157
@endif
158158

‎resources/views/console-puzzles.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<div class="mt-3 text-monospace small">{{__('CONSIGNES')}}</div>
128128
@endif
129129
@if ($puzzle->consignes_eleve !== NULL)
130-
<div class="markdown_content border rounded bg-light text-monospace p-3">{{ $puzzle->consignes_eleve }}</div>
130+
<div class="markdown_content border rounded bg-light p-3">{{ $puzzle->consignes_eleve }}</div>
131131
@endif
132132
@endif
133133
<div class="mt-3 text-monospace small">{{__('CODE')}}</div>

‎resources/views/defi.blade.php

+6-41
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<title>{{ config('app.name') }} | Défi - D{{ $jeton }}</title>
2222
</head>
2323

24-
<body class="no-mathjax" oncontextmenu="return false" onselectstart="return false" ondragstart="return false">
24+
<body oncontextmenu="return false" onselectstart="return false" ondragstart="return false">
2525

2626
<?php
2727
// defi avec jeton eleve
@@ -70,7 +70,7 @@
7070
<div class="container-fluid">
7171

7272
@if(!$iframe)
73-
<h1 class="mt-2 mb-4 text-center"><a class="navbar-brand m-1" href="{{ url('/') }}"><img src="{{ asset('img/code-puzzle.png') }}" width="140" alt="CODE PUZZLE" /></a></h1>
73+
<h1 class="mt-2 mb-3 text-center"><a class="navbar-brand m-1" href="{{ url('/') }}"><img src="{{ asset('img/code-puzzle.png') }}" width="140" alt="CODE PUZZLE" /></a></h1>
7474
@endif
7575

7676
@if ($defi->with_chrono == 1 OR $defi->with_nbverif == 1)
@@ -102,32 +102,13 @@
102102
<div class="mb-1 font-weight-bold">{{ $defi->titre_eleve }}</div>
103103
@endif
104104

105-
<?php
106-
include('lib/parsedownmath/ParsedownMath.php');
107-
$Parsedown = new ParsedownMath([
108-
'math' => [
109-
'enabled' => true, // Write true to enable the module
110-
'matchSingleDollar' => true // default false
111-
]
112-
]);
113-
$consignes_parsed = $Parsedown->text($defi->consignes_eleve)
114-
?>
115-
116105
@if ($defi->consignes_eleve !== NULL)
117-
<div class="consignes mathjax" style="text-align:justify;">
118-
<?php
119-
echo $consignes_parsed;
120-
?>
121-
</div>
106+
<div class="markdown_content consignes" style="text-align:justify;">{{$defi->consignes_eleve}}</div>
122107
@endif
123108

124-
<div id="consignes_hidden" class="mathjax" style="padding:30px 20px 0px 20px;width:1200px;height:630px;background-color:white;display:none;">
109+
<div id="consignes_hidden" style="padding:30px 20px 0px 20px;width:1200px;height:630px;background-color:white;display:none;">
125110
<img src="{{ asset('img/codepuzzle.png') }}" height="30" />
126-
<div class="consignes" style="text-align:justify;padding:20px 40px 20px 40px;margin-top:25px;border-radius:10px;font-size:28px;background-color:#F8FAFC;">
127-
<?php
128-
echo $consignes_parsed;
129-
?>
130-
</div>
111+
<div class="markdown_content consignes" style="text-align:justify;padding:20px 40px 20px 40px;margin-top:25px;border-radius:10px;font-size:28px;background-color:#F8FAFC;">{{$defi->consignes_eleve}}</div>
131112
</div>
132113

133114
</div>
@@ -200,6 +181,7 @@
200181
</div><!-- container -->
201182

202183
@include('inc-bottom-js')
184+
@include('markdown/inc-markdown-afficher-js')
203185

204186
<script>
205187
function copierCode(bouton) {
@@ -405,23 +387,6 @@ function restartWorker() {
405387
});
406388
</script>
407389

408-
409-
<script>
410-
MathJax = {
411-
tex: {
412-
inlineMath: [['$', '$'], ['\\(', '\\)']],
413-
displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
414-
processEscapes: true
415-
},
416-
options: {
417-
ignoreHtmlClass: "no-mathjax",
418-
processHtmlClass: "mathjax"
419-
}
420-
};
421-
</script>
422-
<script type="text/javascript" id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-svg.js"></script>
423-
424-
425390
<script src="{{ asset('js/ace/ace.js') }}" type="text/javascript" charset="utf-8"></script>
426391
<script>
427392
var editor_code = ace.edit("editor_code", {

‎resources/views/puzzle.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<div class="container-fluid">
8686

8787
@if(!$iframe)
88-
<h1 class="mt-2 mb-5 text-center"><a class="navbar-brand m-1" href="{{ url('/') }}"><img src="{{ asset('img/code-puzzle.png') }}" width="140" alt="CODE PUZZLE" /></a></h1>
88+
<h1 class="mt-2 mb-3 text-center"><a class="navbar-brand m-1" href="{{ url('/') }}"><img src="{{ asset('img/code-puzzle.png') }}" width="140" alt="CODE PUZZLE" /></a></h1>
8989
@endif
9090

9191
@if ($puzzle->with_chrono == 1 OR $puzzle->with_chrono == 1)
@@ -120,7 +120,7 @@
120120
<div class="font-monospace small mb-1">{{ $puzzle->titre_eleve }}</div>
121121
@endif
122122
@if ($puzzle->consignes_eleve !== NULL)
123-
<div class="markdown_content font-monospace text-muted small consignes">{{$puzzle->consignes_eleve}}</div>
123+
<div class="markdown_content consignes">{{$puzzle->consignes_eleve}}</div>
124124
@endif
125125
</div>
126126
</div>

0 commit comments

Comments
 (0)