PYROS-IRAP / pyros

Commit d38312c28e09236b172f7f564eaaff0b5fa72ce9

Authored by Alexis Koralewski
1 parent 39bd6df6
Exists in dev

updating UI (CSS modifications)

Showing 2 changed files with 67 additions and 23 deletions   Show diff stats
Inline Side-by-side
src/core/pyros_django/misc/templates/base.html
  Diff comments   View file @d38312c
... ... @@ -10,7 +10,7 @@
10 10 <meta name="author" content="CNRS-IRAP">
11 11 <link rel="icon" type="image/png" href="{% static "media/colibrifavicon.png" %}"/>
12 12  
13   - <title>{{ request.session.obsname }} Control Center</title>
  13 + <title>{{ request.session.obsname}} Control Center - VERSION 2021.0.1</title>
14 14  
15 15 <!-- Bootstrap core CSS -->
16 16 <link href={% static "bootstrap/css/bootstrap.css" %} rel="stylesheet">
... ... @@ -30,7 +30,7 @@
30 30 <style>
31 31 #title {
32 32 font-family: 'Montserra', sans-serif;
33   - font-size: 50px;
  33 + font-size: 3rem;
34 34 }
35 35 </style>
36 36 {% endblock %}
... ... @@ -41,19 +41,16 @@
41 41 <style>
42 42  
43 43 #page-wrapper {
44   - padding: 15px 60px;
45   - width: 90%;
46   - height: 90%;
  44 + width: 80vw;
  45 + height: 80vh;
47 46 }
48 47  
49 48 #wrapper {
50   - padding-left: 10%;
  49 + #padding-left: 10%;
51 50 }
52 51  
53 52 .side-nav {
54   - margin-left: -200px;
55   - left: 200px;
56   - width: 125px; /*200px for base_unlogged*/
  53 + max-width: 15vw; /*200px for base_unlogged*/
57 54 }
58 55  
59 56 a {
... ... @@ -115,6 +112,12 @@ a {
115 112  
116 113 }
117 114  
  115 +#home_icon{
  116 + height: 1.4em;
  117 + width: 1.5em;
  118 + float:left;
  119 + margin-right:1vw;
  120 +}
118 121  
119 122 .dropdown_user_actions {
120 123 float: left;
... ... @@ -149,7 +152,12 @@ a {
149 152 }
150 153  
151 154 footer{
152   - padding-left: 50%;
  155 + position: fixed;
  156 + left: 0;
  157 + bottom: 0;
  158 + width: 100%;
  159 + text-align: center;
  160 +
153 161 }
154 162 </style>
155 163  
... ... @@ -168,14 +176,16 @@ footer{
168 176 <div id="wrapper">
169 177  
170 178 <!-- Sidebar -->
171   - <nav class="navbar navbar-inverse navbar-fixed-top navbar-expand-lg" role="navigation">
  179 + <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
  180 +
172 181 <!-- Brand and toggle get grouped for better mobile display -->
173 182 <div class="navbar-header">
174 183 {% comment %}
175 184 <img alt="" src="{% static "media/colibrifavicon.png" %}">
176 185 {% endcomment %}
177   - <a class="navbar-brand" href={% url "index" %} style="color: black;">{{ request.session.obsname }} Control Center</a>
178   -
  186 + <a class="navbar-brand" href={% url "index" %} style="color: black;">
  187 + <img src="{% static 'media/home.png' %}" id="home_icon">
  188 + {{ request.session.obsname }} Control Center</a>
179 189 </div>
180 190 {# <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> #}
181 191 <script src="{% static "/js/jquery-1.10.2.js" %}"></script>
... ... @@ -183,7 +193,7 @@ footer{
183 193  
184 194 <!-- Collect the nav links, forms, and other content for toggling -->
185 195 <!-- #f9ff93 #6b69f3-->
186   - <div id="topbar" class="collapse navbar-collapse navbar-ex1-collapse navbar-dark bg-primary">
  196 + <div id="topbar" class="collapse navbar-collapse navbar-ex1-collapse bg-primary">
187 197 <ul class="nav navbar-nav side-nav navbar-dark bg-primary" id="navbar_list">
188 198  
189 199 <li><a href="{% url "weather" %}">Weather</a></li>
... ...
src/core/pyros_django/misc/templates/base_unlogged.html
  Diff comments   View file @d38312c
... ... @@ -29,7 +29,7 @@
29 29 <style>
30 30 #title {
31 31 font-family: 'Montserra', sans-serif;
32   - font-size: 50px;
  32 + font-size: 3rem;
33 33 }
34 34 </style>
35 35 {% endblock %}
... ... @@ -40,19 +40,16 @@
40 40 <style>
41 41  
42 42 #page-wrapper {
43   - padding: 15px 60px;
44   - width: 90%;
45   - height: 90%;
  43 + width: 80vw;
  44 + height: 80vh;
46 45 }
47 46  
48 47 #wrapper {
49   - padding-left: 10%;
  48 + #padding-left: 10%;
50 49 }
51 50  
52 51 .side-nav {
53   - margin-left: -200px;
54   - left: 200px;
55   - width: 200px; /*125px for base*/
  52 + max-width: 15vw; /*200px for base_unlogged*/
56 53 }
57 54  
58 55 a {
... ... @@ -64,6 +61,11 @@ a {
64 61 size: 18px;
65 62 }
66 63  
  64 +#profile
  65 +{
  66 + font-size: 17px;
  67 +}
  68 +
67 69 #hour
68 70 {
69 71 color: black;
... ... @@ -76,10 +78,13 @@ a {
76 78 font-size: 18px;
77 79 }
78 80  
79   -#signin {
  81 +#signout {
80 82 color: black;
81 83 }
82 84  
  85 +#signin{
  86 + color: white;
  87 +}
83 88 .nav>li>a:focus, .nav>li>a:hover {
84 89 text-decoration: none;
85 90 background-color: transparent !important;
... ... @@ -96,6 +101,35 @@ a {
96 101 color: black;
97 102 }
98 103  
  104 +.img_icon {
  105 + height: 18px;
  106 + weight: 18px;
  107 +}
  108 +
  109 +.user_icon{
  110 + margin-left: 45%;
  111 + margin-bottom: 0.4em;
  112 + margin-top: 0.4em;
  113 + height: 1.5em;
  114 +
  115 +}
  116 +
  117 +#home_icon{
  118 + height: 1.4em;
  119 + width: 1.5em;
  120 + float:left;
  121 + margin-right:1vw;
  122 +}
  123 +
  124 +
  125 +footer{
  126 + position: fixed;
  127 + left: 0;
  128 + bottom: 0;
  129 + width: 100%;
  130 + text-align: center;
  131 +
  132 +}
99 133 </style>
100 134  
101 135 {% load tags %}
... ...