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

Merge pull request #1245 from weseek/support/apply-bst4-content-popup-fix

GW-329 「更新履歴」の横ポップアップ:popup fixed
Yuki Takei 6 лет назад
Родитель
Сommit
77f38d3982
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      src/server/views/layout/layout.html
  2. 2 2
      src/server/views/widget/page_tabs.html

+ 1 - 1
src/server/views/layout/layout.html

@@ -117,7 +117,7 @@
       </ul>
       </ul>
 
 
       <!-- 5 user action -->
       <!-- 5 user action -->
-      <ul class="nav navbar-top-links flex-nowrap ml-auto my-auto">
+      <ul class="nav navbar-top-links flex-nowrap ml-auto mr-2 my-auto">
         {% if user and user.admin %}
         {% if user and user.admin %}
         <li class="nav-item-admin mr-2 mr-lg-3 my-auto">
         <li class="nav-item-admin mr-2 mr-lg-3 my-auto">
           <a class="text-white" href="/admin">
           <a class="text-white" href="/admin">

+ 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">
+      <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">
+      <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>