Skip to content

Commit 8950864

Browse files
shortcutmeshortcutme
committed
UiPassword plugin Logout button, Safar/OSX text zoom layout fix, New ZeroTalk address
1 parent cd731d9 commit 8950864

File tree

6 files changed

+82
-64
lines changed

6 files changed

+82
-64
lines changed

‎content.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"domain": "ZeroNetwork.bit",
55
"files": {
66
"css/all.css": {
7-
"sha512": "aac2430f92c24fec777277c25419b27299eded44b5cee91fc065a2cc677a1af4",
8-
"size": 82041
7+
"sha512": "c2f0e9d43f3fd5d379ad27d4c4a982f803dfc0bef6e71767ced924bd699bb794",
8+
"size": 82213
99
},
1010
"favicon.ico": {
1111
"sha512": "4b16ceb40191f83af1286438e4b069ab613736a199d5c5cc32a44cd60051ca13",
@@ -28,20 +28,20 @@
2828
"size": 723
2929
},
3030
"index.html": {
31-
"sha512": "258e368d91b0d8641dcf80412be87824702137b6e299be3f034b9b99336cca18",
32-
"size": 2614
31+
"sha512": "25838b4420f34b85f1345c0e2e6c6b4c7e04eb43da41e04a1f45fd5dd3c51c8f",
32+
"size": 2721
3333
},
3434
"js/all.js": {
35-
"sha512": "1e1dd5a16f58ba9e96a249db8b9d13bbdce4ccbe670b1ee82024282eea4ce40e",
36-
"size": 126948
35+
"sha512": "c2ce2f397edd71049dc903004d06e8a224b066bb7b4b476693913ca60dfa5f5f",
36+
"size": 127281
3737
},
3838
"test/jquery.min.js": {
3939
"sha512": "eda31b5c7d371d4b3acced51fa92f27a417515317cf437aae09a47c3acc8a36b",
4040
"size": 84320
4141
},
4242
"test/render.html": {
43-
"sha512": "5dd8cd2ee481c133ba0a74c90055a9d5397a826af61fc5ba38d7450c7fb3dac3",
44-
"size": 2248
43+
"sha512": "e09686abadfee90ca4b0b95a77021271157003da95abb0933b80b627bbb3860f",
44+
"size": 2626
4545
},
4646
"test/security.html": {
4747
"sha512": "a641685276ad0757bcffc0850ca2b98a900df9849f786b4d751a166241e9e858",
@@ -53,10 +53,10 @@
5353
}
5454
},
5555
"ignore": "(js|css)/(?!all.(js|css))",
56-
"modified": 1435255364.247,
56+
"modified": 1438340221.598,
5757
"sign": [
58-
23968814545139924943599664396837396157943009298343569111004846680073321449742,
59-
22926650895730676704243349969406556060621418772538790765362755272336876493247
58+
20991987358288928781472656342405888760101201405479282008342268910869438205152,
59+
82268914458815954583133595366093255563736271222992953956067279905568705779077
6060
],
6161
"signers_sign": null,
6262
"signs_required": 1,

‎css/ZeroHello.css‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
1717

1818
/* Button */
1919

20-
.button {
21-
padding: 5px 10px; background-color: #DDE0E0; border-bottom: 2px solid #999998; background-position: left center;
20+
.button {
21+
padding: 5px 10px; background-color: #DDE0E0; border-bottom: 2px solid #999998; background-position: left center;
2222
border-radius: 2px ; text-decoration: none; transition: all 0.5s ease-out ; color: #333; display: inline-block
2323
}
2424
.button:hover { background-color: #FFF400; border-color: white; border-bottom: 2px solid #4D4D4C; transition: none ; color: inherit }
@@ -27,16 +27,16 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
2727
/*.button-delete { background-color: #e74c3c; border-bottom-color: #A83F34; color: white }*/
2828
.button-outline { background-color: white; color: #DDD; border: 1px solid #eee }
2929

30-
.button-delete:hover { background-color: #FF5442; border: 1px solid #FF5442; color: white }
31-
.button-ok:hover { background-color: #27AE60; border: 1px solid #27AE60; color: white }
30+
.button-delete:hover { background-color: #FF5442; border: 1px solid #FF5442; color: white }
31+
.button-ok:hover { background-color: #27AE60; border: 1px solid #27AE60; color: white }
3232
.button-submit { background-color: #FFF85F;border-bottom: 2px solid #CDBD1E; padding: 5px 15px; font-size: 15px; line-height: 30px }
3333
.button-small { padding: 5px 10px; font-size: 12px; line-height: 16px }
3434
.button-disabled { color: #666 !important; pointer-events: none; border-bottom: 2px solid #666; background-color: #999; opacity: 0.5 }
3535

36-
.button.loading {
37-
color: rgba(0,0,0,0) !important; background: #999 url(../img/loading.gif) no-repeat center center;
36+
.button.loading {
37+
color: rgba(0,0,0,0) !important; background: #999 url(../img/loading.gif) no-repeat center center;
3838
transition: all 0.5s ease-out ; pointer-events: none; border-bottom: 2px solid #666
39-
}
39+
}
4040

4141

4242
/* Version info */
@@ -46,7 +46,8 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
4646
.version.latest { display: inline-block }
4747
.version.latest.new { background-color: #FFF85F; margin-right: -3px; display: none }
4848

49-
.user { display: none }
49+
.plugin-multiuser { display: none }
50+
.plugin-uipassword { display: none }
5051
.identicon { width: 24px; height: 24px; display: inline-block; vertical-align: middle; margin-bottom: 2px; margin-right: 10px; margin-left: 5px; border: 1px solid #F0F0F0 }
5152
.button-logout { margin-top: -2px }
5253
.button-logout:hover { color: black }
@@ -62,40 +63,41 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
6263
.served { background-color: #AF3BFF; display: inline-block; padding: 10px; margin-left: -25px; color: white }
6364

6465

65-
.site-category { margin-top: -54px; float: left; padding-left: 20px; width: 370px }
66+
.site-category { margin-top: -54px; float: left; padding-left: 20px; width: 370px; width: 90% }
6667

6768

6869
/* Site */
6970

7071
.site-container { float: left; transition: box-shadow 0.3s }
7172
.site-container h2 { margin: 10px; padding: 0px 25px; margin-top: -57px; height: 47px }
72-
.site {
73+
.site {
7374
color: white; position: relative; cursor: pointer; background-color: #383E3F; text-decoration: none;
7475
transition: all 0.2s ease-out; width: 350px; height: 250px
7576
}
7677
.site.modified { box-shadow: inset 0px 0px 0px 3px #FFF }
77-
.site .anim-updating {
78-
background: transparent url("../img/loading.gif") left top no-repeat;
78+
.site .anim-updating {
79+
background: transparent url("../img/loading.gif") left top no-repeat;
7980
width: 0px; transition: all 0.6s cubic-bezier(0.755, 0.05, 0.855, 0.06); transition-delay: 0.15s; opacity: 0; height: 11px; float: left; margin-top: 2px
8081
}
8182
.site .anim-updating.visible { width: 30px; opacity: 0.5 }
8283
.site .status { display: block; float: left; margin-top: -2px; padding: 2px 5px }
83-
.site .notify {
84+
.site .notify {
8485
margin-top: -2px; margin-left: 4px; float: left; box-sizing: border-box; padding: 2px 5px;
8586
background-color: #7f8c8d; color: white; max-width: 0px; transition: all 0.3s; white-space: nowrap; opacity: 0
8687
}
8788
.site .notify.visible { max-width: 140px; opacity: 1 }
8889
.site .notify.success { background-color: #00B16A }
8990

90-
.site h3 { font-size: 50px; line-height: 47px; padding-bottom: 7px; overflow: hidden; text-overflow: ellipsis }
91+
.site h3 { font-size: 50px; line-height: 47px; padding-bottom: 7px; overflow: hidden; text-overflow: ellipsis; clear: both; }
9192
.site h3.long { font-size: 40px }
9293
.site .bottom { bottom: 8px }
94+
.site .description { overflow: hidden; text-overflow: ellipsis; max-height: 2.5em; }
9395

94-
.site .action { right: 20px; position: absolute; bottom: 21px; padding: 5px 10px;
96+
.site .action { right: 20px; position: absolute; bottom: 21px; padding: 5px 10px;
9597
font-size: 11px; text-transform: uppercase; transition: all 0.2s ease-in-out; box-shadow: inset 0px 0px 0px 0px #fff85f;
9698
}
9799

98-
.site-container .hamburger {
100+
.site-container .hamburger {
99101
margin-left: -60px; position: relative; top: 30px; z-index: 1; transition: all 0.3s; padding: 14px 28px 0px 10px;
100102
text-decoration: none; color: white; font-size: 29px; line-height: 18px; opacity: 0;
101103
}
@@ -147,7 +149,7 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
147149

148150
/* Menu */
149151

150-
.menu {
152+
.menu {
151153
background-color: white; padding: 10px 0px; position: absolute; top: 0px; left: 0px; max-height: 0px; overflow: hidden; transform: translate(0px, -30px);
152154
box-shadow: 0px 2px 8px rgba(0,0,0,0.3); border-radius: 2px; opacity: 0; transition: opacity 0.2s ease-out, transform 1s ease-out, max-height 0.2s ease-in-out;
153155
}
@@ -165,7 +167,7 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
165167
.icon-profile { font-size: 6px; top: 0em; border-radius: 0.7em 0.7em 0 0; background: #FFFFFF; width: 1.5em; height: 0.5em; position: relative; display: inline-block; margin-right: 4px }
166168
.icon-profile::before { position: absolute; content: ""; top: -1em; left: 0.38em; width: 0.8em; height: 0.85em; border-radius: 50%; background: #FFFFFF; }
167169

168-
.icon-clock {
170+
.icon-clock {
169171
display: inline-block; width: 10px; height: 12px; vertical-align: -2px; margin-left: 5px; margin-right: 4px;
170-
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAMCAMAAABstdySAAAAOVBMVEUAAAD///////////////////////////////////////////////////////////////////////8KOjVvAAAAEnRSTlMADAIb8DMPt2MI6dTLx76nnREnEhipAAAATElEQVQI1yXLyREAMQgDQYHvvVf5B2sZz4cuKKD+Uhwru6maNDJNOx5Ao4GQP7B6MBF0BI37SMYWO+FZdqt8YZmhvF5PqmtAeek9aU7IwwMHq3GJrQAAAABJRU5ErkJggg==);
171-
}
172+
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAMCAMAAABstdySAAAAOVBMVEUAAAD///////////////////////////////////////////////////////////////////////8KOjVvAAAAEnRSTlMADAIb8DMPt2MI6dTLx76nnREnEhipAAAATElEQVQI1yXLyREAMQgDQYHvvVf5B2sZz4cuKKD+Uhwru6maNDJNOx5Ao4GQP7B6MBF0BI37SMYWO+FZdqt8YZmhvF5PqmtAeek9aU7IwwMHq3GJrQAAAABJRU5ErkJggg==);
173+
}

‎css/all.css‎

Lines changed: 22 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎index.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
<!-- Topright -->
1414
<div class="topright">
1515

16-
<div class="user">Current user: <a class='identicon' href='#Show+Private+key' title='Show private key'></a><a href="#Logout" class="button button-logout">Logout</a></div>
16+
<div class="plugin-multiuser">Current user: <a class='identicon' href='#Show+Private+key' title='Show private key'></a><a href="#Logout" class="button button-logout">Logout</a></div>
17+
<div class="plugin-uipassword"><a href="#Logout" class="button button-logout">Logout</a></div>
1718
<div class="version current">Version: <a href="https://github.com/HelloZeroNet/ZeroNet" target="_top">Unknown</a></div>
1819
<div class="version latest new" title="New update available">Latest: <a href="https://github.com/HelloZeroNet/ZeroNet" target="_top">0.3.1</a></div>
1920
<br><a href="#Update" class="button button-update button-submit">Update to new version</a>
20-
<br><span class='broken-autoupdate'>Err, we broke the autoupdate for this version.<br> Please overwrite your current <b>update.py</b> file<br> with the <a href="https://raw.githubusercontent.com/HelloZeroNet/ZeroNet/master/update.py" target="_top">latest one from github</a>, run it and restart ZeroNet.<br>Sorry for the troubles!</span>
21+
<br><span class='broken-autoupdate'>Err, we broke the autoupdate for this version.<br> Please overwrite your current <b>update.py</b> file<br> with the <a href="https://raw.githubusercontent.com/HelloZeroNet/ZeroNet/master/update.py" target="_top">latest one from github</a>, run it and restart ZeroNet.<br>Sorry for the troubles!</span>
2122
</div>
2223

2324

0 commit comments

Comments
 (0)