Download as
Browse Code »

Commit ee44688385629be0a74e51e2e62f073afdea6ec3

Authored by Zambom
1 parent 4219e0b7
Exists in master and in 2 other branches amadeus_univasf, refactoring

Adjusting topbar on ipad visualization

Showing 2 changed files with 42 additions and 21 deletions   Show diff stats
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @ee44688
... ... @@ -263,7 +263,27 @@
263 263 height: auto;
264 264 }
265 265  
  266 + #btn-search {
  267 + font-size: 1.5em;
  268 + padding: 0px 10px;
  269 + margin: 10px 1px;
  270 + }
  271 +
  272 + .navbar .logo{
  273 + margin: auto;
  274 + text-align: center;
  275 + padding: 10px;
  276 + height: 50px;
  277 + width: 50px;
  278 + }
  279 +
266 280 /* Mobile Menu */
  281 + .navbar-toggle{
  282 + display: inherit;
  283 + float: left;
  284 + padding:10px;
  285 + }
  286 +
267 287 #mobile_menu_btn, #mobile_search_btn {
268 288 clip: rect(0,0,0,0);
269 289 position: absolute;
... ... @@ -323,6 +343,11 @@
323 343 transform: rotate(45deg) scaleX(1.5) translateY(-8px);
324 344 }
325 345  
  346 + .mobile_menu_navbar > ul,
  347 + .mobile_menu_navbar > ul > li {
  348 + float: none !important;
  349 + }
  350 +
326 351 .mobile_menu_navbar > ul > li > a {
327 352 padding-top: 10px !important;
328 353 padding-bottom: 10px !important;
... ... @@ -335,15 +360,27 @@
335 360  
336 361 .mobile_menu_navbar .language-selector-on-header .dropdown-menu {
337 362 position: absolute;
  363 + margin-left: 0px;
338 364 }
339 365  
340   - .mobile_menu_navbar .language-selector-on-header {
  366 + .mobile_menu_navbar .language-selector-on-header {
341 367 position: absolute;
342 368 width: 100%;
343 369 bottom: 20px;
344 370 left: 0px;
345 371 text-align: center;
346 372 }
  373 +
  374 + .mobile_menu_navbar .navbar-nav .open .dropdown-menu {
  375 + position: static;
  376 + float: none;
  377 + width: auto;
  378 + margin-top: 0;
  379 + background-color: transparent;
  380 + border: 0;
  381 + -webkit-box-shadow: none;
  382 + box-shadow: none;
  383 + }
347 384 }
348 385  
349 386 @media(max-height: 450px) {
... ... @@ -352,7 +389,7 @@
352 389 }
353 390 }
354 391  
355   -@media(min-width: 768px) {
  392 +@media(min-width: 769px) {
356 393  
357 394 #profile-menu{
358 395 float:right;
... ... @@ -460,24 +497,10 @@
460 497 background-color: #F5F5F5;
461 498 }
462 499  
463   - .navbar-toggle{
464   - float: left;
465   - padding:10px;
466   - }
  500 +
467 501  
468 502  
469   - #btn-search {
470   - font-size: 1.5em;
471   - padding: 0px 10px;
472   - margin: 10px 1px;
473   - }
474   - .navbar .logo{
475   - margin: auto;
476   - text-align: center;
477   - padding: 10px;
478   - height: 50px;
479   - width: 50px;
480   - }
  503 +
481 504  
482 505  
483 506  
... ...
amadeus/templates/base.html
  Diff comments   View file @ee44688
... ... @@ -108,7 +108,7 @@
108 108 </div>
109 109  
110 110 <div class="navbar-collapse collapse navbar-responsive-collapse">
111   - <div class="col-md-7 col-md-offset-1 col-sm-6 col-sm-offset-1 col-lg-7 col-lg-offset-1 text-center">
  111 + <div class="col-md-6 col-md-offset-1 col-sm-6 col-sm-offset-1 col-lg-7 col-lg-offset-1 text-center">
112 112 <form id="SearchForm" action="{% url 'subjects:search' %}" method="get" accept-charset="utf-8" class="navbar-form">
113 113 <div class="input-group">
114 114 <div class="form-group is-empty" >
... ... @@ -297,8 +297,6 @@
297 297 </form>
298 298 </div>
299 299 </div>
300   -
301   -
302 300 </div>
303 301  
304 302  
... ...