Download as
Browse Code »

Commit 6438c5c4779313ce721996dde587c2225f9c96f2

Authored by Zambom
1 parent 581307ef
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Begin responsive adjusts

Showing 3 changed files with 13 additions and 7 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @6438c5c
... ... @@ -31,7 +31,7 @@
31 31 }
32 32  
33 33 #sidebar-menu .item{
34   - font-size: 45px;
  34 + font-size: 3vw;
35 35 background-color: #26A69A;
36 36 color: white;
37 37 width: 80%;
... ...
amadeus/static/css/base/amadeus_responsive.css 0 → 100644
  Diff comments   View file @6438c5c
... ... @@ -0,0 +1,5 @@
  1 +@media(max-width: 1199px) {
  2 + .navbar .navbar-brand {
  3 + padding: 15px;
  4 + }
  5 +}
0 6 \ No newline at end of file
... ...
amadeus/templates/base.html
  Diff comments   View file @6438c5c
... ... @@ -45,6 +45,7 @@
45 45 <link rel="stylesheet" type="text/css" href="{% static 'font-awesome-4.6.3/css/font-awesome.min.css' %}">
46 46  
47 47 <!-- Custom styles -->
  48 + <link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus_responsive.css' %}">
48 49 <link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus.css' %}">
49 50  
50 51 <!--Javascript block for specific-app ones -->
... ... @@ -76,7 +77,7 @@
76 77 </a>
77 78 </div>
78 79 <div class="navbar-collapse collapse navbar-responsive-collapse">
79   - <div class="col-md-5 cards-content" id= 'NavBarSearch'>
  80 + <div class="col-sm-5 col-sm-offset-1 col-md-5 cards-content" id= 'NavBarSearch'>
80 81 <form id="SearchForm" action="#" method="get" accept-charset="utf-8">
81 82 <div class="input-group">
82 83 <div class="form-group is-empty" >
... ... @@ -137,9 +138,10 @@
137 138 </div>
138 139 </div>
139 140 {% endblock %}
  141 +
140 142 <div class="container-fluid">
141 143 <div class="row">
142   - <div id="sidebar-menu-div" class="col-xs-1 col-sm-1 col-md-1 col-lg-1 col-xl-1">
  144 + <div id="sidebar-menu-div" class="col-md-1 col-lg-1 hidden-xs hidden-sm">
143 145 {% block sidebar %}
144 146 <ul id="sidebar-menu">
145 147 <li class="item {{ subjects_menu_active }}" id="subjects-link" data-toggle="tooltip" data-placement="right" title="{% trans "Subjects" %}">
... ... @@ -156,14 +158,13 @@
156 158 <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Pendencias" %}">
157 159 <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
158 160 </li>
159   -
160 161 <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Analytics" %}">
161 162 <i class="fa fa-bar-chart" aria-hidden="true"></i>
162 163 </li>
163 164 </ul>
164 165 {% endblock %}
165 166 </div>
166   - <div class="col-xs-11 col-sm-11 col-md-11 col-lg-11 col-xl-11">
  167 + <div class="col-xs-12 col-sm-12 col-md-11 col-lg-11">
167 168 {% block breadcrumbs %}
168 169 {% breadcrumb 'Home' 'home' %}
169 170 {% endblock %}
... ... @@ -171,7 +172,7 @@
171 172 {% render_breadcrumbs %}
172 173 {% endblock %}
173 174 </div>
174   - <div class="col-xs-11 col-sm-11 col-md-11 col-lg-11 col-xl-11">
  175 + <div class="col-xs-12 col-sm-12 col-md-11 col-lg-11">
175 176 {% block content %}
176 177 {% endblock %}
177 178 </div>
... ... @@ -187,7 +188,7 @@
187 188  
188 189 /* Initialize tooltips*/
189 190 $(function () {
190   - $('[data-toggle="tooltip"]').tooltip()
  191 + $('[data-toggle="tooltip"]').tooltip()
191 192 });
192 193 </script>
193 194 </body>
... ...