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

UI fix

Browse Source
This commit is contained in:
llj
2016-05-09 14:34:09 +08:00
parent c70cdcc2d4
commit d5bc279ffc
9 changed files with 85 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
media/css/seahub.css
View File

@@ -1,3 +1,11 @@
/**
* depends on bootstrap
*
* html { box-sizing: border-box; }
* body { background: #fff; }
* p { margin-top:0; margin-bottom:1rem; }
*
**/
/** /**
* CONTENTS * CONTENTS
* *
@@ -158,15 +166,17 @@ body, input, textarea, button, select {
word-wrap:break-word; /* for en */ word-wrap:break-word; /* for en */
} }
input, button, select { line-height:19px;/*for ff*/ } input, button, select { line-height:19px;/*for ff*/ }
h1, h2, h3, h4, h5, h6 {
line-height:1.5; /* overwrite bootstrap */
}
h1 { font-size:1.9em; } h1 { font-size:1.9em; }
h2 { font-size:1.5em; color:#222;} h2 { font-size:1.5em; color:#222; font-weight:bold; }
h3 { font-size:16px; color:#322; font-weight:normal; } h3 { font-size:16px; color:#322; font-weight:normal; }
h4 { font-size:1.1em; color:#222; font-weight:normal; } h4 { font-size:1.1em; color:#222; font-weight:normal; }
h5, h6 { font-size:1em; margin:0.4em 0 0.15em; } h5, h6 { font-size:1em; }
h1, h2, h3, h4 { line-height: 1.5; }
ul { list-style:none; } ul { list-style:none; }
dl { margin:1.5em 0; } dl { margin:1.5em 0; }
dt { color:#666; margin:24px 0 2px; font-weight: normal; } dt { color:#666; margin:24px 0 2px; font-weight:normal; }
dd { margin-bottom:.8em; color:#222; } dd { margin-bottom:.8em; color:#222; }
a { a {
color:#eb8205; color:#eb8205;
@@ -204,7 +214,8 @@ input {
input, button { display:inline-block;/*for ie*/ } input, button { display:inline-block;/*for ie*/ }
input[type=text], input[type=text],
input[type=password] { input[type=password] {
height:26px; box-sizing:content-box;
height:22px;
} }
button, button,
input[type=submit], input[type=submit],
@@ -301,6 +312,36 @@ th { text-align:left; font-weight:normal; color:#9c9c9c; }
td, th { padding:5px 3px; word-wrap:break-word; border-bottom:1px solid #eee; } td, th { padding:5px 3px; word-wrap:break-word; border-bottom:1px solid #eee; }
td { color: #333; font-size:14px; } td { color: #333; font-size:14px; }
table img { vertical-align:middle; } table img { vertical-align:middle; }
/* custom scrollbar */
::-webkit-scrollbar {
height: 9px;
width: 9px;
}
::-webkit-scrollbar-button {
display: block;
height: 4px;
}
::-webkit-scrollbar-track-piece {
background: #e9e9eb;
}
::-webkit-scrollbar-track-piece:vertical:start {
border-radius:5px 5px 0 0;
}
::-webkit-scrollbar-track-piece:vertical:end {
border-radius:0 0 5px 5px;
}
::-webkit-scrollbar-track-piece:horizontal:start {
border-radius:5px 0 0 5px;
}
::-webkit-scrollbar-track-piece:horizontal:end {
border-radius:0 5px 5px 0;
}
::-webkit-scrollbar-thumb:vertical,
::-webkit-scrollbar-thumb:horizontal {
background: #ccc;
border-radius: 5px;
display: block;
}
/**** overwrite bootstrap css ****/ /**** overwrite bootstrap css ****/
.breadcrumb { .breadcrumb {
padding:0; padding:0;
@@ -1121,9 +1162,6 @@ textarea:-moz-placeholder {/* for FF */
#confirm-popup { #confirm-popup {
min-width:255px; min-width:255px;
} }
#confirm-popup .btn {
margin-top:.8em;
}
/**** ui-autocomplete *****/ /**** ui-autocomplete *****/
.ui-autocomplete { .ui-autocomplete {
padding:2px; padding:2px;
@@ -1142,7 +1180,11 @@ textarea:-moz-placeholder {/* for FF */
border-radius:4px; border-radius:4px;
zoom:1; zoom:1;
} }
.ui-menu .ui-menu-item a.ui-state-hover { border-color:#fbcb09; background: #fdf5ce; color: #c77405; } .ui-menu .ui-menu-item a.ui-state-hover {
border-color:#fbcb09;
background: #fdf5ce;
color: #c77405;
}
/**** article ****/ /**** article ****/
.article { .article {
padding:40px 200px 40px 60px; padding:40px 200px 40px 60px;
@@ -1170,10 +1212,10 @@ textarea:-moz-placeholder {/* for FF */
} }
.article ul { .article ul {
list-style-type:disc; list-style-type:disc;
padding-left:2em;
} }
.article ul, .article ul,
.article ol { .article ol {
padding-left:2em;
margin:0.5em 0; margin:0.5em 0;
} }
.article code { .article code {
@@ -1258,7 +1300,6 @@ textarea:-moz-placeholder {/* for FF */
} }
.sf-popover-title { .sf-popover-title {
text-align:center; text-align:center;
margin:0;
} }
.sf-popover-close { .sf-popover-close {
font-size:16px; font-size:16px;
@@ -1559,7 +1600,6 @@ button.sf-dropdown-toggle:focus {
} }
#notice-popover .brief { #notice-popover .brief {
margin-left:40px; margin-left:40px;
margin-top:0;
} }
#notice-popover .time { #notice-popover .time {
color:#999; color:#999;
@@ -1567,7 +1607,10 @@ button.sf-dropdown-toggle:focus {
margin:0; margin:0;
clear:both; clear:both;
} }
#notice-popover .all { #notice-popover .view-all {
display:block;
padding:7px 0;
text-align:center;
color:#a4a4a4; color:#a4a4a4;
} }
#account { #account {
@@ -2134,7 +2177,7 @@ button.sf-dropdown-toggle:focus {
color: #b8b8b8; color: #b8b8b8;
margin:0; margin:0;
} }
.fixed-upload-file-dialog .close, .fixed-upload-file-dialog .sf-close,
.fileupload-buttonbar .cancel { .fileupload-buttonbar .cancel {
*margin-left:5px; *margin-left:5px;
} }
@@ -2161,11 +2204,11 @@ button.sf-dropdown-toggle:focus {
filter: alpha(opacity=0); filter: alpha(opacity=0);
cursor: pointer; cursor: pointer;
} }
.table { .fileupload-table {
margin-bottom:0; margin-bottom:0;
} }
.table .name, .fileupload-table .name,
.table .error { .fileupload-table .error {
padding-left:7px; padding-left:7px;
margin:0; margin:0;
} }

6
seahub/templates/base.html
View File

@@ -97,7 +97,7 @@
<div id="main" class="clear container-fluid {% block main_css_class %}top-padding{% endblock %}"> <div id="main" class="clear container-fluid {% block main_css_class %}top-padding{% endblock %}">
{% block main_content %} {% block main_content %}
<div class="row"> <div class="row">
<div id="main-panel" class="clear w100 ovhd"> <div id="main-panel" class="w100 ovhd">
{% block main_panel %}{% endblock %} {% block main_panel %}{% endblock %}
</div> </div>
</div> </div>
@@ -118,8 +118,8 @@
{% endif %} {% endif %}
<div id="confirm-popup" class="hide"> <div id="confirm-popup" class="hide">
<div id="confirm-con"></div> <div id="confirm-con"></div>
<button id="confirm-yes" class="btn">{% trans "Yes"%}</button> <button id="confirm-yes">{% trans "Yes" %}</button>
<button class="simplemodal-close btn">{% trans "No"%}</button> <button class="simplemodal-close">{% trans "No" %}</button>
</div> </div>
</div> </div>

4
seahub/templates/base_for_backbone.html
View File

@@ -89,8 +89,8 @@
<div id="confirm-popup" class="hide"> <div id="confirm-popup" class="hide">
<div id="confirm-con"></div> <div id="confirm-con"></div>
<button id="confirm-yes" class="btn">{% trans "Yes"%}</button> <button id="confirm-yes">{% trans "Yes"%}</button>
<button class="simplemodal-close btn">{% trans "No"%}</button> <button class="simplemodal-close">{% trans "No"%}</button>
</div> </div>
<div id="guide-for-new" class="hide"> <div id="guide-for-new" class="hide">

12
seahub/templates/js/lib-op-popups.html
View File

@@ -94,17 +94,17 @@
<h3 class="hd"><span class="status">{% trans "File Upload" %}</span> <span class="total-progress hide"></span></h3> <h3 class="hd"><span class="status">{% trans "File Upload" %}</span> <span class="total-progress hide"></span></h3>
<div class="ops"> <div class="ops">
<span class="fold-switch sf2-icon-minus op-icon"></span> <span class="fold-switch sf2-icon-minus op-icon"></span>
<span class="close sf2-icon-x1 op-icon hide" title="{% trans "Close" %}"></span> <span class="sf-close sf2-icon-x1 op-icon hide" title="{% trans "Close" %}"></span>
</div> </div>
<div class="con"> <div class="con">
<div class="row fileupload-buttonbar"> <div class="fileupload-buttonbar">
<button type="button" class="cancel cspt fright">{% trans "Cancel All" %}</button> <button type="button" class="cancel cspt fright">{% trans "Cancel All" %}</button>
</div> </div>
<p class="saving-tip alc clear hide"> <p class="saving-tip alc clear hide">
<span class="loading-icon vam"></span> <span class="loading-icon vam"></span>
<span class="vam">{% trans "Saving..." %}</span> <span class="vam">{% trans "Saving..." %}</span>
</p> </p>
<table class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table> <table class="fileupload-table"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
</div> </div>
</div> </div>
<!--/script--> <!--/script-->
@@ -125,9 +125,9 @@
<h3><%= title %></h3> <h3><%= title %></h3>
<p>{% trans "A file with the same name already exists in this folder." %}<br />{% trans "Replacing it will overwrite its content." %}</p> <p>{% trans "A file with the same name already exists in this folder." %}<br />{% trans "Replacing it will overwrite its content." %}</p>
<p class="error hide"></p> <p class="error hide"></p>
<button class="yes btn">{% trans "Replace" %}</button> <button class="yes">{% trans "Replace" %}</button>
<button class="no btn" style="margin-left:5px;">{% trans "Don't replace" %}</button> <button class="no" style="margin-left:5px;">{% trans "Don't replace" %}</button>
<button class="simplemodal-close btn">{% trans "Cancel" %}</button> <button class="simplemodal-close">{% trans "Cancel" %}</button>
</div> </div>
</script> </script>

2
seahub/templates/js/templates.html
View File

@@ -1433,7 +1433,7 @@
<div class="loading-icon loading-tip"></div> <div class="loading-icon loading-tip"></div>
<p class="error alc hide"></p> <p class="error alc hide"></p>
<ul class="hide notice-list"></ul> <ul class="hide notice-list"></ul>
<p class="alc"><a href="{% url 'user_notification_list' %}" class="all">{% trans "See All Notifications" %}</a></p> <a href="{% url 'user_notification_list' %}" class="view-all">{% trans "See All Notifications" %}</a>
</div> </div>
</script> </script>

12
seahub/templates/sysadmin/admin_repo_view.html
View File

@@ -114,17 +114,17 @@
<h3 class="hd"><span class="status">{% trans "File Upload" %}</span> <span class="total-progress hide"></span></h3> <h3 class="hd"><span class="status">{% trans "File Upload" %}</span> <span class="total-progress hide"></span></h3>
<div class="ops"> <div class="ops">
<img src="{{MEDIA_URL}}img/minus.png" alt="" class="fold-switch cspt" /> <img src="{{MEDIA_URL}}img/minus.png" alt="" class="fold-switch cspt" />
<img src="{{MEDIA_URL}}img/close.png" alt="close" title="{% trans "close" %}" class="close cspt hide" /> <img src="{{MEDIA_URL}}img/close.png" alt="" title="{% trans "close" %}" class="sf-close cspt hide" />
</div> </div>
<div class="con"> <div class="con">
<div class="row fileupload-buttonbar"> <div class="fileupload-buttonbar">
<button type="button" class="cancel cspt fright">{% trans "Cancel All" %}</button> <button type="button" class="cancel cspt fright">{% trans "Cancel All" %}</button>
</div> </div>
<p class="saving-tip alc clear hide"> <p class="saving-tip alc clear hide">
<span class="loading-icon vam"></span> <span class="loading-icon vam"></span>
<span class="vam">{% trans "Saving..." %}</span> <span class="vam">{% trans "Saving..." %}</span>
</p> </p>
<table class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table> <table class="fileupload-table"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
</div> </div>
</div> </div>
{% endif %} {% endif %}
@@ -156,7 +156,7 @@ $(function() {
var fu_status = $('.status', popup), var fu_status = $('.status', popup),
total_progress = $('.total-progress', popup), total_progress = $('.total-progress', popup),
cancel_all_btn = $('.fileupload-buttonbar .cancel', popup), cancel_all_btn = $('.fileupload-buttonbar .cancel', popup),
close_icon = $('.close', popup), close_icon = $('.sf-close', popup),
saving_tip = $('.saving-tip', popup); saving_tip = $('.saving-tip', popup);
var fu_status_ = { var fu_status_ = {
@@ -265,7 +265,7 @@ $('#upload-file button').click(function() {
$('#upload-file-dialog .fold-switch').click(function() { $('#upload-file-dialog .fold-switch').click(function() {
var popup = $('#upload-file-dialog'); var popup = $('#upload-file-dialog');
var full_ht = parseInt(popup.data('height')); var full_ht = parseInt(popup.data('height'));
var main_con = $('.fileupload-buttonbar, .table', popup); var main_con = $('.fileupload-buttonbar, table', popup);
if (popup.height() == full_ht) { if (popup.height() == full_ht) {
popup.height($('.hd', popup).outerHeight(true)); popup.height($('.hd', popup).outerHeight(true));
main_con.addClass('hide'); main_con.addClass('hide');
@@ -275,7 +275,7 @@ $('#upload-file-dialog .fold-switch').click(function() {
} }
}); });
$('#upload-file-dialog .close').click(function() { $('#upload-file-dialog .sf-close').click(function() {
$('#upload-file-dialog').addClass('hide'); $('#upload-file-dialog').addClass('hide');
$('#upload-file-dialog .files').empty(); $('#upload-file-dialog .files').empty();
}); });

4
seahub/templates/sysadmin/sysadmin_backbone.html
View File

@@ -71,8 +71,8 @@
<div id="confirm-popup" class="hide"> <div id="confirm-popup" class="hide">
<div id="confirm-con"></div> <div id="confirm-con"></div>
<button id="confirm-yes" class="btn">{% trans "Yes"%}</button> <button id="confirm-yes">{% trans "Yes"%}</button>
<button class="simplemodal-close btn">{% trans "No"%}</button> <button class="simplemodal-close">{% trans "No"%}</button>
</div> </div>
</div> </div>

4
seahub/templates/view_shared_upload_link.html
View File

@@ -11,7 +11,7 @@
<p class="error">{% trans "The owner of this library has run out of space." %}</p> <p class="error">{% trans "The owner of this library has run out of space." %}</p>
{% else %} {% else %}
<form id="upload-file-form" enctype="multipart/form-data" method="post" action="">{% csrf_token %} <form id="upload-file-form" enctype="multipart/form-data" method="post" action="">{% csrf_token %}
<div class="row fileupload-buttonbar"> <div class="fileupload-buttonbar">
<div> <div>
<span class="fileinput-button vam" id="add-file"> <span class="fileinput-button vam" id="add-file">
<span class="icon-plus"></span> <span class="icon-plus"></span>
@@ -47,7 +47,7 @@
</div> </div>
<p class="saving-tip alc hide"><img src="{{MEDIA_URL}}img/loading-icon.gif" alt="" style="margin-right:5px;" class="vam" />{% trans "Saving..." %}</p> <p class="saving-tip alc hide"><img src="{{MEDIA_URL}}img/loading-icon.gif" alt="" style="margin-right:5px;" class="vam" />{% trans "Saving..." %}</p>
</div> </div>
<table class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table> <table class="fileupload-table"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
</form> </form>
{% endif %} {% endif %}
</div> </div>

6
static/scripts/app/views/fileupload.js
View File

@@ -39,7 +39,7 @@ define([
var $fu_status = $('.status', popup), var $fu_status = $('.status', popup),
$total_progress = $('.total-progress', popup), $total_progress = $('.total-progress', popup),
cancel_all_btn = $('.fileupload-buttonbar .cancel', popup), cancel_all_btn = $('.fileupload-buttonbar .cancel', popup),
close_icon = $('.close', popup), close_icon = $('.sf-close', popup),
saving_tip = $('.saving-tip', popup); saving_tip = $('.saving-tip', popup);
var fu_status = { var fu_status = {
@@ -425,13 +425,13 @@ define([
events: { events: {
'click .fold-switch': 'foldAndUnfoldPopup', 'click .fold-switch': 'foldAndUnfoldPopup',
'click .close': 'closePopup' 'click .sf-close': 'closePopup'
}, },
foldAndUnfoldPopup : function () { foldAndUnfoldPopup : function () {
var popup = this.$el; var popup = this.$el;
var full_ht = parseInt(this.popup_height); var full_ht = parseInt(this.popup_height);
var main_con = $('.fileupload-buttonbar, .table', popup); var main_con = $('.fileupload-buttonbar, table', popup);
if (popup.height() == full_ht) { if (popup.height() == full_ht) {
popup.height($('.hd', popup).outerHeight(true)); popup.height($('.hd', popup).outerHeight(true));
main_con.addClass('hide'); main_con.addClass('hide');