Commit d7c02240fbb7acfbccfbd63969b90f854caba7dc
1 parent
755f319a
Exists in
master
and in
1 other branch
fixed navbar collapsed button and upgrade bootstrap to 5.1.3
Showing
5 changed files
with
22 additions
and
20 deletions
Show diff stats
aprendizations/templates/courses.html
@@ -8,12 +8,14 @@ | @@ -8,12 +8,14 @@ | ||
8 | <meta name="author" content="Miguel Barão"> | 8 | <meta name="author" content="Miguel Barão"> |
9 | <link rel="icon" href="favicon.ico"> | 9 | <link rel="icon" href="favicon.ico"> |
10 | <!-- Styles --> | 10 | <!-- Styles --> |
11 | - <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We" crossorigin="anonymous"> | 11 | + <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"> |
12 | + | ||
12 | <link rel="stylesheet" href="{{static_url('css/maintopics.css')}}"> | 13 | <link rel="stylesheet" href="{{static_url('css/maintopics.css')}}"> |
13 | <link rel="stylesheet" href="{{static_url('css/sticky-footer-navbar.css')}}"> | 14 | <link rel="stylesheet" href="{{static_url('css/sticky-footer-navbar.css')}}"> |
14 | <!-- Scripts --> | 15 | <!-- Scripts --> |
15 | <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> | 16 | <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> |
16 | - <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" crossorigin="anonymous"></script> | 17 | + |
18 | + <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script> | ||
17 | <script defer src="{{static_url('fontawesome-free/js/all.min.js')}}"></script> | 19 | <script defer src="{{static_url('fontawesome-free/js/all.min.js')}}"></script> |
18 | <script defer src="{{static_url('js/maintopics.js')}}"></script> | 20 | <script defer src="{{static_url('js/maintopics.js')}}"></script> |
19 | 21 | ||
@@ -29,7 +31,7 @@ | @@ -29,7 +31,7 @@ | ||
29 | <span class="navbar-toggler-icon"></span> | 31 | <span class="navbar-toggler-icon"></span> |
30 | </button> | 32 | </button> |
31 | 33 | ||
32 | - <div class="collapse navbar-collapse" id="navbarNavText"> | 34 | + <div class="collapse navbar-collapse" id="navbarText"> |
33 | <ul class="navbar-nav"> | 35 | <ul class="navbar-nav"> |
34 | <li class="nav-item"><a class="nav-link active" aria-current="page" href="/courses">Cursos</a></li> | 36 | <li class="nav-item"><a class="nav-link active" aria-current="page" href="/courses">Cursos</a></li> |
35 | <li class="nav-item"><a class="nav-link disabled" href="#">Tópicos</a></li> | 37 | <li class="nav-item"><a class="nav-link disabled" href="#">Tópicos</a></li> |
aprendizations/templates/maintopics-table.html
@@ -9,12 +9,13 @@ | @@ -9,12 +9,13 @@ | ||
9 | <link rel="icon" href="/static/favicon.ico"> | 9 | <link rel="icon" href="/static/favicon.ico"> |
10 | 10 | ||
11 | <!-- Styles --> | 11 | <!-- Styles --> |
12 | - <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We" crossorigin="anonymous"> | 12 | + <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"> |
13 | + | ||
13 | <link rel="stylesheet" href="{{static_url('css/maintopics.css')}}"> | 14 | <link rel="stylesheet" href="{{static_url('css/maintopics.css')}}"> |
14 | 15 | ||
15 | <!-- Scripts --> | 16 | <!-- Scripts --> |
16 | <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> | 17 | <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> |
17 | - <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" crossorigin="anonymous"></script> | 18 | + <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script> |
18 | 19 | ||
19 | <script defer src="{{static_url('fontawesome-free/js/all.min.js')}}"></script> | 20 | <script defer src="{{static_url('fontawesome-free/js/all.min.js')}}"></script> |
20 | <script defer src="{{static_url('js/maintopics.js')}}"></script> | 21 | <script defer src="{{static_url('js/maintopics.js')}}"></script> |
@@ -30,7 +31,7 @@ | @@ -30,7 +31,7 @@ | ||
30 | <span class="navbar-toggler-icon"></span> | 31 | <span class="navbar-toggler-icon"></span> |
31 | </button> | 32 | </button> |
32 | 33 | ||
33 | - <div class="collapse navbar-collapse" id="navbarNavText"> | 34 | + <div class="collapse navbar-collapse" id="navbarText"> |
34 | <ul class="navbar-nav"> | 35 | <ul class="navbar-nav"> |
35 | <li class="nav-item"><a class="nav-link" href="/courses">Cursos</a></li> | 36 | <li class="nav-item"><a class="nav-link" href="/courses">Cursos</a></li> |
36 | <li class="nav-item"><a class="nav-link active" aria-current="page" href="#">Tópicos</a></li> | 37 | <li class="nav-item"><a class="nav-link active" aria-current="page" href="#">Tópicos</a></li> |
aprendizations/templates/rankings.html
@@ -8,10 +8,10 @@ | @@ -8,10 +8,10 @@ | ||
8 | <meta name="author" content="Miguel Barão"> | 8 | <meta name="author" content="Miguel Barão"> |
9 | <link rel="icon" href="/static/favicon.ico"> | 9 | <link rel="icon" href="/static/favicon.ico"> |
10 | <!-- Styles --> | 10 | <!-- Styles --> |
11 | - <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We" crossorigin="anonymous"> | 11 | + <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"> |
12 | <link rel="stylesheet" href="{{static_url('css/maintopics.css')}}"> | 12 | <link rel="stylesheet" href="{{static_url('css/maintopics.css')}}"> |
13 | <!-- Scripts --> | 13 | <!-- Scripts --> |
14 | - <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" crossorigin="anonymous"></script> | 14 | + <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script> |
15 | <script defer src="{{static_url('fontawesome-free/js/all.min.js')}}"></script> | 15 | <script defer src="{{static_url('fontawesome-free/js/all.min.js')}}"></script> |
16 | <script defer src="{{static_url('js/maintopics.js')}}"></script> | 16 | <script defer src="{{static_url('js/maintopics.js')}}"></script> |
17 | 17 | ||
@@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
26 | <span class="navbar-toggler-icon"></span> | 26 | <span class="navbar-toggler-icon"></span> |
27 | </button> | 27 | </button> |
28 | 28 | ||
29 | - <div class="collapse navbar-collapse" id="navbarNavText"> | 29 | + <div class="collapse navbar-collapse" id="navbarText"> |
30 | <ul class="navbar-nav"> | 30 | <ul class="navbar-nav"> |
31 | <li class="nav-item"><a class="nav-link" href="/courses">Cursos</a></li> | 31 | <li class="nav-item"><a class="nav-link" href="/courses">Cursos</a></li> |
32 | <li class="nav-item"><a class="nav-link" href="/course/{{course_id}}">Tópicos</a></li> | 32 | <li class="nav-item"><a class="nav-link" href="/course/{{course_id}}">Tópicos</a></li> |
aprendizations/templates/topic.html
@@ -7,10 +7,8 @@ | @@ -7,10 +7,8 @@ | ||
7 | <link rel="icon" href="/static/favicon.ico"> | 7 | <link rel="icon" href="/static/favicon.ico"> |
8 | 8 | ||
9 | <!-- Styles --> | 9 | <!-- Styles --> |
10 | - <!-- <link rel="stylesheet" href="{{static_url('mdbootstrap/css/bootstrap.min.css')}}"> --> | ||
11 | - <!-- <link rel="stylesheet" href="{{static_url('mdbootstrap/css/mdb.min.css')}}"> --> | 10 | + <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"> |
12 | 11 | ||
13 | - <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We" crossorigin="anonymous"> | ||
14 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" /> | 12 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" /> |
15 | 13 | ||
16 | <link rel="stylesheet" href="{{static_url('codemirror/lib/codemirror.css')}}"> | 14 | <link rel="stylesheet" href="{{static_url('codemirror/lib/codemirror.css')}}"> |
@@ -32,7 +30,8 @@ | @@ -32,7 +30,8 @@ | ||
32 | <script async type="text/javascript" id="MathJax-script" src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script> | 30 | <script async type="text/javascript" id="MathJax-script" src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script> |
33 | 31 | ||
34 | <script defer src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> | 32 | <script defer src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> |
35 | - <script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" crossorigin="anonymous"></script> | 33 | + |
34 | + <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script> | ||
36 | 35 | ||
37 | <script defer src="{{static_url('fontawesome-free/js/all.min.js')}}"></script> | 36 | <script defer src="{{static_url('fontawesome-free/js/all.min.js')}}"></script> |
38 | <script defer src="{{static_url('codemirror/lib/codemirror.js')}}"></script> | 37 | <script defer src="{{static_url('codemirror/lib/codemirror.js')}}"></script> |
@@ -55,7 +54,7 @@ | @@ -55,7 +54,7 @@ | ||
55 | <span class="navbar-toggler-icon"></span> | 54 | <span class="navbar-toggler-icon"></span> |
56 | </button> | 55 | </button> |
57 | 56 | ||
58 | - <div class="collapse navbar-collapse" id="navbarNavText"> | 57 | + <div class="collapse navbar-collapse" id="navbarText"> |
59 | <ul class="navbar-nav"> | 58 | <ul class="navbar-nav"> |
60 | <li class="nav-item"><a class="nav-link" href="/courses">Cursos</a></li> | 59 | <li class="nav-item"><a class="nav-link" href="/courses">Cursos</a></li> |
61 | <li class="nav-item"><a class="nav-link active" aria-current="page" href="/course/{{course_id}}">Tópicos</a></li> | 60 | <li class="nav-item"><a class="nav-link active" aria-current="page" href="/course/{{course_id}}">Tópicos</a></li> |
package-lock.json
@@ -19,9 +19,9 @@ | @@ -19,9 +19,9 @@ | ||
19 | } | 19 | } |
20 | }, | 20 | }, |
21 | "node_modules/codemirror": { | 21 | "node_modules/codemirror": { |
22 | - "version": "5.62.2", | ||
23 | - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.2.tgz", | ||
24 | - "integrity": "sha512-tVFMUa4J3Q8JUd1KL9yQzQB0/BJt7ZYZujZmTPgo/54Lpuq3ez4C8x/ATUY/wv7b7X3AUq8o3Xd+2C5ZrCGWHw==" | 22 | + "version": "5.63.3", |
23 | + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.3.tgz", | ||
24 | + "integrity": "sha512-1C+LELr+5grgJYqwZKqxrcbPsHFHapVaVAloBsFBASbpLnQqLw1U8yXJ3gT5D+rhxIiSpo+kTqN+hQ+9ialIXw==" | ||
25 | } | 25 | } |
26 | }, | 26 | }, |
27 | "dependencies": { | 27 | "dependencies": { |
@@ -31,9 +31,9 @@ | @@ -31,9 +31,9 @@ | ||
31 | "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==" | 31 | "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==" |
32 | }, | 32 | }, |
33 | "codemirror": { | 33 | "codemirror": { |
34 | - "version": "5.62.2", | ||
35 | - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.2.tgz", | ||
36 | - "integrity": "sha512-tVFMUa4J3Q8JUd1KL9yQzQB0/BJt7ZYZujZmTPgo/54Lpuq3ez4C8x/ATUY/wv7b7X3AUq8o3Xd+2C5ZrCGWHw==" | 34 | + "version": "5.63.3", |
35 | + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.3.tgz", | ||
36 | + "integrity": "sha512-1C+LELr+5grgJYqwZKqxrcbPsHFHapVaVAloBsFBASbpLnQqLw1U8yXJ3gT5D+rhxIiSpo+kTqN+hQ+9ialIXw==" | ||
37 | } | 37 | } |
38 | } | 38 | } |
39 | } | 39 | } |