Download as
Browse Code »

Commit 231898bca8274afb1835f9468c2ca86d9a5122c7

Authored by felipebormann
1 parent c866570d
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

adjust right alignment of language selector on header

Showing 2 changed files with 30 additions and 20 deletions   Show diff stats
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @231898b
@@ -46,6 +46,8 @@ @@ -46,6 +46,8 @@
46 } 46 }
47 47
48 @media(max-width: 768px) { 48 @media(max-width: 768px) {
  49 +
  50 +
49 .language-selector-on-header img{ 51 .language-selector-on-header img{
50 display: none; 52 display: none;
51 } 53 }
@@ -128,6 +130,14 @@ @@ -128,6 +130,14 @@
128 130
129 @media(min-width: 768px) { 131 @media(min-width: 768px) {
130 132
  133 + #profile-menu{
  134 + float:right;
  135 + }
  136 +
  137 + #staff-menu{
  138 + float:right;
  139 + }
  140 +
131 .language-selector-on-header{ 141 .language-selector-on-header{
132 float: left; 142 float: left;
133 width: 5%; 143 width: 5%;
amadeus/templates/base.html
  Diff comments   View file @231898b
@@ -92,8 +92,10 @@ @@ -92,8 +92,10 @@
92 </div> 92 </div>
93 </form> 93 </form>
94 </div> 94 </div>
95 - <ul class="nav navbar-nav">  
96 - <li class="dropdown language-selector-on-header {{ settings_menu_active }}" title data-original-title="{% trans 'Language Selector' %}"> 95 +
  96 + <ul class="nav navbar-nav navbar-right notifications">
  97 +
  98 + <li class="dropdown language-selector-on-header {{ settings_menu_active }}" title data-original-title="{% trans 'Language Selector' %}">
97 <a href="#" class="dropdown-toggle hidden-xs" data-toggle="dropdown" data-close-others="true"> 99 <a href="#" class="dropdown-toggle hidden-xs" data-toggle="dropdown" data-close-others="true">
98 <img src="{% static "img/brazilicon.png" %}" /> 100 <img src="{% static "img/brazilicon.png" %}" />
99 </a> 101 </a>
@@ -117,12 +119,24 @@ @@ -117,12 +119,24 @@
117 </li> 119 </li>
118 </ul> 120 </ul>
119 </li> 121 </li>
120 - </ul>  
121 - <ul class="nav navbar-nav navbar-right notifications"> 122 +
122 123
  124 + <li id="profile-menu" class="dropdown" data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}">
  125 + <a href="" data-toggle="dropdown" class="dropdown-toggle profile">
  126 + <img src="{{ user.image_url }}" class="hidden-xs" style="width:50px;height:50px" />
  127 + <span class="visible-xs-inline">{{ user }}</span>
  128 + </a>
  129 + <ul class="dropdown-menu" role="menu">
  130 + <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
  131 + <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
  132 + <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>
  133 + <li><a href="{% url 'users:remove_acc' %}">{% trans 'Delete Account' %}</a></li>
  134 + <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
  135 + </ul>
  136 + </li>
123 137
124 - {% if user.is_staff %}  
125 - <li class="dropdown {{ settings_menu_active }}" title data-original-title="{% trans 'settings' %}"> 138 + {% if user.is_staff %}
  139 + <li id="staff-menu" class="dropdown {{ settings_menu_active }}" title data-original-title="{% trans 'settings' %}">
126 <a href="#" class="dropdown-toggle" data-toggle="dropdown"> 140 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
127 <i class="fa fa-cog hidden-xs" aria-hidden="true"></i> 141 <i class="fa fa-cog hidden-xs" aria-hidden="true"></i>
128 <span class="visible-xs-inline">{% trans 'Settings' %}</span> 142 <span class="visible-xs-inline">{% trans 'Settings' %}</span>
@@ -155,20 +169,6 @@ @@ -155,20 +169,6 @@
155 </ul> 169 </ul>
156 </li> 170 </li>
157 {% endif %} 171 {% endif %}
158 -  
159 - <li class="dropdown" data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}">  
160 - <a href="" data-toggle="dropdown" class="dropdown-toggle profile">  
161 - <img src="{{ user.image_url }}" class="hidden-xs" style="width:50px;height:50px" />  
162 - <span class="visible-xs-inline">{{ user }}</span>  
163 - </a>  
164 - <ul class="dropdown-menu" role="menu">  
165 - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>  
166 - <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>  
167 - <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>  
168 - <li><a href="{% url 'users:remove_acc' %}">{% trans 'Delete Account' %}</a></li>  
169 - <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>  
170 - </ul>  
171 - </li>  
172 </ul> 172 </ul>
173 </div> 173 </div>
174 </div> 174 </div>