fix on permission, style, search

zanata · Apr 14, 2016 · 9fc8db2 · 9fc8db2
1 parent 6eb4256
commit 9fc8db2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/frontend/src/main/web/atomicCssConfig.js b/frontend/src/main/web/atomicCssConfig.js
@@ -86,6 +86,7 @@ module.exports = {
       'Maw(20em)',
       'Mstart(r1)',
       'Mih(maxc)',
+      'Mih(100vh)',
       'Miw(r6)',
       'My(r2)',
       'Ov(a)',

diff --git a/frontend/src/main/web/src/components/Nav.jsx b/frontend/src/main/web/src/components/Nav.jsx
@@ -17,7 +17,7 @@ const items = [
   },
   {
     icon: 'search',
-    link: '/a/' + dswid + '#explore',
+    link: '/a/#explore',
     internalLink: '/explore',
     title: 'Explore',
     auth: 'public',
@@ -50,15 +50,15 @@ const items = [
   {
     small: true,
     icon: 'user',
-    link: '/a/' + dswid + '#profile',
+    link: '/a/#profile',
     internalLink: '/profile',
     title: 'Profile',
     auth: 'loggedin',
     id: 'nav_profile'
   },
   {
     icon: 'glossary',
-    link: '/a/' + dswid + '#glossary',
+    link: '/a/#glossary',
     internalLink: '/glossary',
     title: 'Glossary',
     auth: 'loggedin',

diff --git a/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
@@ -95,7 +95,7 @@
       window.config = JSON.parse(JSON.stringify(document.getElementById('config').dataset))
     </script>
     <div class='Ai(st) D(f) Fld(c) Flxs(0)'>
-      <div class="Ai(st) D(f) Fld(c) Fld(r)--sm Flxs(0) H(100vh)">
+      <div class="Ai(st) D(f) Fld(c) Fld(r)--sm Flxs(0) H(100%) Mih(100vh)">
         <div id="root" />
         <main role="main" class="W(100%) D(f) Flxg(1) Ov(a) Ovx(h) Ovs(touch) Pt(0)!">
           <div class="l__wrapper Ai(st) D(f) Fld(c) Flx(flx1) Ov(h) h(100%) Mih(maxc) l--pad-top-half">