Просмотр исходного кода

Fixed compact usermenu to render correctly on webkit.

Ralfp 12 лет назад
Родитель
Сommit
3f7d9d2534

+ 2 - 2
static/cranefly/css/cranefly.css

@@ -886,9 +886,9 @@ footer .container .credits p{margin-bottom:0px;color:#555555;font-size:90%;}foot
 .navbar-header .navbar-inner .navbar-compact li.user-profile>a:link .caret-border,.navbar-header .navbar-inner .navbar-compact li.user-profile>a:visited .caret-border{background-color:#fbfbfb;border:1px solid #dfdfdf;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;margin-left:8px;padding:0px 4px;}.navbar-header .navbar-inner .navbar-compact li.user-profile>a:link .caret-border .caret,.navbar-header .navbar-inner .navbar-compact li.user-profile>a:visited .caret-border .caret{margin:0px;padding:0px;position:relative;top:13px;}
 .navbar-header .navbar-inner .navbar-compact li.user-profile>a:hover,.navbar-header .navbar-inner .navbar-compact li.user-profile>a:active{background-color:#fbfbfb;}.navbar-header .navbar-inner .navbar-compact li.user-profile>a:hover .caret-border,.navbar-header .navbar-inner .navbar-compact li.user-profile>a:active .caret-border{border-color:#999999;}
 .navbar-header .navbar-inner .navbar-compact li.user-profile.open .dropdown-toggle:link,.navbar-header .navbar-inner .navbar-compact li.user-profile.open .dropdown-toggle:visited,.navbar-header .navbar-inner .navbar-compact li.user-profile.open .dropdown-toggle:hover,.navbar-header .navbar-inner .navbar-compact li.user-profile.open .dropdown-toggle:focus{background-color:#fbfbfb;}.navbar-header .navbar-inner .navbar-compact li.user-profile.open .dropdown-toggle:link .caret-border,.navbar-header .navbar-inner .navbar-compact li.user-profile.open .dropdown-toggle:visited .caret-border,.navbar-header .navbar-inner .navbar-compact li.user-profile.open .dropdown-toggle:hover .caret-border,.navbar-header .navbar-inner .navbar-compact li.user-profile.open .dropdown-toggle:focus .caret-border{background:#cf402e;border-color:#cf402e;}.navbar-header .navbar-inner .navbar-compact li.user-profile.open .dropdown-toggle:link .caret-border .caret,.navbar-header .navbar-inner .navbar-compact li.user-profile.open .dropdown-toggle:visited .caret-border .caret,.navbar-header .navbar-inner .navbar-compact li.user-profile.open .dropdown-toggle:hover .caret-border .caret,.navbar-header .navbar-inner .navbar-compact li.user-profile.open .dropdown-toggle:focus .caret-border .caret{border-top-color:#ffffff;}
-.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu{border:none;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;border-top:4px solid #cf402e;-webkit-box-shadow:0px 3px 4px #999999;-moz-box-shadow:0px 3px 4px #999999;box-shadow:0px 3px 4px #999999;margin:0px;margin-top:-8px;margin-right:1px;padding:0px;width:270px;}.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu:before{display:none;}
+.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu{border:none;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;border-top:4px solid #cf402e;-webkit-box-shadow:0px 3px 4px #999999;-moz-box-shadow:0px 3px 4px #999999;box-shadow:0px 3px 4px #999999;margin:0px;margin-top:-8px;margin-right:1px;padding:4px 0px;width:270px;}.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu:before{display:none;}
 .navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu:after{border-bottom:6px solid #cf402e;margin-top:-3px;margin-right:11px;}
-.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li{margin:0px;padding:0px;}.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .label{float:right;margin:0px;margin-top:-18px;}
+.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li{margin:0px;padding:0px;}.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .label{float:right;margin:0px;margin-top:2px;}
 .navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;clear:none;display:block;float:none;margin:0px;padding:6px 12px;color:#333333;font-weight:normal;text-align:left;}.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a i,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link i{opacity:1;filter:alpha(opacity=100);}
 .navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a:link .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link:link .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a:active .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link:active .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a:visited .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link:visited .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a:hover .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link:hover .label{background-color:#cf402e;float:right;color:#ffffff;text-shadow:0px 1px 0px #7c261b;}
 .navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a:link,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a:visited{opacity:0.8;filter:alpha(opacity=80);}

+ 2 - 3
static/cranefly/css/cranefly/navbar.less

@@ -186,7 +186,6 @@
             &:link, &:visited, &:hover, &:focus {
               background-color: @bodyBackground;
 
-
               .caret-border {
                 background: @red;
                 border-color: @red;
@@ -206,7 +205,7 @@
             margin: 0px;
             margin-top: -8px;
             margin-right: 1px;
-            padding: 0px;
+            padding: 4px 0px;
             width: 270px;
 
             &:before {
@@ -226,7 +225,7 @@
               .label {
                 float: right;
                 margin: 0px;
-                margin-top: -18px;
+                margin-top: 2px;
               }
 
               a, .btn-link {

+ 4 - 25
templates/cranefly/layout.html

@@ -3,33 +3,12 @@
 
 {% block body %}
 <div id="wrap">
-
-  {#{% if acl.special.can_use_mcp() %}
-  <div class="navbar navbar-inverse navbar-modbar navbar-static-top">
-    <div class="navbar-inner">
-      <div class="container">
-        <ul class="nav">
-          <li><a href="#">Frontlines</a></li>
-          <li><a href="#">Reports <span class="label label-important">5</span></a></li>
-          <li><a href="#">Warnings</a></li>
-        </ul>
-        <form class="navbar-form pull-right">
-          <div class="navbar-search-form">
-            <input type="text" class="span2" placeholder="{% trans %}Enter IP Address or Username...{% endtrans %}">
-            <button type="submit" class="btn btn-link"><i class="icon-search"></i></button>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-  {% endif %}#}
-
   <div class="navbar navbar-header navbar-static-top">
     <div class="navbar-inner">
       <div class="container">
         <a href="{% url 'index' %}" class="brand">{% if settings.board_header %}{{ settings.board_header }}{% else %}{{ settings.board_name }}{% endif %}</a>
         {% if not user.is_crawler() %}
-        <form class="navbar-form pull-left">
+        <form action="" method="post" class="navbar-form pull-left">
           <div class="navbar-search-form">
             <input type="text" class="span2" placeholder="{% trans %}Search community...{% endtrans %}">
             <button type="submit" class="btn btn-link"><i class="icon-search"></i></button>
@@ -69,12 +48,12 @@
               <li><a href="{% url 'usercp' %}"><i class="icon-cog"></i> {% trans %}Change options{% endtrans %}</a></li>
               <li role="presentation" class="divider"></li>
               {% if acl.reports.can_handle() %}
-              <li><a href="{% url 'reports' %}"><i class="icon-fire"></i> {% trans %}Reported Posts{% endtrans %}{% if monitor.reported_posts %}<span class="label">{{ monitor.reported_posts }}</span>{% endif %}</a></li>
+              <li><a href="{% url 'reports' %}">{% if monitor.reported_posts %}<span class="label">{{ monitor.reported_posts }}</span>{% endif %}<i class="icon-fire"></i> {% trans %}Reported Posts{% endtrans %}</a></li>
               {% endif %}
-              <li><a href="{% url 'alerts' %}"><i class="icon-asterisk"></i> {% trans %}Notifications{% endtrans %}{% if user.alerts %}<span class="label">{{ user.alerts }}</span>{% endif %}</a></li>
+              <li><a href="{% url 'alerts' %}">{% if user.alerts %}<span class="label">{{ user.alerts }}</span>{% endif %}<i class="icon-asterisk"></i> {% trans %}Notifications{% endtrans %}</a></li>
               {{ hook_user_menu_dropdown_prepend|safe }}
               {% if settings.enable_private_threads and acl.private_threads.can_participate() %}
-              <li><a href="{% url 'private_threads' %}"><i class="icon-inbox"></i> {% trans %}Private Threads{% endtrans %}{% if user.unread_pds %}<span class="label">{{ user.unread_pds }}</span>{% endif %}</a></li>
+              <li><a href="{% url 'private_threads' %}">{% if user.unread_pds %}<span class="label">{{ user.unread_pds }}</span>{% endif %}<i class="icon-inbox"></i> {% trans %}Private Threads{% endtrans %}</a></li>
               {% endif %}
               <li><a href="{% url 'newsfeed' %}"><i class="icon-signal"></i> {% trans %}News Feed{% endtrans %}</a></li>
               <li><a href="{% url 'watched_threads' %}"><i class="icon-bookmark"></i> {% trans %}Watched Threads{% endtrans %}</a></li>