Skip to content

Commit 6814be4

Browse files
committed
Switch from VueJS/UmbrellaJS to Bootstrap/Popper.js/jQuery as default plugins (#54)
Signed-off-by: Daniell Mesquita <[email protected]>
1 parent 0c12cc6 commit 6814be4

27 files changed

+11433
-51
lines changed

1.txt

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,48 @@
1-
zeroframe API
1+
.color-bg {background:#00A185}
2+
.color-txt {color:#00A185}
3+
.gradient-bg {
4+
background: -webkit-linear-gradient(left, rgb(100, 230, 227), rgb(0, 161, 133), rgb(51, 51, 51) 70%)
5+
}
6+
.gradient-text {
7+
background: -webkit-linear-gradient(left, rgb(100, 230, 227), rgb(0, 161, 133), rgb(51, 51, 51) 70%);
8+
-webkit-background-clip: text;
9+
-webkit-text-fill-color: transparent
10+
}
11+
12+
C:\Users\Notebook Positivo\fmwk
13+
14+
docs:
15+
zeronet clone
16+
<zeronet> <clearnet> tags
17+
vanity-gen address
18+
19+
Vue Material tabs
20+
21+
https://css-tricks.com/now-ever-might-not-need-jquery/
22+
23+
https://github.com/vuetifyjs/vuetify-loader
24+
25+
<meta name="theme-color" content="#004863">
26+
27+
https://yoast.com/dev-blog/safari-pinned-tab-icon-mask-icon/
28+
29+
zeronet tab in elements
30+
231
modification date
332

433
header menu
534

6-
cloneable site
35+
detect if: zeronet, zeronet-proxy, clearnet
736

837
comments zn
938

1039
remove inline ul's overflow hidden
1140

1241
new HTML structure in elements
1342

14-
messages
43+
Vue Material messages
1544
show warn when framework is outdated
1645

17-
zeronet tab in elements
18-
tutorial about clonning
19-
tutorial about <zeronet> <clearnet>
20-
tutorial about vanity-gen address
21-
2246
fix sticky button link
2347
breadcrumbs
2448
fix error in tiled list

content.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@
109109
"size": 0
110110
},
111111
"css/page-common.css": {
112-
"sha512": "8bf70434331c4ae30019854e47fa76eae284354e00b8a531277386c9e9a5b718",
113-
"size": 11395
112+
"sha512": "6f73db084b8accf9ac51df19ef862174b2c37566cae5a9c3f0de6efad1a1f7eb",
113+
"size": 11531
114114
},
115115
"css/page-custom.css": {
116116
"sha512": "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce",
@@ -349,8 +349,8 @@
349349
"size": 8080
350350
},
351351
"index.html": {
352-
"sha512": "61216e016d5585e2b894c68d645926e269f804f9147ee7da1f75a14f248c4b36",
353-
"size": 24816
352+
"sha512": "cd5d8ae4131c29003db8215db2b66faf3518e1f5e894ecf8f9f40ebdcc1aab54",
353+
"size": 24820
354354
},
355355
"js/ZeroFrame.js": {
356356
"sha512": "25624cbfc07b6d208cbef3200876c4ba5b5ac0be83a395f0911a02bee5f33965",
@@ -451,11 +451,11 @@
451451
},
452452
"ignore": "(^.git)",
453453
"inner_path": "content.json",
454-
"modified": 1540136487,
454+
"modified": 1540136894,
455455
"postmessage_nonce_security": true,
456456
"signers_sign": "GxPcc7gTaIO5FSW0SpB7qerY9S/GUhbzfpFhwN4+XFtcGjd0U9gPPLi0Tm9ddT01FEG1lt/49XGoGPIxz2o81qs=",
457457
"signs": {
458-
"1Fmwk685eaX7GjoQ7JKo3QvywizGfnYRCB": "HJPwMlR59hVKr6vNZMy+B/281OpAEhAVMnWQAPbjxGCSMVwUR/b3Vk6AidVmUV8rL8VKw/EFkz9LroYwrG1/0/8="
458+
"1Fmwk685eaX7GjoQ7JKo3QvywizGfnYRCB": "HEEjgQDWlC2OJvd90DWX0sKWa3iHPnJcB9VoK7qqck3bM6BhVFvPa8hnHNUs3dALTiptCB41cwQ7/vFzxPNsBgU="
459459
},
460460
"signs_required": 1,
461461
"title": "Framework.js",

css/page-common.css

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ a button{text-decoration:none}
3535
.full-size{width:100%!important;height:100%!important}
3636
.no-opacity{opacity:1!important}
3737

38+
.p,p{color:#585b55;font-size:16px;user-select:text!important}
39+
p.color{color:#00A185}
40+
41+
.span,span{color:#888;font-size:12px}
42+
span.color{color:#00A185}
43+
3844
.h1, h1{font-size:80px;color:#00A185;margin:25px 0px 0px 0px;user-select:text!important}
3945
.h2, h2{font-size:70px;color:#333;margin:25px 0px 0px 0px;user-select:text!important}
4046
.h3, h3{font-size:60px;color:#333;opacity:0.9;margin:25px 0px 0px 0px;user-select:text!important}
@@ -55,12 +61,6 @@ h1 .badge{font-size:40px;top:-14px}h2 .badge{font-size:35px;top:-12px}h3 .badge{
5561
.badge.blue{background-color:#5b6ed6}.badge.green{background-color:#53a93f}.badge.color{background-color:#00A185;color:#fff}
5662
.badge.mini{font-size:7px;-webkit-user-select:none;-moz-user-select:none;user-select:none}
5763

58-
.p,p{color:#585b55;font-size:16px;user-select:text!important}
59-
p.color{color:#00A185}
60-
61-
.span,span{color:#888;font-size:12px}
62-
span.color{color:#00A185}
63-
6464
.blockquote,blockquote{padding:10px;background:#d6d6d6;color:#585b55;border:1px solid transparent;font-size:14px;user-select:text!important}
6565
.blockquote,blockquote:hover{border:1px solid #333}
6666
.blockquote,blockquote:active{background:transparent}
@@ -88,7 +88,7 @@ code {
8888
.input,input:hover{background:#d6d6d6;border:1px solid transparent}
8989
.input,input:focus{background:#fff;color:#000}
9090

91-
.textarea,textarea{display:inline;-webkit-margin-before:1em;-webkit-margin-after:1em;-webkit-margin-start:40px;-webkit-margin-end:40px;padding:10px;background:#d6d6d6;border:1px solid #333;color:#585b55;font-size:12px;user-select:text!important}
91+
.textarea,textarea{display:inline;-webkit-margin-before:1em;-webkit-margin-after:1em;-webkit-margin-start:40px;-webkit-margin-end:40px;padding:10px;background:#d6d6d6;border:1px solid #333;color:#585b55;font-size:12px;user-select:text!important;box-sizing:initial}
9292
.textarea, textarea:hover{border:1px solid transparent}
9393
.textarea, textarea:focus{background:transparent}
9494

@@ -334,6 +334,7 @@ footer:active .footer-shadow{box-shadow:0px 16px 26px -1px black}
334334
@media(max-width:8in){
335335
.logo, logo{font-size:19px;line-height:59px}
336336
.textarea, textarea{width: calc(100% + -55px)}
337+
.p,p{font-size:14px}
337338
.h1, h1{font-size:52px;text-align:center}
338339
.h2, h2{font-size:48px;text-align:center}
339340
.h3, h3{font-size:44px;text-align:center}

elements.html

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@
44
<title color="#fff">Elements - Framework.js</title>
55
<meta charset="utf-8">
66
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
7-
<meta content="width=device-width,initial-scale=1,minimal-ui" name="viewport">
7+
<meta content="width=device-width,initial-scale=1,minimal-ui,shrink-to-fit=no" name="viewport">
88
<link rel="icon" href="icon.png" />
99
<link rel="logo" href="icon.svg" border="true" />
1010
<base href="" target="_top" id="base">
1111

1212
<script>base.href = document.location.href.replace("/media", "").replace("index.html", "").replace(/[&?]wrapper=False/, "").replace(/[&?]wrapper_nonce=[A-Za-z0-9]+/, "")</script>
13-
<link rel="stylesheet" href="https://unpkg.com/vue-material@beta/dist/vue-material.min.css">
14-
<link rel="stylesheet" href="https://unpkg.com/vue-material@beta/dist/theme/default.css">
13+
<!-- <link rel="stylesheet" href="https://unpkg.com/vue-material@beta/dist/vue-material.min.css">
14+
<link rel="stylesheet" href="https://unpkg.com/vue-material@beta/dist/theme/default.css">-->
15+
<script type="text/javascript" src="plugins/jQuery/jquery.min.js"></script>
16+
<script type="text/javascript" src="plugins/Popper.js/popper.min.js"></script>
17+
<script type="text/javascript" src="plugins/Bootstrap/bootstrap.min.js"></script>
1518
<zeronet><script type="text/javascript" src="js/ZeroFrame.js"></script>
1619
<script type="text/javascript" src="plugins/ZeroDevLib/ZeroPage.js"></script></zeronet>
1720
<script type="text/javascript" src="js/page-common.js"></script>
@@ -413,7 +416,7 @@ <h1 id="comments"><i class="material-icons">comment</i> Comments <span class="ba
413416
<clearnet><script id="dsq-count-scr" src="//framework-js.disqus.com/count.js" async></script></clearnet>
414417
</div>
415418

416-
<script type="text/javascript" src="plugins/UmbrellaJS/umbrella.min.js"></script>
419+
<!-- <script type="text/javascript" src="plugins/UmbrellaJS/umbrella.min.js"></script>
417420
<script type="text/javascript" src="plugins/VueJS/vue.js"></script>
418421
<script src="https://unpkg.com/vue-material@beta"></script>
419422
<script>
@@ -422,6 +425,6 @@ <h1 id="comments"><i class="material-icons">comment</i> Comments <span class="ba
422425
new Vue({
423426
el: '#app'
424427
})
425-
</script>
428+
</script>-->
426429
</body>
427430
</html>

index-default.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@
44
<title color="">New Framework.js project</title>
55
<meta charset="utf-8">
66
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
7-
<meta content="width=device-width,initial-scale=1,minimal-ui" name="viewport">
7+
<meta content="width=device-width,initial-scale=1,minimal-ui,shrink-to-fit=no" name="viewport">
88
<link rel="icon" href="icon.png" />
99
<link rel="logo" href="icon.svg" border="true" />
1010
<base href="" target="_top" id="base">
1111

1212
<script>base.href = document.location.href.replace("/media", "").replace("index.html", "").replace(/[&?]wrapper=False/, "").replace(/[&?]wrapper_nonce=[A-Za-z0-9]+/, "")</script>
13-
<link rel="stylesheet" href="https://unpkg.com/vue-material@beta/dist/vue-material.min.css">
14-
<link rel="stylesheet" href="https://unpkg.com/vue-material@beta/dist/theme/default.css">
13+
<!-- <link rel="stylesheet" href="https://unpkg.com/vue-material@beta/dist/vue-material.min.css">
14+
<link rel="stylesheet" href="https://unpkg.com/vue-material@beta/dist/theme/default.css">-->
15+
<script type="text/javascript" src="plugins/jQuery/jquery.min.js"></script>
16+
<script type="text/javascript" src="plugins/Popper.js/popper.min.js"></script>
17+
<script type="text/javascript" src="plugins/Bootstrap/bootstrap.min.js"></script>
1518
<zeronet><script type="text/javascript" src="js/ZeroFrame.js"></script>
1619
<script type="text/javascript" src="plugins/ZeroDevLib/ZeroPage.js"></script></zeronet>
1720
<script type="text/javascript" src="js/page-common.js"></script>
@@ -100,10 +103,10 @@ <h1 id="comments"><i class="material-icons">comment</i> Comments <span class="ba
100103
<copyright><center>(c) 2018 <a href="" target="blank"><small>New Framework.js project</small></a>. Thanks to <b>Jesus</b>, our Lord.</center></copyright>
101104
</footer>
102105
</div>
103-
<zeronet><script type="text/javascript" src="js/ZeroFrame.js"></script></zeronet>
106+
<clearnet><script id="dsq-count-scr" src="//framework-js.disqus.com/count.js" async></script></clearnet>
104107
</div>
105108

106-
<script type="text/javascript" src="plugins/UmbrellaJS/umbrella.min.js"></script>
109+
<!-- <script type="text/javascript" src="plugins/UmbrellaJS/umbrella.min.js"></script>
107110
<script type="text/javascript" src="plugins/VueJS/vue.js"></script>
108111
<script src="https://unpkg.com/vue-material@beta"></script>
109112
<script>
@@ -112,6 +115,6 @@ <h1 id="comments"><i class="material-icons">comment</i> Comments <span class="ba
112115
new Vue({
113116
el: '#app'
114117
})
115-
</script>
118+
</script>-->
116119
</body>
117120
</html>

0 commit comments

Comments
 (0)