hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1272 CSS dropdown issue on ie 7/8

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-07-12 14:32:25 +02:00
parent d4d9106b92
commit 43ff943c2c
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/web/login/include/language-block.html.twig
View File

@@ -8,9 +8,8 @@
{% set currentUrl = app['request'].getBaseUrl() ~ app['request'].getPathInfo() ~ qs %} {% set currentUrl = app['request'].getBaseUrl() ~ app['request'].getPathInfo() ~ qs %}
<div id="authentication-sidebar-language" class="text-right well-small"> <div id="authentication-sidebar-language" class="text-right well-small">
<span class="language"><b>{% trans "language" %}</b></span> <div class="pull-right btn-group">
<div class="btn-group"> <button id="language-button" class="btn btn-mini btn-flat dropdown-toggle" data-toggle="dropdown" type="button">
<button id="language-button" class="btn btn-mini btn-flat dropdown-toggle" data-toggle="dropdown">
{{ attribute(languages, app['locale']) }} {{ attribute(languages, app['locale']) }}
<span class="caret"></span> <span class="caret"></span>
</button> </button>
@@ -20,4 +19,5 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
<div class="language pull-right"><b>{% trans "language" %}</b></div>
</div> </div>

8
templates/web/login/layout/base-layout.html.twig
View File

@@ -27,12 +27,16 @@
{% block header_stylesheet %} {% block header_stylesheet %}
<link rel="stylesheet" href="{{ path('minifier', { 'g' : 'authentication_css' }) }}"> <link rel="stylesheet" href="{{ path('minifier', { 'g' : 'authentication_css' }) }}">
<!--[if IE 7]> <!--[if lte IE 8]>
<link rel="stylesheet" href="{ path('minifier', { 'f' : 'assets/font-awesome/css/font-awesome-ie7.min.css' }) }}"> <link rel="stylesheet" href="{ path('minifier', { 'f' : 'assets/font-awesome/css/font-awesome-ie7.min.css' }) }}">
<![endif]--> <![endif]-->
{% endblock header_stylesheet %} {% endblock header_stylesheet %}
{% block header_javascript %} {% block header_javascript %}
<!--[if lte IE 8]>
<script type="text/javascript" src="{{ path('minifier', {'f' : 'assets/json3/lib/json3.js'}) }}"></script>
<![endif]-->
{# include backbone templates #} {# include backbone templates #}
{% include "login/common/templates.html.twig" %} {% include "login/common/templates.html.twig" %}
@@ -46,7 +50,7 @@
<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p> <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
<![endif]--> <![endif]-->
{% endif %} {% endif %}
<div class="container full-height"> <div class="container">
{% block content_scaffholding %} {% block content_scaffholding %}
{% endblock %} {% endblock %}

4
www/skins/login/less/skin.less
View File

@@ -834,8 +834,8 @@ form[name=registerForm] .multiselect-group {
/** IE Fixes */ /** IE Fixes */
.lt-ie8 authentication-sidebar-language .caret { .lt-ie8 #authentication-sidebar-language .caret {
margin: 6px 0px 0px 7px; margin:0;
} }
.lt-ie8 .inline li { .lt-ie8 .inline li {