Commit fe744c8c480d1a9829efc373eebbc0a2c1503fb8

Authored by Miguel Barão
1 parent fd2f53ea
Exists in master and in 1 other branch dev

- improved looks of navbar, checkboxes and radio option list

templates/maintopics.html
@@ -28,9 +28,9 @@ @@ -28,9 +28,9 @@
28 <!-- ===================================================================== --> 28 <!-- ===================================================================== -->
29 <body> 29 <body>
30 <nav class="navbar navbar-expand-sm fixed-top navbar-dark bg-primary"> 30 <nav class="navbar navbar-expand-sm fixed-top navbar-dark bg-primary">
31 - <a class="navbar-brand" href="#">  
32 - <img src="/static/logo_horizontal.png" height="30" alt="">  
33 - </a> 31 + <!-- <a class="navbar-brand" href="#"> -->
  32 + <img src="/static/logo_horizontal.png" class="navbar-brand" height="48" alt="UEvora">
  33 + <!-- </a> -->
34 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation"> 34 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
35 <span class="navbar-toggler-icon"></span> 35 <span class="navbar-toggler-icon"></span>
36 </button> 36 </button>
templates/question-checkbox.html
@@ -5,10 +5,16 @@ @@ -5,10 +5,16 @@
5 <fieldset data-role="controlgroup"> 5 <fieldset data-role="controlgroup">
6 <div class="list-group"> 6 <div class="list-group">
7 {% for n,opt in enumerate(question['options']) %} 7 {% for n,opt in enumerate(question['options']) %}
8 - <a class="list-group-item">  
9 - <input type="checkbox" id="{{ n }}" accesskey="{{ n+1 }}" name="answer" value="{{ n }}">  
10 - <label for="{{ n }}">{{ md(opt) }}</label>  
11 - </a> 8 + <a class="list-group-item">
  9 + <div class="d-flex flex-row align-items-stretch">
  10 + <div class="p-1">
  11 + <input type="checkbox" id="{{ n }}" accesskey="{{ n+1 }}" name="answer" value="{{ n }}">
  12 + </div>
  13 + <div class="p-1">
  14 + <label for="{{ n }}">{{ md(opt) }}</label>
  15 + </div>
  16 + </div>
  17 + </a>
12 {% end %} 18 {% end %}
13 </div> 19 </div>
14 </fieldset> 20 </fieldset>
templates/question-radio.html
@@ -5,10 +5,16 @@ @@ -5,10 +5,16 @@
5 <fieldset data-role="controlgroup"> 5 <fieldset data-role="controlgroup">
6 <div class="list-group"> 6 <div class="list-group">
7 {% for n,opt in enumerate(question['options']) %} 7 {% for n,opt in enumerate(question['options']) %}
8 - <a class="list-group-item">  
9 - <input type="radio" id="{{ n }}" accesskey="{{ n+1 }}" name="answer" value="{{ n }}">  
10 - <label for="{{ n }}">{{ md(opt) }}</label>  
11 - </a> 8 + <a class="list-group-item">
  9 + <div class="d-flex flex-row">
  10 + <div class="p-1">
  11 + <input type="radio" id="{{ n }}" accesskey="{{ n+1 }}" name="answer" value="{{ n }}">
  12 + </div>
  13 + <div class="p-1">
  14 + <label for="{{ n }}">{{ md(opt) }}</label>
  15 + </div>
  16 + </div>
  17 + </a>
12 {% end %} 18 {% end %}
13 </div> 19 </div>
14 </fieldset> 20 </fieldset>
templates/topic.html
@@ -28,7 +28,6 @@ @@ -28,7 +28,6 @@
28 <!-- <link rel="stylesheet" href="/static/css/learn.css"> --> 28 <!-- <link rel="stylesheet" href="/static/css/learn.css"> -->
29 29
30 <style> 30 <style>
31 - /* progress bars have height of 4 pixels */  
32 .progress { 31 .progress {
33 height: 20px; 32 height: 20px;
34 border-radius: 0px; 33 border-radius: 0px;
@@ -59,9 +58,9 @@ @@ -59,9 +58,9 @@
59 58
60 <!-- Navbar --> 59 <!-- Navbar -->
61 <nav class="navbar navbar-expand-sm fixed-top navbar-dark bg-primary"> 60 <nav class="navbar navbar-expand-sm fixed-top navbar-dark bg-primary">
62 - <a class="navbar-brand" href="#">  
63 - <img src="/static/logo_horizontal.png" height="30" alt="">  
64 - </a> 61 + <!-- <a class="navbar-brand" href="#"> -->
  62 + <img src="/static/logo_horizontal.png" class="navbar-brand" height="48" alt="UEvora">
  63 + <!-- </a> -->
65 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation"> 64 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
66 <span class="navbar-toggler-icon"></span> 65 <span class="navbar-toggler-icon"></span>
67 </button> 66 </button>