This is an automated email from the git hooks/post-receive script. New commit to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit e5b5fe235d808334dbacef4b7e9cbb4baa5feb55 Author: kaufmann <kaufmann@codelutin.com> Date: Wed Aug 5 17:50:05 2020 +0200 Modifications d'affichage du menu principal --- web/src/components/layout/Sidebar.vue | 33 ++++++++++++++++++++++++------- web/src/components/layout/SidebarLink.vue | 15 ++++++-------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/web/src/components/layout/Sidebar.vue b/web/src/components/layout/Sidebar.vue index e1bd41f..561f2f7 100644 --- a/web/src/components/layout/Sidebar.vue +++ b/web/src/components/layout/Sidebar.vue @@ -7,20 +7,39 @@ <div id="sidebar-menu" :class="{'opened' : mobileMenuOpened}"> <SidebarLink + v-if="authenticated" title="Add" linkTo="/edit/new" iconName="icon-square-plus"/> <SidebarLink - v-if="user.admin" - title="Stats" - :linkTo="statsUrl" - iconName="icon-graph"/> + v-if="authenticated" + title="(ToDo) Users group" + linkTo="#" + iconName="icon-user-group"/> + + <SidebarLink + v-if="authenticated" + title="(ToDo) Shared Users" + linkTo="#" + iconName="icon-share"/> <SidebarLink title="About" linkTo="/about" iconName="icon-help"/> + + <SidebarLink + v-if="authenticated && user.admin" + title="Stats" + :linkTo="statsUrl" + iconName="icon-graph"/> + + <SidebarLink + v-if="authenticated" + title="(ToDo) Settings" + linkTo="#" + iconName="icon-settings"/> </div> </div> </template> @@ -58,7 +77,7 @@ export default Sidebar </script> <style scoped lang="less"> -@import '../../assets/less/_globals'; +@import '../../assets/less/globals'; #sidebar { position: fixed; @@ -78,7 +97,7 @@ export default Sidebar text-align: center; - border-right: 1px solid #eee; + border-right: 1px solid var(--color-separation-border); font-size: 36px; } @@ -114,7 +133,7 @@ export default Sidebar text-align: center; .icon { - color: var(--color-white); + color: white; font-size: 30px; } a, diff --git a/web/src/components/layout/SidebarLink.vue b/web/src/components/layout/SidebarLink.vue index 9a7537a..a8911a2 100644 --- a/web/src/components/layout/SidebarLink.vue +++ b/web/src/components/layout/SidebarLink.vue @@ -28,7 +28,7 @@ export default SidebarLink </script> <style scoped lang="less"> -@import '../../assets/less/_globals'; +@import '../../assets/less/globals'; .sidebar-menu-link { display: flex; @@ -37,12 +37,12 @@ export default SidebarLink position: relative; flex: 1; - max-height: 150px; + max-height: 25%; text-align: center; .icon { - color: var(--color-white); + color: white; font-size: 30px; } a, @@ -59,7 +59,7 @@ export default SidebarLink height: 100%; } &:hover .icon { - color: #fff; + color: white; } &:before { content: ''; @@ -73,14 +73,11 @@ export default SidebarLink background-color: var(--color-hover); opacity: 0; - transform: scaleX(0); - transform-origin: left; - transition: transform 0.4s ease-in-out, opacity 0.6s ease-in-out; + transition: opacity 0.4s ease-in-out; } &:hover:before { - transform: scaleX(1); opacity: 1; - transition: transform 0.4s ease-in-out, opacity 0.2s ease-in-out; + transition: opacity 0.2s ease-in-out; } a::after { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.