1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-20 18:32:41 +00:00

[CSS] modified 'table', removed backbone.css

This commit is contained in:
llj
2016-05-16 17:07:04 +08:00
parent 251ebab339
commit 7eb1e1d132
6 changed files with 62 additions and 88 deletions

View File

@@ -20,6 +20,12 @@
* common class ..........common class
*
* Widget
* (...)
* discussions/comments
* custom select2
*
* Container
* Container ......... common container styles
*
* (TODO: complete this TOC)
*
@@ -307,7 +313,6 @@ pre {
}
table {
width:100%;
table-layout:fixed;
margin:8px 0 40px;
}
caption { font-size:1.1em; font-weight:bold; margin-bottom:.6em; }
@@ -1441,7 +1446,43 @@ button.sf-dropdown-toggle:focus {
cursor:pointer;
text-align:center;
}
/********** container ***********/
/**** custom select2 ****/
.select2-container-multi .select2-choices {
border-color: #ddd;
border-radius: 2px;
background-image: none; /* rm the shadow */
}
.select2-container-multi .select2-choices .select2-search-field {
float:none;
}
.select2-container-multi .select2-choices .select2-search-field input {
padding:2px 2px 2px 5px;
font-family:inherit;
font-size:13px;
}
.select2-container-multi .select2-choices .select2-search-choice {
border:none;
border-radius:0;
background:#eee;
}
.select2-container .avatar,
.select2-results .select2-result-label .avatar {
vertical-align:middle;
margin-right:3px;
}
.select2-result-label .text {
display:inline-block;
width:calc(100% - 42px);
}
.select2-results .select2-result-label .avatar {
margin-right:10px;
}
.select2-result-label .avatar,
.select2-result-label .text {
vertical-align:middle;
}
/********** Container ***********/
#wrapper {
}
@@ -1712,11 +1753,6 @@ button.sf-dropdown-toggle:focus {
text-decoration:none;
}
.select2-container .avatar,
.select2-results .select2-result-label .avatar {
vertical-align:middle;
margin-right:3px;
}
/* header */
#notice-con {
color:red;
@@ -1995,15 +2031,8 @@ button.sf-dropdown-toggle:focus {
padding:5px 14px;
}
.repo-file-list {
table-layout:auto;
margin:0;
}
.repo-file-list .select {
width:15px;
}
.repo-file-list .star {
width:25px;
}
.repo-file-list .icon-star-empty { color:#d0d0d0; }
.repo-file-list .icon-star { color:#505050; }
.repo-file-list .icon-star-empty,
@@ -2015,21 +2044,16 @@ button.sf-dropdown-toggle:focus {
vertical-align:middle;
}
.repo-file-list .dirent-icon {
width:27px;
text-align:center;
}
.repo-file-list .dirent-name {
display:inline-block;
width:400px;
word-break:break-all;
}
.repo-file-list .dirent-size {
width:114px;
}
.repo-file-list .dirent-update {
width:133px;
}
.repo-file-list .dirent-op {
width:200px;
.repo-file-list .file-locked-icon {
position:absolute;
right:0;
bottom:0;
}
.repo-file-list th {
padding-top:1rem;
@@ -3198,17 +3222,6 @@ button.sf-dropdown-toggle:focus {
height:30px;
margin:0;
}
.select2-result-label .text {
display:inline-block;
width:calc(100% - 42px);
}
.select2-results .select2-result-label .avatar {
margin-right:10px;
}
.select2-result-label .avatar,
.select2-result-label .text {
vertical-align:middle;
}
#add-group-members-form {
margin-bottom:4px;
}

View File

@@ -16,10 +16,9 @@
{% compress css %}
<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}"/>
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1398068110" />
<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" %}" />
<link rel="stylesheet" type="text/css" href="{% static "css/backbone.css" %}"/>
{% endcompress %}
{% block extra_style %}{% endblock %}

View File

@@ -174,15 +174,15 @@
</script>
<script type="text/template" id="dirents-hd-tmpl">
<tr>
<th class="select">
<th width="3%" class="select">
<input type="checkbox" class="vam" />
</th>
<th class="star"></th>
<th class="dirent-icon"></th>
<th><a class="table-sort-op by-name" href="#"><span class="dirent-name">{% trans "Name"%} <span class="sort-icon icon-caret-up"></span></span></a></th>
<th class="dirent-op"><span class="sr-only">{% trans "Actions" %}</span></th>
<th class="dirent-size">{% trans "Size"%}</th>
<th class="dirent-update"><a class="table-sort-op by-time" href="#">{% trans "Last Update" %} <span class="sort-icon icon-caret-down hide" aria-hidden="true"></span></a></th>
<th width="3%" class="star"></th>
<th width="5%" class="dirent-icon"></th>
<th width="50%"><a class="table-sort-op by-name" href="#"><span class="dirent-name">{% trans "Name"%} <span class="sort-icon icon-caret-up"></span></span></a></th>
<th width="15%" class="dirent-op"><span class="sr-only">{% trans "Actions" %}</span></th>
<th width="11%" class="dirent-size">{% trans "Size"%}</th>
<th width="13%" class="dirent-update"><a class="table-sort-op by-time" href="#">{% trans "Last Update" %} <span class="sort-icon icon-caret-down hide" aria-hidden="true"></span></a></th>
</tr>
</script>

View File

@@ -30,11 +30,11 @@
<table class="repo-file-list">
<tr>
<th class="dirent-icon"></th>
<th><span class="dirent-name">{% trans "Name"%}</span></th>
<th class="dirent-size">{% trans "Size"%}</th>
<th class="dirent-update">{% trans "Last Update" %}</th>
<th class="dirent-op">{% trans "Operations"%}</th>
<th class="dirent-icon" width="5%"></th>
<th width="50%"><span class="dirent-name">{% trans "Name"%}</span></th>
<th width="15%" class="dirent-size">{% trans "Size"%}</th>
<th width="15%" class="dirent-update">{% trans "Last Update" %}</th>
<th width="15%" class="dirent-op">{% trans "Operations"%}</th>
</tr>
{% for dirent in dir_list %}
<tr class="dir-item">

View File

@@ -15,8 +15,8 @@
{% compress css %}
<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}"/>
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1398068110" />
<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 %}

View File

@@ -1,38 +0,0 @@
/* lib view */
.repo-file-list .file-locked-icon {
position:absolute;
right:0;
bottom:0;
}
.repo-file-list .dirent-name {
width:220px;
}
.repo-file-list .dirent-size {
width:114px;
}
.repo-file-list .dirent-update {
width:123px;
}
.repo-file-list .dirent-op {
padding-left:30px;
width:150px;
}
/* custom select2 */
.select2-container-multi .select2-choices {
border-color: #ddd;
border-radius: 2px;
background-image: none; /* rm the shadow */
}
.select2-container-multi .select2-choices .select2-search-field {
float:none;
}
.select2-container-multi .select2-choices .select2-search-field input {
padding:2px 2px 2px 5px;
font-family:inherit;
font-size:13px;
}
.select2-container-multi .select2-choices .select2-search-choice {
border:none;
border-radius:0;
background:#eee;
}