Skip to content
This repository has been archived by the owner on Mar 16, 2024. It is now read-only.

Commit

Permalink
merge dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@zimocode
zimocode committed Feb 16, 2020
2 parents 6ffa7c5 + f01b089 commit 7759e14
Show file tree
Hide file tree
Showing 20 changed files with 1,024 additions and 110 deletions.
58 changes: 56 additions & 2 deletions _locales/en/messages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1444,10 +1444,10 @@
"message":"More Extensons"
},
"con_ad":{
"message":"Show advertisement"
"message":"Show advertisements on current options page"
},
"des_ad":{
"message":"Ads are only shown on the current settings page and will never appear on other pages. Thank you for your supporting."
"message":"Ads are only shown on the current options page and will never appear on other pages. Thank you for your supporting."
},
"des_moreextlist":{
"message":"These extensions are developed by me. Welcome to install and use."
Expand Down Expand Up @@ -1526,5 +1526,59 @@
},
"closeapps":{
"message":"Close all Mini-apps in tab"
},
"magnet":{
"message":"Torrent Hash To Magnet URI"
},
"btn_clear":{
"message":"CLEAR"
},
"magnet_placeholder_input":{
"message":"Input torrent hash text."
},
"homepage_grouptop":{
"message":"Most Visited Sites"
},
"homepage_groupdefault":{
"message":"Default Group"
},
"homepage_grouplist":{
"message":"Sites group list"
},
"homepage_editmode":{
"message":"Edit Mode"
},
"homepage_newgroup":{
"message":"Add an new group"
},
"homepage_grouptitle":{
"message":"Group Name"
},
"homepage_sitetitle":{
"message":"Site Name"
},
"homepage_siteurl":{
"message":"Site URL"
},
"homepage_placeurl":{
"message":"Including prefix: http, https and etc."
},
"homepage_cfmlistdel":{
"message":"This will delete all sites in the group, Please confirm the operation."
},
"homepage_ctm":{
"message":"Add to Mini-apps: Home Page"
},
"n_homepage_last":{
"message":"Set the last sites group as a default one"
},
"msg_conferr0":{
"message":"Failed to save settings. The error message is:"
},
"msg_conferr1":{
"message":"smartUp Gestures will try to roll back to the previous settings."
},
"notif_title_conferr":{
"message":"Settings save Failed!"
}
}
58 changes: 56 additions & 2 deletions _locales/zh_CN/messages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1419,10 +1419,10 @@
"message":"扩展推荐"
},
"con_ad":{
"message":"展示广告"
"message":"在当前的设置页展示广告"
},
"des_ad":{
"message":"广告仅在当前的设置页展现，绝不会在其它页面出现。本扩展一直在不断更新，需要并感谢你的支持。"
"message":"广告仅在当前的设置页展现，绝不会在其它页面出现。感谢你的支持。"
},
"des_moreextlist":{
"message":"这些扩展都是本人所开发，欢迎安装使用。"
Expand Down Expand Up @@ -1501,5 +1501,59 @@
},
"closeapps":{
"message":"关闭当前页内所有迷你应用"
},
"magnet":{
"message":"特征码转磁链"
},
"btn_clear":{
"message":"清除"
},
"magnet_placeholder_input":{
"message":"输入特征码。"
},
"homepage_grouptop":{
"message":"最常访问的网站"
},
"homepage_groupdefault":{
"message":"默认分组"
},
"homepage_grouplist":{
"message":"网站分组列表"
},
"homepage_editmode":{
"message":"编辑模式"
},
"homepage_newgroup":{
"message":"新增分组"
},
"homepage_grouptitle":{
"message":"分组名称"
},
"homepage_sitetitle":{
"message":"网站名称"
},
"homepage_siteurl":{
"message":"网站地址"
},
"homepage_placeurl":{
"message":"包括前缀：http，https等。"
},
"homepage_cfmlistdel":{
"message":"该操作会删除相应分组下的所有网站，请再次确认。"
},
"homepage_ctm":{
"message":"添加到迷你应用-主页"
},
"n_homepage_last":{
"message":"设置上一次选中的网站分组为默认"
},
"msg_conferr0":{
"message":"设置保存失败。错误信息如下："
},
"msg_conferr1":{
"message":"smartUp手势将尝试回滚到之前的设置。"
},
"notif_title_conferr":{
"message":"设置保存失败！"
}
}
9 changes: 9 additions & 0 deletions change.log
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
{
"log": [
{
"ver":"6.6.260.1045",
"date":"2020.02.16",
"content":[
"new action: magnet",
"upgrade homepage",
"fix bug: issues@github: #74, #84, try to fix #72"
]
},
{
"ver":"6.5.1348.1026",
"date":"2019.10.16",
Expand Down
1 change: 1 addition & 0 deletions css/apps_basic.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ smartup .su_menu img{
padding: 2px;
}
smartup .su_options{
transition:all .2s ease-in-out;
position: absolute;
left: 0;
top: 0;
Expand Down
168 changes: 167 additions & 1 deletion css/inject/homepage.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
smartup.su_apps#su_apps_homepage .su_homepage_box{
width: 550px;
min-height: 120px;
padding: 8px;
}
smartup.su_apps#su_apps_homepage .su_homepage_cp{
Expand All @@ -8,7 +9,7 @@ smartup.su_apps#su_apps_homepage .su_homepage_cp{
font-size: 10px;
color: #ccc;
text-align: right;
width: 580px;
width: auto;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
Expand All @@ -17,6 +18,7 @@ smartup.su_apps#su_apps_homepage .su_homepage_cp{
position: absolute;
right: 0;
bottom: 0;
text-shadow: 0.5px 0.5px 0 #000000;
}
smartup.su_apps#su_apps_homepage ul{
/*padding: 10px;*/
Expand Down Expand Up @@ -60,4 +62,168 @@ smartup.su_apps#su_apps_homepage .su_homepage_li div span{
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
smartup.su_apps#su_apps_homepage .su_homepage_listbox{
background-color: rgb(231, 233, 253);
height: 100%;
width: 200px;
position: absolute;
left: 0;
top: 0;
opacity: 0.9;
overflow: hidden auto;
z-index: 100;
}
smartup.su_apps#su_apps_homepage .su_homepage_listul{
list-style-type: none;
margin: 0 0 0 -8px;
padding: 2px 0;
background: #e7e9fd;
transition:all .4s ease-in-out;
opacity: 1;
}
smartup.su_apps#su_apps_homepage .su_homepage_listli{
transition:all .3s ease-out;
text-align: right;
width: 100%;
height: 30px;
line-height: 30px;
font-size: 14px;
cursor: pointer;
margin: 2px 0;
padding-right: 8px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
smartup.su_apps#su_apps_homepage .su_homepage_listli:hover .su_homepage_listbtndel{
margin-left: 8px;
}
smartup.su_apps#su_apps_homepage .su_homepage_listli:hover .su_homepage_listbtndel:hover{
background-color: red;
}
smartup.su_apps#su_apps_homepage .su_homepage_listli:hover,
smartup.su_apps#su_apps_homepage .su_homepage_listlicur{
background: #a6baff;
color: #3f51b5;
/*border-right: 3px solid #5677fc !important;*/
}
smartup.su_apps#su_apps_homepage .su_homepage_listlicur{
color: #3f51b5;
font-weight: bold;
}
smartup.su_apps#su_apps_homepage .su_homepage_listaddbox{
border: 1px #fff0 solid;
border-radius: 20px;
}
smartup.su_apps#su_apps_homepage .su_homepage_listaddbox:hover{
border-color: #fff;
cursor: pointer;
}
smartup.su_apps#su_apps_homepage .su_homepage_listaddvaluebox{
display: none;
}
smartup.su_apps#su_apps_homepage .su_homepage_listaddtext{
width: 80px;
}
smartup.su_apps#su_apps_homepage .su_homepage_listaddbtn{
border-top: 1px solid #d0d9ff;
padding: 10px 32px;
position: absolute;
bottom: 0;
background: #e7e9fd;
width: auto;
}
smartup.su_apps#su_apps_homepage .su_homepage_listaddbtn:hover{
cursor: pointer;
}
smartup.su_apps#su_apps_homepage .su_homepage_item{
overflow: hidden;
}
smartup.su_apps#su_apps_homepage .su_homepage_item:hover .su_homepage_itembtndel{
margin-right: -8px !important;
}
smartup.su_apps#su_apps_homepage .su_homepage_item:hover .su_homepage_itembtndel:hover{
background-color: red;
}
smartup.su_apps#su_apps_homepage .su_homepage_itemaddbox{
width: 360px;
height: auto;
padding: 4px;
background: #cef;
margin: 0 auto;
position: absolute;
right: 12px;
top: 12px;
border-radius: 2px;
}
smartup.su_apps#su_apps_homepage .su_homepage_itembtndel{
transition:all .3s ease-out;
float: right;
margin: -34px -44px 0 0 !important;
width: 36px;
height: 36px;
text-align: center;
background: rgba(0, 0, 0, 0.5);
color: white !important;
font-size: 16px !important;
}
smartup.su_apps#su_apps_homepage .su_homepage_boxbtnclose{
position: absolute;
right: 0;
top: 0;
padding: 2px;
}
smartup.su_apps#su_apps_homepage .su_homepage_addboxmain{
width: 360px;
}
smartup.su_apps#su_apps_homepage .su_homepage_addboxlabel{
width: 120px;
display: inline-block;
text-align: right;
}
smartup.su_apps#su_apps_homepage .su_homepage_boxgroup{
width: 120px;
}
smartup.su_apps#su_apps_homepage .su_homepage_addboxbtn{
text-align: center;
margin: 8px 0;
}
smartup.su_apps#su_apps_homepage .su_homepage_listbtndel{
transition:all .3s ease-out;
float: left;
width: 24px;
text-align: center;
margin-left: -16px;
background: rgba(0, 0, 0, 0.5);
color: white !important;
font-size: 16px !important;
}
smartup.su_apps#su_apps_homepage .su_homepage_editbg{
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.5);
position: absolute;
left: 0;
top: 0;
z-index: 101;
}
smartup.su_apps#su_apps_homepage .su_homepage_editbox{
margin: 0 auto;
width: auto;
height: auto;
top: 48px;
left: 120px;
padding: 4px;
background: #cef;
margin: 0 auto;
position: absolute;
border-radius: 2px;
z-index: 102;
}
smartup.su_apps#su_apps_homepage .su_homepage_editmode{
background-color: red;
}
smartup.su_apps#su_apps_homepage .su_homepage_listitembox{
margin: 16px 0;
}
Loading

0 comments on commit 7759e14

Please sign in to comment.