From 231898bca8274afb1835f9468c2ca86d9a5122c7 Mon Sep 17 00:00:00 2001
From: felipebormann <felipe.bormann@gmail.com>
Date: Wed, 8 Feb 2017 16:01:21 -0300
Subject: [PATCH] adjust right alignment of language selector on header

---
 amadeus/static/css/base/amadeus_responsive.css | 10 ++++++++++
 amadeus/templates/base.html                    | 40 ++++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/amadeus/static/css/base/amadeus_responsive.css b/amadeus/static/css/base/amadeus_responsive.css
index 0f91541..db77447 100644
--- a/amadeus/static/css/base/amadeus_responsive.css
+++ b/amadeus/static/css/base/amadeus_responsive.css
@@ -46,6 +46,8 @@
 }
 
 @media(max-width: 768px) {
+
+
 	.language-selector-on-header img{
 		display: none;
 	}
@@ -128,6 +130,14 @@
 
 @media(min-width: 768px) {
 
+	#profile-menu{
+		float:right;
+	}
+
+	#staff-menu{
+		float:right;
+	}
+
 	.language-selector-on-header{
 	    float: left;
 	    width: 5%;
diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index 79ad2d2..0f928fc 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -92,8 +92,10 @@
                         </div>
                     </form>
                 </div>
-                <ul class="nav navbar-nav">
-                <li class="dropdown language-selector-on-header {{ settings_menu_active }}" title data-original-title="{% trans 'Language Selector' %}"> 
+               
+                <ul class="nav navbar-nav navbar-right notifications">
+
+                      <li class="dropdown language-selector-on-header {{ settings_menu_active }}" title data-original-title="{% trans 'Language Selector' %}"> 
                         <a href="#" class="dropdown-toggle hidden-xs" data-toggle="dropdown" data-close-others="true">
                             <img src="{% static "img/brazilicon.png" %}" />
                         </a>
@@ -117,12 +119,24 @@
                             </li>
                         </ul>
                 </li>
-                </ul>
-                <ul class="nav navbar-nav navbar-right notifications">
+                   
 
+                    <li id="profile-menu" class="dropdown" data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}">
+                        <a href="" data-toggle="dropdown" class="dropdown-toggle profile">
+                            <img src="{{ user.image_url }}" class="hidden-xs" style="width:50px;height:50px" />
+                            <span class="visible-xs-inline">{{ user }}</span>
+                        </a>
+                        <ul class="dropdown-menu" role="menu">
+                            <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
+                            <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
+                            <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>
+                            <li><a href="{% url 'users:remove_acc' %}">{% trans 'Delete Account' %}</a></li>
+                            <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
+                        </ul>
+                    </li>
 
-                    {% if user.is_staff %}
-                        <li class="dropdown {{ settings_menu_active }}" title data-original-title="{% trans 'settings' %}">
+                     {% if user.is_staff %}
+                        <li id="staff-menu" class="dropdown {{ settings_menu_active }}" title data-original-title="{% trans 'settings' %}">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                                 <i class="fa fa-cog hidden-xs" aria-hidden="true"></i>
                                 <span class="visible-xs-inline">{% trans 'Settings' %}</span>
@@ -155,20 +169,6 @@
                             </ul>
                         </li>
                     {% endif %}
-
-                    <li class="dropdown" data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}">
-                        <a href="" data-toggle="dropdown" class="dropdown-toggle profile">
-                            <img src="{{ user.image_url }}" class="hidden-xs" style="width:50px;height:50px" />
-                            <span class="visible-xs-inline">{{ user }}</span>
-                        </a>
-                        <ul class="dropdown-menu" role="menu">
-                            <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                            <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
-                            <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>
-                            <li><a href="{% url 'users:remove_acc' %}">{% trans 'Delete Account' %}</a></li>
-                            <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
-                        </ul>
-                    </li>
                 </ul>
             </div>
         </div>
--
libgit2 0.21.2