diff --git a/media/css/seahub.css b/media/css/seahub.css index 9b37205d49..d334c2813c 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -897,14 +897,10 @@ textarea:-moz-placeholder {/* for FF */ text-decoration:none; } /********** container ***********/ -#main, #footer, -#repo-top .block-inner, -#repo-file-list { +#main, #footer { width:950px; } -#main, -#repo-top .block-inner, -#repo-file-list { +#main { margin:0 auto; } #header { @@ -938,12 +934,17 @@ textarea:-moz-placeholder {/* for FF */ #left-panel h3:first-child { margin-top: 0px; } -#right-panel .hd, .tabnav { +#right-panel .hd, +.tabnav, +.repo-file-list-topbar { padding:10px; background:#f2f2f2; margin-bottom:.5em; border-radius:2px; } +.repo-file-list-topbar { + margin-bottom:0; +} #right-panel .hd h3, #right-panel h3.hd { height:29px; @@ -973,7 +974,8 @@ textarea:-moz-placeholder {/* for FF */ text-decoration:underline; } #right-panel .hd button, -.tabnav button { +.tabnav button, +.repo-file-list-topbar button { height:29px; background:#fff; } @@ -1406,16 +1408,20 @@ textarea:-moz-placeholder {/* for FF */ /*repo page*/ #repo-top { padding-bottom:15px; - border-bottom:1px solid #ddd; - margin-bottom:5px; - box-shadow:0 1px 1px #ddd; } +#repo-top .hd, #repo-basic-info { - margin: 10px 0; + display:inline-block; +} +#repo-top .hd { + margin-right:15px; } #repo-basic-info .desc { font-size:1.2em; } +#repo-basic-info .link-icon { + margin:0 5px 0 15px; +} .split { border-left:2px solid #888; padding-left:1em; @@ -1429,19 +1435,11 @@ textarea:-moz-placeholder {/* for FF */ .repo-op { text-align:right; } -.repo-top-op-btn, .file-op button, #file-op button, .repo-op .op-btn { *margin-left:5px;/* for ie 7*/ } -.repo-top-op-btn, -.repo-op .op-btn { - background-color:#f5f5f5; -} -.repo-op .op-btn:hover { - background-color:#fff; -} .repo-op .op-btn [class^="icon-"], .repo-op .op-btn [class^="sf-icon-"] { margin-right:3px; @@ -1472,10 +1470,6 @@ textarea:-moz-placeholder {/* for FF */ .repo-file-list-not-show { padding-left:10px; } -.repo-file-list-topbar { - padding:8px 0; - border-bottom:1px solid #ddd; -} .repo-file-list-inner-container .repo-file-list-topbar { padding:8px 10px; } @@ -1519,12 +1513,15 @@ textarea:-moz-placeholder {/* for FF */ #repo-file-list .fixed-hd { position:fixed; width:950px; - background:#fff; top:0; z-index:11; /*make it on top of dirent op(popup)*/ border-color:#efefef; /*for repo-file-list-topbar*/ } +#repo-file-list .repo-file-list-topbar.fixed-hd { + width:930px; +} .repo-file-list .fixed-hd th { + background:#fff; -webkit-box-shadow:0 2px 2px -1px #aaa; box-shadow:0 2px 2px -3px #aaa; } diff --git a/media/img/lib_setting.png b/media/img/lib_setting.png new file mode 100644 index 0000000000..3e4b6f2db4 Binary files /dev/null and b/media/img/lib_setting.png differ diff --git a/media/img/lib_trash.png b/media/img/lib_trash.png new file mode 100644 index 0000000000..36910bb1d1 Binary files /dev/null and b/media/img/lib_trash.png differ diff --git a/seahub/templates/repo.html b/seahub/templates/repo.html index 5b0cc28886..8399b58594 100644 --- a/seahub/templates/repo.html +++ b/seahub/templates/repo.html @@ -5,7 +5,6 @@ {% block sub_title %}{{repo.name}} - {% endblock %} {% block extra_style %}