From b1909735a8947d2081fa8dc4cc25ade1ddee54ac Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Fri, 20 May 2016 15:25:40 +0800
Subject: [PATCH] fix

---
 media/css/seahub.css                          |  6 +++---
 seahub/templates/base_for_backbone.html       | 10 +++++-----
 static/scripts/app/views/group-discussions.js |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index 59e4ae62c7..9b7e1f91b2 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -223,7 +223,7 @@ input[type=password] {
     box-sizing:content-box;
     height:22px;
 }
-select {
+select, button {
     box-sizing:border-box;
 }
 button,
@@ -1154,10 +1154,10 @@ textarea:-moz-placeholder {/* for FF */
 #simplemodal-container {
     padding: 20px;
     background-color:#fcfcfc;
-    border-radius:4px;
     -moz-border-radius:4px;
-    box-sizing:content-box;
+    border-radius:4px;
     -webkit-box-sizing:content-box;
+    box-sizing:content-box;
 }
 #simplemodal-container a {
     font-weight:normal;
diff --git a/seahub/templates/base_for_backbone.html b/seahub/templates/base_for_backbone.html
index 010af9e428..e290890025 100644
--- a/seahub/templates/base_for_backbone.html
+++ b/seahub/templates/base_for_backbone.html
@@ -7,16 +7,16 @@
 <title>{{ site_title }}</title>
 <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 <meta name="keywords" content="{% trans "File Collaboration Team Organization" %}" />
-<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <link rel="icon" type="image/x-icon" href="{{ MEDIA_URL }}img/favicon.png?t=1398068110" />
 <!--[if IE]>
-<link rel="shortcut icon" href="{{ MEDIA_URL }}img/favicon.png?t=1398068110"/>
+<link rel="shortcut icon" href="{{ MEDIA_URL }}img/favicon.png?t=1398068110" />
 <![endif]-->
 
 {% compress css %}
-<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}"/>
-<link rel="stylesheet" type="text/css" href="{% static "css/select2-3.5.2.css" %}"/>
+<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}" />
+<link rel="stylesheet" type="text/css" href="{% static "css/select2-3.5.2.css" %}" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1398068110" />
 <link rel="stylesheet" type="text/css" href="{% static "css/magnific-popup.css" %}" />
 {% endcompress %}
@@ -50,7 +50,7 @@
                     {% endif %}
                 </a>
 
-                <button class="sf2-icon-list-view side-nav-toggle hidden-md-up" title="Side Nav Menu" id="js-toggle-side-nav" aria-label="{% trans "Side Nav Menu" %}"></button>
+                <button class="sf2-icon-list-view side-nav-toggle hidden-md-up" title="{% trans "Side Nav Menu" %}" id="js-toggle-side-nav" aria-label="{% trans "Side Nav Menu" %}"></button>
 
                 <div class="fright">
                 {% if has_file_search %}
diff --git a/static/scripts/app/views/group-discussions.js b/static/scripts/app/views/group-discussions.js
index 02fd22f535..c9c027fc01 100644
--- a/static/scripts/app/views/group-discussions.js
+++ b/static/scripts/app/views/group-discussions.js
@@ -143,7 +143,7 @@ define([
         },
 
         hide: function() {
-            $(".right-side-panel").css({'right': '-400px'});
+            this.$el.css({'right': '-400px'});
         },
 
         close: function() {
@@ -159,7 +159,7 @@ define([
 
         show: function() {
             this.showContent();
-            $(".right-side-panel").css({'right': '0px'});
+            this.$el.css({'right': '0px'});
             this.setConMaxHeight();
         },