From 686cb0a200828a74042f7c581303d77e08c2cea0 Mon Sep 17 00:00:00 2001 From: llj Date: Fri, 21 Feb 2014 16:47:34 +0800 Subject: [PATCH] [repo] redesigned ui, mainly 'repo-top' --- media/css/seahub.css | 47 +++++++++---------- media/img/lib_setting.png | Bin 0 -> 3094 bytes media/img/lib_trash.png | Bin 0 -> 3210 bytes seahub/templates/repo.html | 47 +++++-------------- seahub/templates/snippets/repo_dir_data.html | 3 ++ seahub/views/ajax.py | 1 + 6 files changed, 38 insertions(+), 60 deletions(-) create mode 100644 media/img/lib_setting.png create mode 100644 media/img/lib_trash.png 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 0000000000000000000000000000000000000000..3e4b6f2db46cc239ae6e886ab983ae5e48c104f8 GIT binary patch literal 3094 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 literal 0 HcmV?d00001 diff --git a/media/img/lib_trash.png b/media/img/lib_trash.png new file mode 100644 index 0000000000000000000000000000000000000000..36910bb1d14c1880233252cf685173408d02dfd1 GIT binary patch literal 3210 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 literal 0 HcmV?d00001 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 %}