Download as
Browse Code »

Commit 4e2f6a197e3387b19e1c152b48d799e8a87554f8

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

Language selector adjusts

Showing 4 changed files with 19 additions and 7 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @4e2f6a1
@@ -17,7 +17,8 @@ a:focus { @@ -17,7 +17,8 @@ a:focus {
17 17
18 18
19 .language-selector{ 19 .language-selector{
20 - margin-right: 20px; 20 + margin-right: 5px;
  21 + margin-top: -2px;
21 } 22 }
22 23
23 .language-selector img{ 24 .language-selector img{
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @4e2f6a1
@@ -142,16 +142,18 @@ @@ -142,16 +142,18 @@
142 142
143 .language-selector-on-header{ 143 .language-selector-on-header{
144 float: left; 144 float: left;
145 - width: 5%; 145 + width: 50px;
146 } 146 }
147 147
148 .language-selector-on-header img{ 148 .language-selector-on-header img{
149 - margin-top: 15%;  
150 - width: 30px; 149 + margin-top: -20%;
  150 + margin-left: -20%;
  151 + width: 20px;
151 } 152 }
152 .language-selector-on-header > ul img{ 153 .language-selector-on-header > ul img{
153 - width: 30%; 154 + width: 15%;
154 margin-top: 0%; 155 margin-top: 0%;
  156 + margin-left: 0%;
155 } 157 }
156 158
157 159
amadeus/static/css/themes/green.css
  Diff comments   View file @4e2f6a1
@@ -579,6 +579,15 @@ a.add-row { @@ -579,6 +579,15 @@ a.add-row {
579 background-color: initial; 579 background-color: initial;
580 } 580 }
581 581
  582 +.language-selector .dropdown-menu > .active > a {
  583 + background: #EEEEEE;
  584 + color: #009688;
  585 +}
  586 +
  587 +.language-selector .dropdown-menu > .active > a:hover {
  588 + color: #009688;
  589 +}
  590 +
582 @media(max-width: 768px) { 591 @media(max-width: 768px) {
583 .navbar .navbar-nav .dropdown .dropdown-menu li > a { 592 .navbar .navbar-nav .dropdown .dropdown-menu li > a {
584 color: #333333 !important; 593 color: #333333 !important;
amadeus/templates/base.html
  Diff comments   View file @4e2f6a1
@@ -184,7 +184,7 @@ @@ -184,7 +184,7 @@
184 <i class="fa fa-graduation-cap" aria-hidden="true"></i> 184 <i class="fa fa-graduation-cap" aria-hidden="true"></i>
185 </a> 185 </a>
186 </li> 186 </li>
187 - <li class="item {{ mural_menu_active }} action_icon" data-toggle="tooltip" data-placement="right" title="{% trans "Timeline" %}"> 187 + <li class="item {{ mural_menu_active }} action_icon" data-toggle="tooltip" data-placement="right" title="{% trans "Mural" %}">
188 <a href="{% url 'mural:manage_general' %}"> 188 <a href="{% url 'mural:manage_general' %}">
189 <i class="fa fa-list" aria-hidden="true" ></i> 189 <i class="fa fa-list" aria-hidden="true" ></i>
190 <span class="badge notify_badge mural_badge" {% if mural_notifications_count == 0 %} style="display:none" {% endif %}>{% if mural_notifications_count > 99 %} +99 {% else %} {{ mural_notifications_count }} {% endif %}</span> 190 <span class="badge notify_badge mural_badge" {% if mural_notifications_count == 0 %} style="display:none" {% endif %}>{% if mural_notifications_count > 99 %} +99 {% else %} {{ mural_notifications_count }} {% endif %}</span>
@@ -236,7 +236,7 @@ @@ -236,7 +236,7 @@
236 <i class="fa fa-graduation-cap" aria-hidden="true"></i> 236 <i class="fa fa-graduation-cap" aria-hidden="true"></i>
237 </a> 237 </a>
238 </li> 238 </li>
239 - <li class="item {{ mural_menu_active }} action_icon" data-toggle="tooltip" data-placement="top" title="{% trans "Timeline" %}"> 239 + <li class="item {{ mural_menu_active }} action_icon" data-toggle="tooltip" data-placement="top" title="{% trans "Mural" %}">
240 <a href="{% url 'mural:manage_general' %}" 240 <a href="{% url 'mural:manage_general' %}"
241 <i class="fa fa-list" aria-hidden="true" ></i> 241 <i class="fa fa-list" aria-hidden="true" ></i>
242 <span class="badge notify_badge mural_badge" {% if mural_notifications_count == 0 %} style="display:none" {% endif %}>{% if mural_notifications_count > 99 %} +99 {% else %} {{ mural_notifications_count }} {% endif %}</span> 242 <span class="badge notify_badge mural_badge" {% if mural_notifications_count == 0 %} style="display:none" {% endif %}>{% if mural_notifications_count > 99 %} +99 {% else %} {{ mural_notifications_count }} {% endif %}</span>