diff --git a/app/finder/index.css b/app/finder/index.css index 6c0f89c..aac3762 100644 --- a/app/finder/index.css +++ b/app/finder/index.css @@ -1,373 +1,392 @@ -html{color:#000;background:#FFF;} -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form, -fieldset,input,textarea,p,blockquote,th,td { -margin:0; -padding:0; -} -table { -border-collapse:collapse; -border-spacing:0; -} -fieldset,img { -border:0; -} -address,caption,cite,code,dfn,em,strong,th,var { -font-style:normal; -font-weight:normal; -} -ol,ul { -list-style:none; -} -caption,th { -text-align:left; -} -h1,h2,h3,h4,h5,h6 { -font-size:100%; -font-weight:normal; -} -q:before,q:after { -content:''; -} -abbr,acronym { border:0; -} -* { - font-size: 12px; +blockquote,body,button,dd,dl,dt,fieldset,form,h1,h2,h3,h4,h5,h6,hr,input,legend,li,ol,p,pre,td,textarea,th,ul { + margin: 0; + padding: 0; + font-family: PingFang SC, Verdana, Helvetica Neue, Microsoft Yahei, Hiragino Sans GB, Microsoft Sans Serif, WenQuanYi Micro Hei, sans-serif; } + +body,button,input,select,textarea { + font: 9pt/1.5tahoma,arial,\5b8b\4f53 +} + +h1,h2,h3,h4,h5,h6 { + font-size: 100% +} + +address,cite,dfn,em,var { + font-style: normal +} + +code,kbd,pre,samp { + font-family: couriernew,courier,monospace +} + +small { + font-size: 9pt +} + +ol,ul { + list-style: none +} + +a { + text-decoration: none +} + +a:hover { + text-decoration: underline +} + +sup { + vertical-align: text-top +} + +sub { + vertical-align: text-bottom +} + +legend { + color: #000 +} + +fieldset,img { + border: 0 +} + +button,input,select,textarea { + font-size: 100% +} + +table { + border-collapse: collapse; + border-spacing: 0 +} + +body,html { + height: 100% +} + body { - background-repeat:no-repeat; - background-attachment:fixed; - background-repeat:no-repeat; - background-size:cover; - -moz-background-size:cover; - -webkit-background-size:cover; overflow: hidden; + margin: 0; + background-size: cover; + background-repeat: no-repeat; + background-attachment: fixed; + -moz-background-size: cover; + -webkit-background-size: cover } + a:focus { - outline:none; + outline: 0 } + .app-list { position: relative; width: 100%; - height: 100%; -} -.clear { - clear: both; -} -.finder-wrapper { - width: 100%; - height: 100%; -} -.finder-wrapper .topbar { - width: 100%; - height: 30px; - background: #f6f6f6; - border-bottom: 1px solid #9a9a9a; - margin-top: 0px; -} -.finder-wrapper .topbar .next-prev-box { - float: left; - background: url(images/icons/next_prev.png) no-repeat; - width: 53px; - height: 24px; - margin-left: 5px; - margin-top:2px; - cursor: pointer; -} -.finder-wrapper .topbar .sortstyle-box { - float: left; - background: url(images/icons/sortstyle.png) no-repeat; - width: 58px; - height: 24px; - margin-left: 105px; - cursor: pointer; -} -.finder-wrapper .topbar .config-button { - float: left; - background: url(images/icons/config.png) no-repeat; - width: 40px; - height: 24px; - margin-left: 10px; - cursor: pointer; -} -.finder-wrapper .topbar .higher-button { - float: left; - background: url(images/icons/higher.png) no-repeat; - width: 40px; - height: 24px; - margin-left: 10px; - cursor: pointer; -} -.finder-wrapper .topbar .collection-button { - float: left; - background: url(images/icons/collection.png) no-repeat; - width: 40px; - height: 24px; - margin-left: 10px; - cursor: pointer; -} -.finder-wrapper .topbar .search-box { - float: right; - background: url(images/icons/search.png) no-repeat; - width: 234px; - height: 24px; - margin-right: 5px; - margin-top:2px; -} -.finder-wrapper .topbar .next-prev-box .prev { - float: left; - display: block; - width: 25px; - height: 22px; -} -.finder-wrapper .topbar .next-prev-box .next { - float: right; - display: block; - width: 25px; - height: 22px; + height: 100% } -.finder-wrapper .main .content .app-box{ - text-align: center; - -moz-border-radius: 3px; - /* Gecko browsers*/ - -webkit-border-radius: 3px; - /* Webkit browsers*/ - border-radius:3px; - /* W3C syntax*/ +.clear { + clear: both +} + +.finder-wrapper { + width: 100%; + height: 100% +} + +.finder-wrapper .topbar { + margin-top: 0; + width: 100%; + height: 30px; + border-bottom: 1px solid #9a9a9a; + background: #f6f6f6 +} + +.finder-wrapper .topbar .sortstyle-box { + float: left; + margin-left: 105px; + width: 58px; + height: 24px; + background: url(images/icons/sortstyle.png) no-repeat; + cursor: pointer +} + +.finder-wrapper .topbar .config-button { + float: left; + margin-left: 10px; + width: 40px; + height: 24px; + background: url(images/icons/config.png) no-repeat; + cursor: pointer +} + +.finder-wrapper .topbar .higher-button { + float: left; + margin-left: 10px; + width: 40px; + height: 24px; + background: url(images/icons/higher.png) no-repeat; + cursor: pointer +} + +.finder-wrapper .topbar .collection-button { + float: left; + margin-left: 10px; + width: 40px; + height: 24px; + background: url(images/icons/collection.png) no-repeat; + cursor: pointer +} + +.finder-wrapper .topbar .search-box { + float: right; + margin-top: 2px; + margin-right: 5px; + width: 234px; + height: 24px; + background: url(images/icons/search.png) no-repeat +} + +.finder-wrapper .main .content .app-box { z-index: 999; + border-radius: 3px; + text-align: center } .finder-wrapper .main .content .middle { - width: 80px; - height: 100px; - float: left; - margin-left: 30px; - margin-top: 10px; + width: 5pc; + height: 75pt } -.trash-wrapper .main .content .middle,.finder-wrapper .main .content .middle { + +.finder-wrapper .main .content .middle,.trash-wrapper .main .content .middle { float: left; - margin-left: 30px; margin-top: 10px; + margin-left: 30px } .finder-wrapper .main .content .middle img { - width: 60px; margin-top: 5px; + width: 60px } -.finder-wrapper .main .content .middle{ - float: left; + +.finder-wrapper .main .content .middle { + float: left } .finder-wrapper .main .content .middle .app-name { - font-size: 12px; float: left; - /*background: rgba(0, 0, 0, 0.2) none repeat scroll 0 0; - border-radius: 18px;*/ - line-height: 1.7em; + display: block; + overflow: hidden; margin-top: 6px; padding-top: 1px; - transition: none 0s ease 0s ; - width: 80px; + width: 5pc; color: #333; - /*text-shadow: 0 0 0 #fff, 0 0 2px #000, 0 0 4px #000;*/ + text-overflow: ellipsis; + white-space: nowrap; + font-size: 9pt; + line-height: 1.7em; + transition: none 0s ease 0s; writing-mode: horizontal-tb; - display:block;/*内联对象需加*/ - word-break:keep-all;/* 不换行 */ - white-space:nowrap;/* 不换行 */ - overflow:hidden;/* 内容超出宽度时隐藏超出部分的内容 */ - text-overflow:ellipsis;/* 当对象内文本溢出时显示省略标记(...) ;需与overflow:hidden;一起使用。*/ + word-break: keep-all } .finder-wrapper .main .content .active { - background-image: url(images/icons/finder_app_active_bg.png); + background-image: url(images/icons/finder_app_active_bg.png) } + .finder-wrapper .main .content .hover { - background-image: url(images/icons/finder_app_hover_bg.png); -} - -.finder-wrapper { - width: 100%; - height: 100%; -} - -.finder-wrapper .topbar { - width: 100%; - height: 30px; - background: #f6f6f6; - border-bottom: 1px solid #9a9a9a; - margin-top: 0px; + background-image: url(images/icons/finder_app_hover_bg.png) } .finder-wrapper .topbar .next-prev-box { float: left; - background: url(images/icons/next_prev.png) no-repeat; + margin-top: 2px; + margin-left: 5px; width: 53px; height: 24px; - margin-left: 5px; - margin-top:2px; - cursor: pointer; + background: url(images/icons/next_prev.png) no-repeat; + cursor: pointer } .finder-wrapper .main { width: 100%; height: calc(100% - 30px); - background: #fff; + background: #fff } + .finder-wrapper .main .sidebar { + float: left; width: 148px; height: 100%; - background: #f6f6f6; - float: left; border-right: 1px solid #dfdfdf; + background: #f6f6f6 } + .finder-wrapper .main .content { - width: 80%; - width:-moz-calc(100% - 150px); - width:-webkit-calc(100% - 150px); - width: calc(100% - 150px); - height: 100%; float: left; overflow-y: auto; + width: 80%; + width: calc(100% - 150px); + height: 100% } + .finder-wrapper .main .sidebar ul { - width: 148px; - list-style: none; - padding: 0px; - margin: 0px; + margin: 0; + padding: 0; padding-top: 5px; + width: 148px; + list-style: none } + .finder-wrapper .main .sidebar ul .title { - width: 100%; padding-left: 5px; + width: 100% } -.trash-wrapper .main .sidebar ul li,.finder-wrapper .main .sidebar ul li { - width: 100%; + +.finder-wrapper .main .sidebar ul li,.trash-wrapper .main .sidebar ul li { float: left; + width: 100% } + .finder-wrapper .main .sidebar ul li a { + clear: both; display: block; - color:#444444; - text-decoration: none; width: 148px; height: 30px; - line-height: 30px; - clear: both; + color: #444; + text-decoration: none; + line-height: 30px } + .finder-wrapper .main .sidebar ul li a .name { - display: block; float: left; + display: block; margin-left: 5px; - font-size: 14px; + font-size: 14px } + .finder-wrapper .main .sidebar ul li a .home-icon { - display: block; - background-image: url(images/icons/SidebarHomeFolder_16x16.png); - width: 16px; - height: 16px; float: left; - margin-left: 15px; + display: block; margin-top: 7px; + margin-left: 15px; + width: 1pc; + height: 1pc; + background-image: url(images/icons/SidebarHomeFolder_16x16.png) } + .finder-wrapper .main .sidebar ul li a .desktop-icon { - display: block; - background-image: url(images/icons/SidebarDesktopFolder_16x16.png); - width: 16px; - height: 16px; float: left; - margin-left: 15px; + display: block; margin-top: 7px; + margin-left: 15px; + width: 1pc; + height: 1pc; + background-image: url(images/icons/SidebarDesktopFolder_16x16.png) } + .finder-wrapper .main .sidebar ul li a .documents-icon { - display: block; - background-image: url(images/icons/SidebarDocumentsFolder_16x16.png); - width: 16px; - height: 16px; float: left; - margin-left: 15px; + display: block; margin-top: 7px; + margin-left: 15px; + width: 1pc; + height: 1pc; + background-image: url(images/icons/SidebarDocumentsFolder_16x16.png) } + .finder-wrapper .main .sidebar ul li a .downloads-icon { - display: block; - background-image: url(images/icons/SidebarDownloadsFolder_16x16.png); - width: 16px; - height: 16px; float: left; - margin-left: 15px; + display: block; margin-top: 7px; + margin-left: 15px; + width: 1pc; + height: 1pc; + background-image: url(images/icons/SidebarDownloadsFolder_16x16.png) } + .finder-wrapper .main .sidebar ul li a .movies-icon { - display: block; - background-image: url(images/icons/SidebarMoviesFolder_16x16.png); - width: 16px; - height: 16px; float: left; - margin-left: 15px; + display: block; margin-top: 7px; + margin-left: 15px; + width: 1pc; + height: 1pc; + background-image: url(images/icons/SidebarMoviesFolder_16x16.png) } + .finder-wrapper .main .sidebar ul li a .music-icon { - display: block; - background-image: url(images/icons/SidebarMusicFolder_16x16.png); - width: 16px; - height: 16px; float: left; - margin-left: 15px; + display: block; margin-top: 7px; + margin-left: 15px; + width: 1pc; + height: 1pc; + background-image: url(images/icons/SidebarMusicFolder_16x16.png) } + .finder-wrapper .main .sidebar ul li a .pictures-icon { - display: block; - background-image: url(images/icons/SidebarPicturesFolder_16x16.png); - width: 16px; - height: 16px; float: left; - margin-left: 15px; + display: block; margin-top: 7px; + margin-left: 15px; + width: 1pc; + height: 1pc; + background-image: url(images/icons/SidebarPicturesFolder_16x16.png) } + .finder-wrapper .main .sidebar ul li a .cloud-icon { - display: block; - background-image: url(images/icons/SidebariCloud_16x16.png); - width: 16px; - height: 16px; float: left; - margin-left: 15px; + display: block; margin-top: 7px; + margin-left: 15px; + width: 1pc; + height: 1pc; + background-image: url(images/icons/SidebariCloud_16x16.png) } + .finder-wrapper .main .sidebar ul li a .network-icon { - display: block; - background-image: url(images/icons/SidebarNetwork_16x16.png); - width: 16px; - height: 16px; float: left; - margin-left: 15px; + display: block; margin-top: 7px; + margin-left: 15px; + width: 1pc; + height: 1pc; + background-image: url(images/icons/SidebarNetwork_16x16.png) } + .finder-wrapper .main .sidebar ul li a .trash-icon { - display: block; - background-image: url(images/icons/StatusBarTrashIcon_16x16.png); - width: 16px; - height: 16px; float: left; - margin-left: 15px; + display: block; margin-top: 7px; + margin-left: 15px; + width: 1pc; + height: 1pc; + background-image: url(images/icons/StatusBarTrashIcon_16x16.png) } + .finder-wrapper .main .sidebar ul li .on { - background: #cecece; + background: #cecece } + .finder-wrapper .topbar .next-prev-box .prev { float: left; display: block; width: 25px; - height: 22px; + height: 22px } + .finder-wrapper .topbar .next-prev-box .next { float: right; display: block; width: 25px; - height: 22px; + height: 22px } -.rename{ - border: 0px; + +.rename { width: 60px; height: 18px; - background: none; - text-align: center; + border: 0; + background: 0 0; + text-align: center } \ No newline at end of file diff --git a/app/finder/index.html b/app/finder/index.html index 9f35640..f1cf150 100644 --- a/app/finder/index.html +++ b/app/finder/index.html @@ -21,13 +21,12 @@
-
-
+
+ - \ No newline at end of file diff --git a/css/index.css b/css/index.css index 2f480ad..a4cdf63 100644 --- a/css/index.css +++ b/css/index.css @@ -1,10 +1,8 @@ @charset "utf-8"; body,a,h1,h2,h3,h4,h5,h6,p,div,em,ul,li { - font-family: PingFangSC-Ultralight, 'microsoft yahei'; -} -* { - font-family: "Microsoft YaHei", 微软雅黑, "MicrosoftJhengHei", 华文细黑, STHeiti, MingLiu + font-family: PingFang SC, Verdana, Helvetica Neue, Microsoft Yahei, Hiragino Sans GB, Microsoft Sans Serif, WenQuanYi Micro Hei, sans-serif; } + html { height: 100%; } @@ -207,7 +205,7 @@ body { z-index: 1000; overflow-y: hidden; transition: bottom 0.5s; - border-radius: 3px; + border-radius:0 0 3px 3px; } #win10-menu.hidden { @@ -483,7 +481,7 @@ body { } #win10_command_center .command-body .notice .notice-header { - background-color: #dee7e7; + background-color: #ffffffbf; height: 25px; border-radius: 5px 5px 0 0; line-height: 25px; @@ -642,8 +640,8 @@ body { color: transparent; margin-right: 8px; font-size: 15px; - display: inline-block; - text-align: right; + display: block; + float: right; } #win10_command_center .msgs .msg>.btn_close_msg:hover{ diff --git a/js/mac.js b/js/mac.js index 26bfae1..737a498 100644 --- a/js/mac.js +++ b/js/mac.js @@ -678,7 +678,7 @@ window.Win10 = { } //获取周 function get_week(date){ - var values = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"]; + var values = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"]; return values[date.getDay()]; }