Skip to content

Commit 6704606

Browse files
author
Stefan Kremser
committed
Merge remote-tracking branch 'H1ghTech/testing' into testing
2 parents 25a9dfe + dd046d7 commit 6704606

File tree

6 files changed

+157
-164
lines changed

6 files changed

+157
-164
lines changed

‎esp8266_deauther/data.h‎

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎htmlfiles/attack.html‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
<head>
33
<meta charset="utf-8">
44
<link rel="stylesheet" href="style.css">
5-
<style>
6-
nav a:nth-child(3){
7-
background: #000;
8-
color:#fff;
9-
}
10-
#saved{
11-
display: inline;
12-
}
13-
</style>
145
<script src="functions.js"></script>
156
<meta name="viewport" content="width=device-width, initial-scale=0.8">
167
</head>

‎htmlfiles/clients.html‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,6 @@
22
<head>
33
<meta charset="utf-8">
44
<link rel="stylesheet" href="style.css">
5-
<style>
6-
#clientScanStatus{
7-
margin-left: 1em;
8-
}
9-
nav a:nth-child(2){
10-
background: #000;
11-
color:#fff;
12-
}
13-
#clientScanStart{
14-
margin-left: 30px;
15-
}
16-
#scanTime{
17-
width: 60px;
18-
}
19-
</style>
205
<script src="functions.js"></script>
216
<meta name="viewport" content="width=device-width, initial-scale=0.8">
227
</head>

‎htmlfiles/index.html‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,6 @@
22
<head>
33
<meta charset="utf-8">
44
<link rel="stylesheet" href="style.css">
5-
<style>
6-
#apScanStatus{
7-
margin-left: 1em;
8-
}
9-
nav a:first-child{
10-
background: #000;
11-
color:#fff;
12-
}
13-
#rssiBar{
14-
width: 100px;
15-
height: 15px;
16-
background: #fff;
17-
}
18-
#rssiBar > div{
19-
width: 52px;
20-
height: 15px;
21-
background: #c20000;
22-
}
23-
#wpa_info{
24-
padding-left: 0.34em;
25-
}
26-
27-
</style>
285
<script src="functions.js"></script>
296
<meta name="viewport" content="width=device-width, initial-scale=0.8">
307
</head>

‎htmlfiles/settings.html‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,6 @@
22
<head>
33
<meta charset="utf-8">
44
<link rel="stylesheet" href="style.css">
5-
<style>
6-
nav a:nth-child(4){
7-
background: #000;
8-
color:#fff;
9-
}
10-
label{
11-
display: inline-block;
12-
width: 135px;
13-
}
14-
#saved{
15-
display: inline;
16-
margin-left: 20px;
17-
}
18-
</style>
195
<script src="functions.js"></script>
206
<meta name="viewport" content="width=device-width, initial-scale=0.8">
217
</head>

‎htmlfiles/style.css‎

Lines changed: 154 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,161 @@
11
/* Global */
2-
*,body{
3-
margin: 0;
4-
padding: 0;
5-
font-family: arial;
6-
color: #432929;
7-
}
8-
h1{
9-
font-size: 22px;
10-
margin-bottom: 0.6em;
11-
background: #00B0FF;
12-
color: #fff;
13-
padding:0.2em;
14-
border-radius:4px;
15-
}
16-
button{
17-
background: #00B0FF;
18-
color: #fff;
19-
border: 1px solid #8F8F8F;
20-
border-radius: 14px;
21-
padding: 0.34em 0.3em;
22-
margin-bottom: 0.6em;
23-
}
24-
button:hover{
25-
color: #000;
26-
}
27-
input{
28-
height: 22px;
29-
width: 120px;
30-
border: 1px solid #A99D9D;
31-
border-radius: 5px;
32-
padding: 0.2em;
33-
margin: 2px;
34-
}
35-
input[type="checkbox"]{
36-
height: 15px;
37-
width: auto;
38-
}
39-
.warn{
40-
color:#c20000;
41-
}
42-
.warnBtn{
43-
background: #c20000;
44-
color: #fff;
45-
}
46-
.warnBtn:hover{
47-
background: #f00;
48-
color: #000;
49-
}
50-
.selectedBtn{
51-
background: #fff;
52-
color: #000;
53-
}
54-
.selectedBtn:hover{
55-
background: #00B0FF;
56-
color: #fff;
57-
}
58-
.right{ float: right; }
59-
.bold{ font-weight: bold; }
60-
.block{ display: block; }
61-
.marginNull{ margin: 0}
62-
.blue{ color: #00B0FF }
63-
.small{ font-size: 14px; color: #727272 }
64-
2+
3+
*,
4+
body {
5+
margin: 0;
6+
padding: 0;
7+
font-family: arial;
8+
color: #432929;
9+
}
10+
h1 {
11+
font-size: 22px;
12+
margin-bottom: 0.6em;
13+
background: #00B0FF;
14+
color: #fff;
15+
padding: 0.2em;
16+
border-radius: 4px;
17+
}
18+
button {
19+
background: #00B0FF;
20+
color: #fff;
21+
border: 1px solid #8F8F8F;
22+
border-radius: 14px;
23+
padding: 0.34em 0.3em;
24+
margin-bottom: 0.6em;
25+
}
26+
button:hover {
27+
color: #000;
28+
}
29+
label {
30+
display: inline-block;
31+
width: 135px;
32+
}
33+
input {
34+
height: 22px;
35+
width: 120px;
36+
border: 1px solid #A99D9D;
37+
border-radius: 5px;
38+
padding: 0.2em;
39+
margin: 2px;
40+
}
41+
input[type="checkbox"] {
42+
height: 15px;
43+
width: auto;
44+
}
45+
.warn {
46+
color: #c20000;
47+
}
48+
.warnBtn {
49+
background: #c20000;
50+
color: #fff;
51+
}
52+
.warnBtn:hover {
53+
background: #f00;
54+
color: #000;
55+
}
56+
.selectedBtn {
57+
background: #fff;
58+
color: #000;
59+
}
60+
.selectedBtn:hover {
61+
background: #00B0FF;
62+
color: #fff;
63+
}
64+
.right {
65+
float: right;
66+
}
67+
.bold {
68+
font-weight: bold;
69+
}
70+
.block {
71+
display: block;
72+
}
73+
.marginNull {
74+
margin: 0
75+
}
76+
.blue {
77+
color: #00B0FF
78+
}
79+
.small {
80+
font-size: 14px;
81+
color: #727272
82+
}
6583
/* Navigation */
66-
nav{
67-
background: #222;
84+
85+
nav {
86+
background: #222;
6887
}
69-
nav a{
70-
background: #222;
71-
color: #999;
72-
padding: 0.5em;
73-
display: inline-block;
74-
text-decoration: none;
88+
nav a {
89+
background: #222;
90+
color: #999;
91+
padding: 0.5em;
92+
display: inline-block;
93+
text-decoration: none;
7594
}
76-
nav a:hover{
77-
background: #000;
78-
color:#f0f0f0;
95+
nav a:hover {
96+
background: #000;
97+
color: #f0f0f0;
7998
}
80-
8199
/* Content */
82-
#content{
83-
padding: 0.34em;
84-
}
85-
table{
86-
padding: 0;
87-
width: 100%;
88-
max-width: 960px;
89-
margin: 0 auto;
90-
border-spacing: 0;
91-
background: #222222;
92-
}
93-
table th{
94-
background: #222222;
95-
color: #f0f0f0;
96-
}
97-
table td{
98-
font-size: 14px;
99-
background: #f0f0f0;
100-
}
101-
table th, table td{
102-
text-align: center;
103-
padding: 0.1em 0;
104-
}
105-
table .selected td{
106-
background: #11a4cc;
100+
101+
#content {
102+
padding: 0.34em;
103+
}
104+
table {
105+
padding: 0;
106+
width: 100%;
107+
max-width: 960px;
108+
margin: 0 auto;
109+
border-spacing: 0;
110+
background: #222222;
111+
}
112+
table th {
113+
background: #222222;
114+
color: #f0f0f0;
115+
}
116+
table td {
117+
font-size: 14px;
118+
background: #f0f0f0;
119+
}
120+
table th,
121+
table td {
122+
text-align: center;
123+
padding: 0.1em 0;
124+
}
125+
table .selected td {
126+
background: #11a4cc;
127+
}
128+
/* Specific */
129+
130+
#saved {
131+
display: inline;
132+
}
133+
#clientScanStatus {
134+
margin-left: 1em;
135+
}
136+
#clientScanStart {
137+
margin-left: 30px;
138+
}
139+
#scanTime {
140+
width: 60px;
141+
}
142+
#apScanStatus {
143+
margin-left: 1em;
144+
}
145+
#rssiBar {
146+
width: 100px;
147+
height: 15px;
148+
background: #fff;
149+
}
150+
#rssiBar > div {
151+
width: 52px;
152+
height: 15px;
153+
background: #c20000;
154+
}
155+
#wpa_info {
156+
padding-left: 0.34em;
157+
}
158+
#saved {
159+
display: inline;
160+
margin-left: 20px;
107161
}

0 commit comments

Comments
 (0)