haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-21 19:00:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'pubinfo'

Browse Source 
Conflicts:
	thirdpart/seaserv/__init__.py
	views.py
This commit is contained in:
zhengxie
2013-02-23 11:48:06 +08:00
parent 3e3718d017 7f887be89f
commit 3e2ddb466b
12 changed files with 299 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
media/css/seahub.css
View File

@@ -11,10 +11,13 @@ form,input,textarea,button,img {
}
body,
input, textarea, button, select {
font: 13px/19px Arial, Helvetica, sans-serif;/* 19px : for ff*/
font: 13px/1.5 Arial, Helvetica, sans-serif;
color: #333;
word-wrap:break-word; /* for en */
}
input, button, select {
line-height:19px;/*for ff*/
}
h1 {
font-size:1.9em;
margin:1.1em 0 0.5em;
@@ -303,7 +306,33 @@ textarea:-moz-placeholder {/* for FF */
.center-contents {
text-align: center;
}
.tabnav {
height:37px;
border-bottom:1px solid #ddd;
}
.tabnav-tabs {
display:inline-block;
}
.tabnav-tab {
display:inline-block;
font-size:14px;
padding:8px 10px;
border:1px solid transparent;
border-bottom:0;
}
.tabnav-tab a {
color:#666;
font-weight:normal;
}
.tabnav-tab a:hover {
}
.tabnav-tab-cur {
font-weight:bold;
border-color:#ddd;
border-radius:3px 3px 0 0;
background:#fff;
margin-bottom:-1px;
}
/* container */
#main, #footer { width:950px; }
#main { margin:0 auto; }
@@ -1180,19 +1209,23 @@ textarea:-moz-placeholder {/* for FF */
height:80px;
}
/* group, org */
.group-list {
margin-top:20px;
.group-list,
.user-list {
margin-top:30px;
}
.group-list .group {
.group-list .group,
.user-list .user {
display:inline-block; /*to handle different height of items*/
vertical-align:top;
width:315px;
margin:0 17px 25px 0;
}
.group-list .group {
.group-list .group,
.user-list .user {
*display:inline; /* for ie 6,7 */
}
.group .txt {
.group .txt,
.user-list .user .txt {
color:#333;
width:250px;
}
@@ -1745,3 +1778,17 @@ textarea:-moz-placeholder {/* for FF */
.diff-chg {
color: #c3f;
}
.pubinfo-item {
display:inline-block;
min-width:66px;
}
.pubinfo-item .amount {
font-size:28px;
line-height:1;
font-weight:bold;
color:#222;
}
.pubinfo-item .obj {
font-size:11px;
color:#999;
}