Browse Source

[spark] Always show the change snippet type dropdown

Johan Ahlen 10 năm trước cách đây
mục cha
commit
0152e8c

+ 3 - 6
apps/spark/src/spark/templates/editor_components.mako

@@ -325,18 +325,15 @@ from django.utils.translation import ugettext as _
            
         </span>
         <div class="dropdown inline widget-type">
-          <!-- ko if: $root.isEditing() -->
           <a class="dropdown-toggle no-underline" data-toggle="dropdown" href="javascript:void(0)">
             <span data-bind="template: { name: 'snippetIcon', data: $data }"></span>
-            <b class="caret" data-bind="visible: $root.isEditing()"></b>
+            <span class="hover-actions-no-transition">
+              <b class="caret"></b>
+            </span>
           </a>
           <ul class="dropdown-menu" data-bind="foreach: $root.availableSnippets">
             <li><a class="pointer" data-bind="click: function(){ $parent.type($data.type()); }, text: name"></a></li>
           </ul>
-          <!-- /ko -->
-          <!-- ko ifnot: $root.isEditing() -->
-          <span data-bind="template: { name: 'snippetIcon', data: $data }"></span>
-          <!-- /ko -->
         </div>
 
         <span data-bind="editable: name, editableOptions: {enabled: $root.isEditing(), placement: 'right'}"></span>

+ 7 - 0
desktop/core/src/desktop/static/desktop/css/hue3.css

@@ -2003,8 +2003,10 @@ pre {
 }
 
 .reveals-actions:hover .hover-actions,
+.reveals-actions:hover .hover-actions-no-transition,
 .reveals-actions-2nd:hover .hover-actions-2nd,
 .reveals-actions-3rd:hover .hover-actions-3rd {
+  visibility: visible;
   opacity: 1;
 }
 
@@ -2016,6 +2018,11 @@ pre {
   transition: opacity 0.2s linear;
 }
 
+/* Work-around for chrome with element out-transition not firing in .dropdown */
+.hover-actions-no-transition {
+  visibility: hidden;
+}
+
 .hover-actions > a,
 .hover-actions-2nd > a,
 .hover-actions-3rd > a {