Commit 230a6fbb50181fe18b051703959683c079a35ac5

Authored by Felipe Henrique de Almeida Bormann
1 parent 41e041b7

modified language selector side, it's size and it works on large screens, still …

…have to work on the responsiveness
amadeus/static/css/base/amadeus.css
@@ -24,13 +24,17 @@ a:focus { @@ -24,13 +24,17 @@ a:focus {
24 .language-selector > ul img{ 24 .language-selector > ul img{
25 width: 15%; 25 width: 15%;
26 } 26 }
  27 +.language-selector-on-header{
  28 + float: left;
  29 + width: 5%;
  30 +}
27 31
28 .language-selector-on-header img{ 32 .language-selector-on-header img{
29 - width: 15%;  
30 - margin-top: 2%; 33 + margin-top: 10%;
  34 + width: 50%;
31 } 35 }
32 .language-selector-on-header > ul img{ 36 .language-selector-on-header > ul img{
33 - width: 15%; 37 + width: 30%;
34 } 38 }
35 39
36 .navbar-header{ 40 .navbar-header{
amadeus/templates/base.html
@@ -75,7 +75,25 @@ @@ -75,7 +75,25 @@
75 <span class="pull-right project_name">{{ theme.title }}</span> 75 <span class="pull-right project_name">{{ theme.title }}</span>
76 </a> 76 </a>
77 77
78 - <li class="dropdown language-selector-on-header"> 78 +
  79 + </div>
  80 + <div class="navbar-collapse collapse navbar-responsive-collapse">
  81 + <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">
  82 + <form id="SearchForm" action="{% url 'subjects:search' %}" method="get" accept-charset="utf-8" class="navbar-form">
  83 + <div class="input-group">
  84 + <div class="form-group is-empty" >
  85 + <input type="text" class="form-control top-search" placeholder="{% trans 'Search for subjects and resources' %}" name="search">
  86 + </div>
  87 + <span class="input-group-btn input-group-sm">
  88 + <button type="submit" class="btn btn-primary" id="btn-search">
  89 + <i class="fa fa-search" aria-hidden="true" style="color:white; font-size:20px"></i>
  90 + </button>
  91 + </span>
  92 + </div>
  93 + </form>
  94 + </div>
  95 +
  96 + <li class="dropdown language-selector-on-header">
79 <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true"> 97 <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true">
80 <img src="{% static "img/brazilicon.png" %}" /> 98 <img src="{% static "img/brazilicon.png" %}" />
81 </a> 99 </a>
@@ -94,23 +112,10 @@ @@ -94,23 +112,10 @@
94 </li> 112 </li>
95 </ul> 113 </ul>
96 </li> 114 </li>
97 - </div>  
98 - <div class="navbar-collapse collapse navbar-responsive-collapse">  
99 - <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">  
100 - <form id="SearchForm" action="{% url 'subjects:search' %}" method="get" accept-charset="utf-8" class="navbar-form">  
101 - <div class="input-group">  
102 - <div class="form-group is-empty" >  
103 - <input type="text" class="form-control top-search" placeholder="{% trans 'Search for subjects and resources' %}" name="search">  
104 - </div>  
105 - <span class="input-group-btn input-group-sm">  
106 - <button type="submit" class="btn btn-primary" id="btn-search">  
107 - <i class="fa fa-search" aria-hidden="true" style="color:white; font-size:20px"></i>  
108 - </button>  
109 - </span>  
110 - </div>  
111 - </form>  
112 - </div> 115 +
113 <ul class="nav navbar-nav navbar-right notifications"> 116 <ul class="nav navbar-nav navbar-right notifications">
  117 +
  118 +
114 {% if user.is_staff %} 119 {% if user.is_staff %}
115 <li class="dropdown {{ settings_menu_active }}" title data-original-title="{% trans 'settings' %}"> 120 <li class="dropdown {{ settings_menu_active }}" title data-original-title="{% trans 'settings' %}">
116 <a href="#" class="dropdown-toggle" data-toggle="dropdown"> 121 <a href="#" class="dropdown-toggle" data-toggle="dropdown">