Download as
Browse Code »

Commit 86faa502f975f361636137d7a63591212eb28a0c

Authored by Erik Zambom
Committed by GitHub
2 parents 02df621d f6793342
Exists in master and in 2 other branches amadeus_univasf, refactoring

Merge pull request #563 from amadeusproject/refactoring 

Responsivity adjusts
Showing 3 changed files with 63 additions and 63 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @86faa50
... ... @@ -37,14 +37,6 @@ a:focus {
37 37 width: 20%;
38 38 }
39 39  
40   -.bottom-menu {
41   - position: fixed;
42   - bottom: 0px;
43   - width: 100%;
44   - padding: 0px 30px;
45   - z-index: 999;
46   - height: 50px;
47   -}
48 40  
49 41 /* Initial page starts */
50 42 .users-cloud {
... ... @@ -635,28 +627,6 @@ a:focus {
635 627 }
636 628 /* End Profile */
637 629  
638   -/* Bottom Menu */
639   -.clearfix {
640   - height: 60px;
641   -}
642   -
643   -
644   -.mobile-menu {
645   - -webkit-padding-start: 0px;
646   -}
647   -
648   -.mobile-menu, .mobile-menu li {
649   - display: inline-block;
650   -}
651   -
652   -.mobile-menu .item {
653   - padding-top: 3px;
654   - text-align: center;
655   - height: 50px;
656   - width: 55px;
657   - font-size: 35px;
658   -}
659   -/* End Bottom Menu */
660 630  
661 631 /* subjects app starts*/
662 632 .access-subject {
... ...
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @86faa50
... ... @@ -44,52 +44,42 @@
44 44 padding-right: 10px;
45 45 }
46 46  
47   - .logo-login{
48   - margin-top: 250px;
49   - margin-bottom: 30px;
50   - width: 20%;
51   - }
52   -
53   - h2{
54   - font-size: 32pt;
55   - }
56 47  
57   - p{
58   - font-size: 32pt;
59   - }
60 48  
61   - a{
62   - font-size: 32pt;
  49 + /* Bottom Menu */
  50 + .clearfix {
  51 + height: 60px;
63 52 }
64 53  
65   - input[type="text"] {
66   - margin-top: 40px;
67   - height: 80px;
  54 + .bottom-menu {
  55 + position: fixed;
  56 + bottom: 0px;
  57 + width: 100%;
  58 + padding: 0px 30px;
  59 + z-index: 999;
  60 + height: 60px;
68 61 }
69 62  
70   - input[type="password"] {
71   - margin-top: 40px;
72   - height: 80px;
  63 + .mobile-menu {
  64 + -webkit-padding-start: 0px;
  65 + width: 100%;
73 66 }
74 67  
75   - .form-control {
76   - font-size: 40pt;
77   - }
78   -
79   - .btn {
80   - font-size: 32pt;
81   - }
82   -
83   - span{
84   - font-size: 32pt;
  68 + .mobile-menu, .mobile-menu li {
  69 + display: inline-block;
  70 + float: left;
85 71 }
86 72  
87   - .contrast-login{
88   - text-align:center;
89   - margin-top: 100px;
  73 + .mobile-menu .item {
  74 + padding-top: 3px;
  75 + text-align: center;
  76 + height: 100px;
  77 + width: 20%;
  78 + font-size: 35px;
90 79 }
91 80  
92 81  
  82 + /* End Bottom Menu */
93 83 }
94 84  
95 85 @media(max-width: 768px) {
... ...
amadeus/templates/base.html
  Diff comments   View file @86faa50
... ... @@ -58,6 +58,7 @@
58 58 <link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus.css' %}">
59 59 <link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus_responsive.css' %}">
60 60  
  61 + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
61 62  
62 63 {% block style %}
63 64 {% endblock %}
... ... @@ -281,6 +282,44 @@
281 282 <div class="bottom-menu visible-xs visible-sm">
282 283 <div class="row">
283 284 <div class="col-sm-12 col-xs-12 text-center">
  285 +
  286 + <ul class="mobile-menu">
  287 + <li class="item {{ subjects_menu_active }}" data-toggle="tooltip" data-placement="top" title="{% trans "Subjects" %}">
  288 + <a href="{% url 'subjects:index' %}">
  289 + <i class="fa fa-graduation-cap"></i>
  290 + </a>
  291 + </li>
  292 +
  293 + <li class="item {{ mural_menu_active }} action_icon" data-toggle="tooltip" data-placement="top" title="{% trans "Mural" %}">
  294 + <a href="{% url 'mural:manage_general' %}">
  295 + <i class="fa fa-list" aria-hidden="true" ></i>
  296 + <span class="badge notify_badge mural_badge" {% if mural_notifications_count == 0 %} style="display:none" {% endif %}>{% if mural_notifications_count > 99 %} +99 {% else %} {{ mural_notifications_count }} {% endif %}</span>
  297 + </a>
  298 + </li>
  299 +
  300 + <li class="item {{ chat_menu_active }} action_icon" data-toggle="tooltip" data-placement="top" title="{% trans "Messages" %}">
  301 + <a href="{% url 'chat:manage_general' %}">
  302 + <i class="fa fa-envelope-o" aria-hidden="true"></i>
  303 + <span class="badge notify_badge chat_badge" {% if chat_notifications_count == 0 %} style="display:none" {% endif %}>{% if chat_notifications_count > 99 %} +99 {% else %} {{ chat_notifications_count }} {% endif %}</span>
  304 + </a>
  305 + </li>
  306 +
  307 +
  308 + <li class="item {{ pendencies_menu_active }} action_icon" data-toggle="tooltip" data-placement="top" title="{% trans "Pendencies" %}">
  309 + <a href="{% url 'notifications:manage' %}">
  310 + <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
  311 + {% if notifications_count > 0 %}
  312 + <span class="badge notify_badge">{% if notifications_count > 99 %} +99 {% else %} {{ notifications_count }} {% endif %}</span>
  313 + {% endif %}
  314 + </a>
  315 + </li>
  316 +
  317 + <li class="item" data-toggle="tooltip" data-placement="top" title="{% trans "Analytics" %}">
  318 + <a href="{% url 'dashboards:view_general' %}"><i class="fa fa-bar-chart" aria-hid{% get_current_language as LANGUAGE_CODE %}den="true"></i></a>
  319 + </li>
  320 + </ul>
  321 + <!--
  322 +
284 323 <ul class="mobile-menu">
285 324 <li class="item {{ subjects_menu_active }}" data-toggle="tooltip" data-placement="top" title="{% trans "Subjects" %}">
286 325 <a href="{% url 'subjects:index' %}">
... ... @@ -311,6 +350,7 @@
311 350 <a href="{% url 'dashboards:view_general' %}"><i class="fa fa-bar-chart" aria-hid{% get_current_language as LANGUAGE_CODE %}den="true"></i></a>
312 351 </li>
313 352 </ul>
  353 + -->
314 354 </div>
315 355 </div>
316 356 </div>
... ...