Skip to content

Commit 9486b5e

Browse files
committed
cw
1 parent 9a727e0 commit 9486b5e

File tree

6 files changed

+59
-69
lines changed

6 files changed

+59
-69
lines changed

dbm.html

Lines changed: 14 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -41,62 +41,21 @@
4141
<form class="container flex-container" id="action-menu">
4242
<div class="action-list" >
4343
<div class="action-item">Comment</div>
44-
<div class="action-item">Comment</div>
45-
<div class="action-item">Comment</div>
46-
<div class="action-item">Comment</div>
47-
<div class="action-item">Comment</div>
48-
<div class="action-item">Comment</div>
49-
<div class="action-item">Comment</div>
50-
<div class="action-item">Comment</div>
51-
<div class="action-item">Comment</div>
52-
<div class="action-item">Comment</div>
53-
<div class="action-item">Comment</div>
54-
<div class="action-item">Comment</div>
55-
<div class="action-item">Comment</div>
56-
<div class="action-item">Comment</div>
57-
<div class="action-item">Comment</div>
58-
<div class="action-item">Comment</div>
59-
<div class="action-item">Comment</div>
60-
<div class="action-item">Comment</div>
61-
<div class="action-item">Comment</div>
62-
<div class="action-item">Comment</div>
63-
<div class="action-item">Comment</div>
64-
<div class="action-item">Comment</div>
65-
<div class="action-item">Comment</div>
66-
<div class="action-item">Comment</div>
67-
<div class="action-item">Comment</div>
68-
<div class="action-item">Comment</div>
69-
<div class="action-item">Comment</div>
70-
<div class="action-item">Comment</div>
71-
<div class="action-item">Comment</div>
72-
<div class="action-item">Comment</div>
73-
<div class="action-item">Comment</div>
74-
<div class="action-item">Comment</div>
75-
<div class="action-item">Comment</div>
76-
<div class="action-item">Comment</div>
77-
<div class="action-item">Comment</div>
78-
<div class="action-item">Comment</div>
79-
<div class="action-item">Comment</div>
80-
<div class="action-item">Comment</div>
81-
<div class="action-item">Comment</div>
82-
<div class="action-item">Comment</div>
83-
<div class="action-item">Comment</div>
84-
<div class="action-item">Comment</div>
85-
86-
87-
8844
</div>
89-
<div class="vl" style="margin-inline:10px;border-left: 1px solid rgb(180, 180, 180);"></div>
90-
<div class="action-info fixed" id="jo">
91-
</div>
92-
<div class="action-info" id="jo2" >
93-
<p class="action-info-title">Comment</p>
94-
</div>
95-
</form>
96-
-->
97-
98-
<form id="invalid" class="container error" style="padding:1%; display:none; opacity:0; visibility: hidden;">
99-
<p id="invalidText">Error</p>
45+
46+
47+
</div>
48+
<div class="vl" style="margin-inline:10px;border-left: 1px solid rgb(180, 180, 180);"></div>
49+
<div class="action-info fixed" id="jo">
50+
</div>
51+
<div class="action-info" id="jo2" >
52+
<p class="action-info-title">Comment</p>
53+
</div>
54+
</form>
55+
-->
56+
57+
<form id="invalid" class="container error" style="padding:1%; display:none; opacity:0; visibility: hidden;">
58+
<p id="invalidText">Error</p>
10059
<code style="opacity: 0.7;"></code>
10160
</form>
10261

index-old.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<meta charset="UTF-8">
33
<title>Hello World!</title>
44
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
5-
<link rel="stylesheet" type="text/css" href="./styles-old.css">
5+
<link rel="stylesheet" type="text/css" href="./styles/home.css">
66
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
77
</head>
88

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
<div style="margin-top: 50px;" class="container-item">
2828
<hr class="divider" width="40%">
2929
<a class="" title="join my discord, loser" target="_blank" style="display:inline-block ;cursor:pointer; padding-top:2px; padding-bottom:0px; padding-inline:0px; margin-inline:5px;" rel="external" href="https://discord.gg/MjGNEDR">
30-
<img alt="discord logo" width="48" style="user-select: none; pointer-events: none;" src="./assets/discord.png"></img>
30+
<img alt="discord logo" class="social-icon" width="48" style="user-select: none; pointer-events: none;" src="./assets/discord.png"></img>
3131
</a>
3232
<a class="" title="gitter" target="_blank" style="display:inline-block ;cursor:pointer; padding-top:2px; padding-bottom:0px; padding-inline:0px; margin-inline:5px;" rel="external" href="https://github.com/TCMine/">
33-
<img alt="discord logo" width="48" style="user-select: none; pointer-events: none;" src="./assets/github.png"></img>
33+
<img alt="github logo" class="social-icon" width="48" style="user-select: none; pointer-events: none;" src="./assets/github.png"></img>
3434
</a>
3535
</div>
3636
</form>

src/dbm.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
const DBMInfo = info
22

3-
const urlParams = new URLSearchParams(queryString);
4-
const data = urlParams.get('data')
5-
console.log(data);
63

74
var rd_actionlist;
85
var rd_info;
96
var scroll = true;
107
var RDInput = document.getElementById("rawdata-input");
11-
128
var container;
139
var element;
1410
var element2;
1511

12+
// const queryString = window.location.search;
13+
// const urlParams = new URLSearchParams(queryString);
14+
// const data = urlParams.get('data')
15+
// console.log(data);
16+
// RDInput.value = data
17+
1618
function isJsonString(str) {
1719
try {
1820
JSON.parse(str);
@@ -96,7 +98,7 @@ function loadData(val) {
9698
actions.forEach((item, index) => {
9799
//console.log(item.name)
98100
const button = document.createElement("div");
99-
button.innerHTML = `<b>#${index+1}</b> ${item.name}`; // Use the name property of each object as the button text
101+
button.innerHTML = `<b class="action-item-n">#${index+1}</b><span style="margin-left:13%;display:inline-block">${item.name}</span>`; // Use the name property of each object as the button text
100102
button.className = "action-item"; // Use the name property of each object as the button text
101103
container.appendChild(button); // Add the button to the buttonListDiv
102104
});
@@ -139,10 +141,12 @@ function infoSetup(t) {
139141

140142
window.addEventListener('scroll', () => {
141143
let rect = ac.getBoundingClientRect();
142-
const distanceFromTop = cont.offsetTop - window.pageYOffset || document.documentElement.scrollTop;
144+
const distanceFromTop = cont.offsetTop - window.pageYOffset || document.documentElement.scrollTop;
143145
//console.log(parseInt(window.getComputedStyle(cont).getPropertyValue('padding-top')), (distanceFromTop-distanceFromTop*2)+window.getComputedStyle(cont).getPropertyValue('padding-top'))
144146
if (rect.top < 0) {
145-
stickyElement.style.marginTop = `${(distanceFromTop-distanceFromTop*2)-parseInt(window.getComputedStyle(cont).getPropertyValue('padding-top'))+10}px`;
147+
if (rect.bottom >= window.innerHeight - 5) {
148+
stickyElement.style.marginTop = `${(distanceFromTop-distanceFromTop*2)-parseInt(window.getComputedStyle(cont).getPropertyValue('padding-top'))+10}px`;
149+
}
146150
} else {
147151
stickyElement.style.marginTop = 0
148152
}

styles/home.css

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ div {
2929
height: 100%;
3030

3131
background-size: 40px 40px;
32-
animation: moveGrid 1s linear infinite;
32+
animation: moveGrid 1.5s linear infinite;
3333
}
3434

3535
@keyframes moveGrid {
@@ -59,7 +59,8 @@ form {
5959
padding-bottom: 4%;
6060
padding-inline: 10%;
6161
border-radius: 15px;
62-
border-color: #2c2c2c;
62+
border-width: 1px;
63+
border-color: #b30000;
6364
background-color: #000000;
6465
box-shadow: 0px 0px 20px rgb(184, 0, 0);
6566
}
@@ -130,6 +131,18 @@ form {
130131
opacity: 80%;
131132
}
132133

134+
.social-icon {
135+
opacity: 70%;
136+
transition: opacity 0.4 ease;
137+
}
138+
139+
.social-icon:hover {
140+
opacity: 70%;
141+
}
142+
143+
.social-icon:hover:after {
144+
opacity: 100%;
145+
}
133146

134147
@keyframes button {
135148
from {

styles/page.css

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ div {
8080

8181

8282
html, body {
83+
padding-bottom: 1%;
8384
color: rgb(228, 228, 228);
8485
background-color: rgb(43, 43, 43);
8586
font-family: 'Open Sans', sans-serif;
@@ -113,12 +114,24 @@ form {
113114
background: linear-gradient(0deg, rgb(58, 58, 58) 0%, rgb(87, 87, 87) 99%);
114115
text-align: left;
115116
padding: 0.8%;
116-
padding-left: 4%;
117+
padding-left: 5%;
117118
font: 15px 'Open Sans', sans-serif;
118119

119120
border-bottom:solid 1px;
120121
}
121122

123+
.action-item-n {
124+
position: absolute;
125+
text-align: left;
126+
display: inline-block
127+
}
128+
.action-item-t {
129+
position: absolute;
130+
text-align: left;
131+
left:2%;
132+
width: 1px;
133+
}
134+
122135
.action-info {
123136
display: flex;
124137
flex-direction: column;
@@ -336,7 +349,8 @@ form {
336349
}
337350

338351
::-webkit-scrollbar {
339-
width: 8px;
352+
width: 9px;
353+
padding: 45px;
340354
}
341355

342356
/* Track */

0 commit comments

Comments
 (0)