Commit 3ba117bb56e53749fdeee03e526fed0f3ad68257
Exists in
master
and in
4 other branches
Nicer pages
Showing
5 changed files
with
22 additions
and
12 deletions
Show diff stats
CHANGELOG.md
@@ -24,6 +24,10 @@ or major refactoring improvments. | @@ -24,6 +24,10 @@ or major refactoring improvments. | ||
24 | 24 | ||
25 | ## Unreleased | 25 | ## Unreleased |
26 | 26 | ||
27 | +## [0.3.pre-6] - 2021-04-30 - Nicer Display | ||
28 | +### Changed | ||
29 | +Layout responsive on tables and menus | ||
30 | + | ||
27 | ## [0.3.pre-5] - 2021-04-30 - Import Irap CSV | 31 | ## [0.3.pre-5] - 2021-04-30 - Import Irap CSV |
28 | ### New | 32 | ### New |
29 | Db models | 33 | Db models |
VERSION.txt
app/main/static/css/charges.css
@@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
29 | } | 29 | } |
30 | 30 | ||
31 | #charge_table, .charge_chart{ | 31 | #charge_table, .charge_chart{ |
32 | - width: 95%; | 32 | + width: 100%; |
33 | } | 33 | } |
34 | 34 | ||
35 | #charge_table, | 35 | #charge_table, |
@@ -49,6 +49,7 @@ | @@ -49,6 +49,7 @@ | ||
49 | background-color: #fAfAfA; | 49 | background-color: #fAfAfA; |
50 | border: 1pt solid black; | 50 | border: 1pt solid black; |
51 | display: inline-block; | 51 | display: inline-block; |
52 | + width: 100%; | ||
52 | } | 53 | } |
53 | 54 | ||
54 | text.legend { | 55 | text.legend { |
app/static/css/style.css
@@ -80,3 +80,11 @@ nav.sidebar a.disabled { | @@ -80,3 +80,11 @@ nav.sidebar a.disabled { | ||
80 | .dev2-icon { | 80 | .dev2-icon { |
81 | filter: hue-rotate(100deg) saturate(1000%); | 81 | filter: hue-rotate(100deg) saturate(1000%); |
82 | } | 82 | } |
83 | + | ||
84 | +/* Update the navbar for small screens. Replace bootstrap css for small screens only */ | ||
85 | +@media (max-width: 600px) { | ||
86 | + .sidebar { | ||
87 | + position: static !important; | ||
88 | + margin-top: 0px !important; | ||
89 | + } | ||
90 | +} |
app/templates/base_page.html
@@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
12 | <img class="m-0 mr-1 {{config.PDC_SITE_CLASS}}" src="{{ url_for('static', filename='img/pdc-ico.png', version=config.VERSION) }}" height="30" width="30"/> | 12 | <img class="m-0 mr-1 {{config.PDC_SITE_CLASS}}" src="{{ url_for('static', filename='img/pdc-ico.png', version=config.VERSION) }}" height="30" width="30"/> |
13 | 13 | ||
14 | {{config.PDC_APP_NAME}} - {{config.PDC_SITE_NAME}}</a> | 14 | {{config.PDC_APP_NAME}} - {{config.PDC_SITE_NAME}}</a> |
15 | - <ul class="navbar-nav ml-auto"> | 15 | + <ul class="navbar-nav flex-row ml-auto"> |
16 | {% if not current_user.is_anonymous %} | 16 | {% if not current_user.is_anonymous %} |
17 | <li class="nav-item"> | 17 | <li class="nav-item"> |
18 | <span class="navbar-brand">{{current_user.name}}</span> | 18 | <span class="navbar-brand">{{current_user.name}}</span> |
@@ -30,16 +30,13 @@ | @@ -30,16 +30,13 @@ | ||
30 | 30 | ||
31 | <div class="container-fluid"> | 31 | <div class="container-fluid"> |
32 | <div class="row"> | 32 | <div class="row"> |
33 | - <nav class="col-md-2 d-none d-md-block bg-light sidebar mt-3"> | ||
34 | - <div class="sidebar-sticky"> | 33 | + <nav class="col-md-2 col-sm-auto col-xs-auto navbar-light bg-light navbar-expand-md sidebar mt-5"> |
34 | + <button id="test" class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> | ||
35 | + <span class="navbar-toggler-icon"></span> | ||
36 | + </button> | ||
37 | + <div class="sidebar-sticky collapse navbar-collapse" id="navbarSupportedContent"> | ||
35 | <ul class="nav flex-column" id="v_menu"> | 38 | <ul class="nav flex-column" id="v_menu"> |
36 | <li class="nav-item"> | 39 | <li class="nav-item"> |
37 | - <a class="nav-link" href="#"> | ||
38 | - <span data-feather="home"></span> | ||
39 | - accueil | ||
40 | - </a> | ||
41 | - </li> | ||
42 | - <li class="nav-item"> | ||
43 | <a aria-expanded="false" id="agents" class="main-nav nav-link" data-target="#agent" data-toggle="collapse" href="#"> | 40 | <a aria-expanded="false" id="agents" class="main-nav nav-link" data-target="#agent" data-toggle="collapse" href="#"> |
44 | <span data-feather="user"></span> | 41 | <span data-feather="user"></span> |
45 | Agent | 42 | Agent |
@@ -122,7 +119,7 @@ | @@ -122,7 +119,7 @@ | ||
122 | </footer> | 119 | </footer> |
123 | </nav> | 120 | </nav> |
124 | 121 | ||
125 | - <main id="main" class="col-md-9 ml-sm-auto col-lg-10 pt-3 px-4" role="main"> | 122 | + <main id="main" class="ml-md-auto ml-sm-5 ml-xs-8 col-xs-4 col-sm-11 col-md-9 col-lg-10 pt-3 px-4" role="main"> |
126 | <h2 class="sub-header">{{subtitle}}</h2> | 123 | <h2 class="sub-header">{{subtitle}}</h2> |
127 | {% include 'flash-messages.html' %} | 124 | {% include 'flash-messages.html' %} |
128 | {% block content %} | 125 | {% block content %} |