瀏覽代碼

Merge branch 'support/apply-bootstrap4' into support/apply-bst4-create-modal-fix

takahiros 6 年之前
父節點
當前提交
2eb12b2502
共有 2 個文件被更改,包括 2 次插入7 次删除
  1. 0 5
      src/client/styles/scss/_layout.scss
  2. 2 2
      src/server/views/widget/page_tabs.html

+ 0 - 5
src/client/styles/scss/_layout.scss

@@ -179,8 +179,3 @@
   margin-left: -15px;
   margin-left: -15px;
   overflow: unset;
   overflow: unset;
 }
 }
-
-// dropdown menu custom
-.grw-dropdown-menu-right-side {
-  transform: translate3d(-221px, 42px, 0px) !important;
-}

+ 2 - 2
src/server/views/widget/page_tabs.html

@@ -41,7 +41,7 @@
       <a class="nav-link dropdown-toggle {% if not user %}dropdown-disabled{% endif %}" {% if user %}data-toggle="dropdown" href="#"{% endif %}>
       <a class="nav-link dropdown-toggle {% if not user %}dropdown-disabled{% endif %}" {% if user %}data-toggle="dropdown" href="#"{% endif %}>
         <i class="icon-options-vertical"></i>
         <i class="icon-options-vertical"></i>
       </a>
       </a>
-      <ul class="dropdown-menu grw-dropdown-menu-right-side">
+      <ul class="dropdown-menu dropdown-menu-right">
         <li><a href="#" data-target="#create-template" data-toggle="modal"><i class="icon-fw icon-magic-wand"></i> {{ t('template.option_label.create/edit') }}</a></li>
         <li><a href="#" data-target="#create-template" data-toggle="modal"><i class="icon-fw icon-magic-wand"></i> {{ t('template.option_label.create/edit') }}</a></li>
         {% if ('/' !== path) %}
         {% if ('/' !== path) %}
           <li class="divider"></li>
           <li class="divider"></li>
@@ -57,7 +57,7 @@
       <a class="nav-link dropdown-toggle {% if not user %}dropdown-disabled{% endif %}" {% if user %}data-toggle="dropdown" href="#"{% endif %}>
       <a class="nav-link dropdown-toggle {% if not user %}dropdown-disabled{% endif %}" {% if user %}data-toggle="dropdown" href="#"{% endif %}>
         <i class="icon-options-vertical"></i>
         <i class="icon-options-vertical"></i>
       </a>
       </a>
-      <ul class="dropdown-menu grw-dropdown-menu-right-side">
+      <ul class="dropdown-menu dropdown-menu-right">
         <li><a href="#" data-target="#renamePage" data-toggle="modal"><i class="icon-fw icon-action-redo"></i> {{ t('Move/Rename') }}</a></li>
         <li><a href="#" data-target="#renamePage" data-toggle="modal"><i class="icon-fw icon-action-redo"></i> {{ t('Move/Rename') }}</a></li>
         <li><a href="#" data-target="#duplicatePage" data-toggle="modal"><i class="icon-fw icon-docs"></i> {{ t('Duplicate') }}</a></li>
         <li><a href="#" data-target="#duplicatePage" data-toggle="modal"><i class="icon-fw icon-docs"></i> {{ t('Duplicate') }}</a></li>
         <li class="divider"></li>
         <li class="divider"></li>