Commit d37056108f612c9173e38d78c4e0329d00af5314
Exists in
master
and in
3 other branches
Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring
Showing
3 changed files
with
49 additions
and
10 deletions
Show diff stats
amadeus/static/css/base/amadeus.css
| @@ -223,10 +223,6 @@ | @@ -223,10 +223,6 @@ | ||
| 223 | } | 223 | } |
| 224 | 224 | ||
| 225 | /* NavBar Top */ | 225 | /* NavBar Top */ |
| 226 | -.navbar { | ||
| 227 | - height: 50px; | ||
| 228 | -} | ||
| 229 | - | ||
| 230 | .navbar-brand { | 226 | .navbar-brand { |
| 231 | height: 50px !important; | 227 | height: 50px !important; |
| 232 | } | 228 | } |
| @@ -234,6 +230,10 @@ | @@ -234,6 +230,10 @@ | ||
| 234 | background: #00695C !important; | 230 | background: #00695C !important; |
| 235 | } | 231 | } |
| 236 | 232 | ||
| 233 | +.navbar .navbar-form { | ||
| 234 | + margin-top: 10px; | ||
| 235 | +} | ||
| 236 | + | ||
| 237 | .navbar .logo { | 237 | .navbar .logo { |
| 238 | text-align: center; | 238 | text-align: center; |
| 239 | margin-top: -6px; | 239 | margin-top: -6px; |
| @@ -285,10 +285,6 @@ | @@ -285,10 +285,6 @@ | ||
| 285 | font-style: italic; | 285 | font-style: italic; |
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | -#btn-search { | ||
| 289 | - margin-top: -6px; | ||
| 290 | - height: 50px; | ||
| 291 | -} | ||
| 292 | #btn-search:hover { | 288 | #btn-search:hover { |
| 293 | background: #00695C; | 289 | background: #00695C; |
| 294 | } | 290 | } |
amadeus/static/css/base/amadeus_responsive.css
| @@ -2,4 +2,47 @@ | @@ -2,4 +2,47 @@ | ||
| 2 | .navbar .navbar-brand { | 2 | .navbar .navbar-brand { |
| 3 | padding: 15px; | 3 | padding: 15px; |
| 4 | } | 4 | } |
| 5 | +} | ||
| 6 | + | ||
| 7 | +@media(max-width: 768px) { | ||
| 8 | + #btn-search { | ||
| 9 | + margin-top: -5px; | ||
| 10 | + height: 30px; | ||
| 11 | + } | ||
| 12 | + | ||
| 13 | + .navbar-form { | ||
| 14 | + margin-left: -30px; | ||
| 15 | + margin-right: -30px; | ||
| 16 | + } | ||
| 17 | + | ||
| 18 | + .navbar .navbar-form { | ||
| 19 | + margin-top: 0px !important; | ||
| 20 | + } | ||
| 21 | +} | ||
| 22 | + | ||
| 23 | +@media(min-width: 768px) { | ||
| 24 | + .navbar { | ||
| 25 | + height: 50px; | ||
| 26 | + } | ||
| 27 | + | ||
| 28 | + #btn-search { | ||
| 29 | + margin-top: -10px; | ||
| 30 | + height: 50px; | ||
| 31 | + } | ||
| 32 | + | ||
| 33 | + .navbar-form .input-group { | ||
| 34 | + width: 100%; | ||
| 35 | + } | ||
| 36 | + | ||
| 37 | + .navbar-form .form-group { | ||
| 38 | + width: 100%; | ||
| 39 | + } | ||
| 40 | + | ||
| 41 | + .navbar-form .input-group .form-control { | ||
| 42 | + width: 100%; | ||
| 43 | + } | ||
| 44 | + | ||
| 45 | + .navbar-form .input-group-btn { | ||
| 46 | + width: 50px !important; | ||
| 47 | + } | ||
| 5 | } | 48 | } |
| 6 | \ No newline at end of file | 49 | \ No newline at end of file |
amadeus/templates/base.html
| @@ -77,8 +77,8 @@ | @@ -77,8 +77,8 @@ | ||
| 77 | </a> | 77 | </a> |
| 78 | </div> | 78 | </div> |
| 79 | <div class="navbar-collapse collapse navbar-responsive-collapse"> | 79 | <div class="navbar-collapse collapse navbar-responsive-collapse"> |
| 80 | - <div class="col-sm-5 col-sm-offset-1 col-md-5 cards-content" id= 'NavBarSearch'> | ||
| 81 | - <form id="SearchForm" action="#" method="get" accept-charset="utf-8"> | 80 | + <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"> |
| 81 | + <form id="SearchForm" action="#" method="get" accept-charset="utf-8" class="navbar-form"> | ||
| 82 | <div class="input-group"> | 82 | <div class="input-group"> |
| 83 | <div class="form-group is-empty" > | 83 | <div class="form-group is-empty" > |
| 84 | <input type="text" class="form-control top-search" placeholder="{% trans 'Search Files (.pdf, others) and/or activities' %}" name="search"> | 84 | <input type="text" class="form-control top-search" placeholder="{% trans 'Search Files (.pdf, others) and/or activities' %}" name="search"> |