Browse Source

tab fix 1

takahiros 6 years ago
parent
commit
2a03e0c0a2
2 changed files with 18 additions and 11 deletions
  1. 5 0
      src/client/styles/scss/_layout.scss
  2. 13 11
      src/server/views/widget/page_tabs.html

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

@@ -181,3 +181,8 @@ $nav-main-left-tab-width: 95px;
     }
   }
 }
+
+// tab style
+.nav.nav-tabs .nav-main-left-tab {
+  width: 120px;
+}

+ 13 - 11
src/server/views/widget/page_tabs.html

@@ -4,20 +4,20 @@
   {#
     Left Tabs
   #}
-  <li class="nav-main-left-tab active">
+  <li class="nav-main-left-tab px-3 py-2 active">
     <a href="#revision-body" data-toggle="tab">
       <i class="icon-control-play"></i> View
     </a>
   </li>
 
   {% if !isTrashPage() %}
-  <li class="nav-main-left-tab nav-tab-edit">
+  <li class="nav-main-left-tab nav-tab-edit px-3 py-2">
     <a {% if user %}href="#edit" data-toggle="tab"{% endif %} class="edit-button {% if not user %}edit-button-disabled{% endif %}">
       <i class="icon-note"></i> {{ t('Edit') }}
     </a>
   </li>
   {% if isHackmdSetup() %}
-  <li class="nav-main-left-tab nav-tab-hackmd">
+  <li class="nav-main-left-tab nav-tab-hackmd px-3 py-2">
     <a {% if user %}href="#hackmd" data-toggle="tab"{% endif %} class="{% if not user %}edit-button-disabled{% endif %}">
       <i class="fa fa-file-text-o"></i> {{ t('HackMD') }}
     </a>
@@ -28,9 +28,16 @@
   {#
     Right Tabs
   #}
+
+  <li class="nav-main-right-tab ml-auto px-3 py-2">
+    <a href="#revision-history" data-toggle="tab">
+      <i class="icon-layers"></i><span class="hidden-xs"> {{ t('History') }}</span>
+    </a>
+  </li>
+
   {% if !isTrashPage() %}
     {% if page.isPortal() %}
-    <li class="nav-main-right-tab dropdown pull-right">
+    <li class="nav-main-right-tab dropdown px-3 py-2">
       <a class="dropdown-toggle {% if not user %}dropdown-disabled{% endif %}" {% if user %}data-toggle="dropdown" href="#"{% endif %}>
         <i class="icon-options-vertical"></i>
       </a>
@@ -46,7 +53,7 @@
       </ul>
     </li>
     {% else %}
-    <li class="nav-main-right-tab dropdown pull-right">
+    <li class="nav-main-right-tab dropdown ml-auto px-3 py-2">
       <a class="dropdown-toggle {% if not user %}dropdown-disabled{% endif %}" {% if user %}data-toggle="dropdown" href="#"{% endif %}>
         <i class="icon-options-vertical"></i>
       </a>
@@ -64,13 +71,8 @@
     {% endif %}
   {% endif %}
 
-  <li class="nav-main-right-tab pull-right">
-    <a href="#revision-history" data-toggle="tab">
-      <i class="icon-layers"></i><span class="hidden-xs"> {{ t('History') }}</span>
-    </a>
-  </li>
   {% if not page.isPortal() %}
-    <li class="nav-main-right-tab pull-right">
+    <li class="nav-main-right-tab px-3 py-2">
       <a href="?presentation=1" class="toggle-presentation">
         <i class="icon-film"></i><span class="hidden-xs"> {{ t('Presentation Mode') }}</span>
       </a>