소스 검색

[IMP] Space betwen dashboard menu and brand

Gogs 7 년 전
부모
커밋
16e8a39766
5개의 변경된 파일51개의 추가작업 그리고 11개의 파일을 삭제
  1. 1 0
      .gitignore
  2. 6 0
      sonar-project.properties
  3. 32 8
      static/src/main.css
  4. 11 2
      static/src/main.js
  5. 1 1
      templates.xml

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+.scannerwork

+ 6 - 0
sonar-project.properties

@@ -0,0 +1,6 @@
+sonar.login=a14d1cf8db921f491a7183dfaf1482b48be0dde3
+sonar.projectKey=sidebar_toggler
+sonar.projectName=eiru_sidebar_toggler
+sonar.projectVersion=1.0
+sonar.sources=.
+sonar.javascript.globals=openerp,$

+ 32 - 8
static/src/main.css

@@ -1,21 +1,45 @@
-.eiru_sidebar_toggler {
+.eiru-sidebar-toggler {
 	width: 45px;
 	height: 45px !important;
 	text-align: center;
-	line-height: 45px;
+    line-height: 45px;
 }
 
-.eiru_sidebar_toggler:hover {
+.eiru-sidebar-toggler:hover {
 	cursor: pointer;
-	-webkit-cursor: pointer;
-	-moz-cursor: pointer;
-	animation: 0.5s menu-bell 1;
+	animation: 500ms menu-bell 1;
 }
 
-.eiru_sidebar_toggler i {
+.eiru-sidebar-toggler i {
 	color: #fff;
 }
 
+.eiru-sidebar-with-menu {
+    margin-left: 120px;
+}
+
+.eiru-sidebar-without-menu {
+    margin-left: 0;
+}
+
+@keyframes sidebar-with-menu {
+    0% {
+        margin-left: 0;
+    }
+    100% {
+        margin-left: 120px;
+    }
+}
+
+@keyframes sidebar-without-menu {
+    0% {
+        margin-left: 120px;
+    }
+    100% {
+        margin-left: 0;
+    }
+}
+
 @keyframes menu-bell {
     0% {
         transform: rotate(30deg);
@@ -29,4 +53,4 @@
     75% {
         transform: rotate(-30deg);
     }
-}
+}

+ 11 - 2
static/src/main.js

@@ -1,18 +1,27 @@
-openerp.eiru_sidebar_toggler = function (instance, local) {
+openerp.eiru_sidebar_toggler = function () {
     var folded = openerp.eiru_sidebar_toggler.folded = false;
 
     var fold = openerp.eiru_sidebar_toggler.sidebar_fold = function () {
+        $('.eiru-sidebar-toggler').removeClass('eiru-sidebar-with-menu');
+        $('.eiru-sidebar-toggler').addClass('eiru-sidebar-without-menu');
+
         $(".oe_leftbar").hide({
             effect: "slide",
             direction: "left",
             duration: 300,
             complete: function() {
+                $('.eiru-sidebar-toggler').removeClass('eiru-sidebar-without-menu');
+                $('.eiru-sidebar-toggler')
+
                 folded = openerp.eiru_sidebar_toggler.folded = true;
             }
         });
     }
 
     var unfold = openerp.eiru_sidebar_toggler.sidebar_unfold = function () {
+        $('.eiru-sidebar-toggler').removeClass('eiru-sidebar-without-menu');
+        $('.eiru-sidebar-toggler').addClass('eiru-sidebar-with-menu');
+
         $(".oe_leftbar").show({
             effect: "slide",
             direction: "left",
@@ -23,7 +32,7 @@ openerp.eiru_sidebar_toggler = function (instance, local) {
         });
     }
 
-    $('.eiru_sidebar_toggler').click(function () {
+    $('.eiru-sidebar-toggler').click(function () {
         if(folded) {
             unfold();
         } else {

+ 1 - 1
templates.xml

@@ -8,7 +8,7 @@
         </template>
         <template id="eiru_sidebar_toggler.menu" name="Eiru Brand" inherit_id="web.menu">
             <xpath expr="//li[1]" position="before">
-                <li class="eiru_sidebar_toggler">
+                <li class="eiru-sidebar-toggler eiru-sidebar-with-menu">
                     <i class="fa fa-bars"></i>
                 </li>
             </xpath>