Procházet zdrojové kódy

fix nav-bar layout for smartphone size screen

Yuki Takei před 8 roky
rodič
revize
ac0021287d
2 změnil soubory, kde provedl 15 přidání a 6 odebrání
  1. 6 6
      lib/views/layout/layout.html
  2. 9 0
      resource/styles/scss/_layout.scss

+ 6 - 6
lib/views/layout/layout.html

@@ -161,24 +161,24 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
 
 
       <ul class="nav navbar-top-links navbar-right pull-right">
       <ul class="nav navbar-top-links navbar-right pull-right">
         {% if user and user.admin %}
         {% if user and user.admin %}
-        <li id="">
-          <a href="/admin" id="link-mypage">
-            <i class="icon-settings"></i> {{ t('Admin') }}
+        <li class="nav-item-admin">
+          <a href="/admin">
+            <i class="icon-settings"></i><span>{{ t('Admin') }}</span>
           </a>
           </a>
         </li>
         </li>
         {% endif %}
         {% endif %}
 
 
         {% if user %}
         {% if user %}
-        <li id="" class="dropdown">
+        <li class="nav-item-create-page">
           <a href="#" data-target="#create-page" data-toggle="modal">
           <a href="#" data-target="#create-page" data-toggle="modal">
-            <i class="icon-pencil"></i> {{ t('New') }}
+            <i class="icon-pencil"></i><span>{{ t('New') }}</span>
           </a>
           </a>
         </li>
         </li>
         <li class="dropdown">
         <li class="dropdown">
           <a class="dropdown-toggle waves-effect waves-light" data-toggle="dropdown">
           <a class="dropdown-toggle waves-effect waves-light" data-toggle="dropdown">
             <img src="{{ user|picture }}" class="picture img-circle" width="25" /> {{ user.name }}
             <img src="{{ user|picture }}" class="picture img-circle" width="25" /> {{ user.name }}
           </a>
           </a>
-          <ul class="dropdown-menu">
+          <ul class="dropdown-menu dropdown-menu-right">
             <li><a href="/user/{{ user.username }}"><i class="icon-fw icon-home"></i>{{ t('Home') }}</a></li>
             <li><a href="/user/{{ user.username }}"><i class="icon-fw icon-home"></i>{{ t('Home') }}</a></li>
             <li><a href="/me"><i class="icon-fw icon-wrench"></i>{{ t('User Settings') }}</a></li>
             <li><a href="/me"><i class="icon-fw icon-wrench"></i>{{ t('User Settings') }}</a></li>
             <li role="separator" class="divider"></li>
             <li role="separator" class="divider"></li>

+ 9 - 0
resource/styles/scss/_layout.scss

@@ -16,6 +16,15 @@
         // margin-right: 5px;
         // margin-right: 5px;
       }
       }
     }
     }
+
+    .nav-item-admin, .nav-item-create-page {
+      span {
+        margin-left: 0.5em;
+        @media (max-width: $screen-xs-min) {
+          display: none;
+        }
+      }
+    }
   } // }}}
   } // }}}
 
 
   .main {
   .main {