haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 07:27:04 +00:00
Code Issues Releases Wiki Activity

fix

Browse Source
This commit is contained in:
llj
2016-05-20 15:25:40 +08:00
parent e6dcebaf36
commit b1909735a8
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/css/seahub.css
View File

@@ -223,7 +223,7 @@ input[type=password] {
box-sizing:content-box; box-sizing:content-box;
height:22px; height:22px;
} }
select { select, button {
box-sizing:border-box; box-sizing:border-box;
} }
button, button,
@@ -1154,10 +1154,10 @@ textarea:-moz-placeholder {/* for FF */
#simplemodal-container { #simplemodal-container {
padding: 20px; padding: 20px;
background-color:#fcfcfc; background-color:#fcfcfc;
border-radius:4px;
-moz-border-radius:4px; -moz-border-radius:4px;
box-sizing:content-box; border-radius:4px;
-webkit-box-sizing:content-box; -webkit-box-sizing:content-box;
box-sizing:content-box;
} }
#simplemodal-container a { #simplemodal-container a {
font-weight:normal; font-weight:normal;

10
seahub/templates/base_for_backbone.html
View File

@@ -7,16 +7,16 @@
<title>{{ site_title }}</title> <title>{{ site_title }}</title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="keywords" content="{% trans "File Collaboration Team Organization" %}" /> <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"> <meta http-equiv="x-ua-compatible" content="ie=edge">
<link rel="icon" type="image/x-icon" href="{{ MEDIA_URL }}img/favicon.png?t=1398068110" /> <link rel="icon" type="image/x-icon" href="{{ MEDIA_URL }}img/favicon.png?t=1398068110" />
<!--[if IE]> <!--[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]--> <![endif]-->
{% compress css %} {% compress css %}
<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.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/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="{{ MEDIA_URL }}css/seahub.css?t=1398068110" />
<link rel="stylesheet" type="text/css" href="{% static "css/magnific-popup.css" %}" /> <link rel="stylesheet" type="text/css" href="{% static "css/magnific-popup.css" %}" />
{% endcompress %} {% endcompress %}
@@ -50,7 +50,7 @@
{% endif %} {% endif %}
</a> </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"> <div class="fright">
{% if has_file_search %} {% if has_file_search %}

4
static/scripts/app/views/group-discussions.js
View File

@@ -143,7 +143,7 @@ define([
}, },
hide: function() { hide: function() {
$(".right-side-panel").css({'right': '-400px'}); this.$el.css({'right': '-400px'});
}, },
close: function() { close: function() {
@@ -159,7 +159,7 @@ define([
show: function() { show: function() {
this.showContent(); this.showContent();
$(".right-side-panel").css({'right': '0px'}); this.$el.css({'right': '0px'});
this.setConMaxHeight(); this.setConMaxHeight();
}, },