Skip to content

Commit 9f09cd0

Browse files
PythonnotJavaPythonnotJava
committed
NEW
1 parent c2e81b5 commit 9f09cd0

24 files changed

Lines changed: 2657 additions & 5 deletions

‎extend/flutter/gatsp/index.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@
3030
<!-- Favicon -->
3131
<link rel="icon" type="image/png" href="favicon.png"/>
3232

33+
<<<<<<< HEAD
3334
<title>Ga-Tsp-Example</title>
35+
=======
36+
<title>Ga-Tsp-Example</title>
37+
>>>>>>> e704743 (NEW)
3438
<link rel="manifest" href="manifest.json">
3539

3640
<script>
@@ -56,4 +60,8 @@
5660
});
5761
</script>
5862
</body>
63+
<<<<<<< HEAD
5964
</html>
65+
=======
66+
</html>
67+
>>>>>>> e704743 (NEW)

‎index.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<meta charset="UTF-8">
1010
<title>A little cookie</title>
1111
<!-- 引入 Bootstrap 样式 -->
12-
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet">
12+
<link href="src/css/bootstrap.min.css" rel="stylesheet">
1313
<link href="src/css/main.css" rel="stylesheet">
1414
</head>
1515

@@ -194,12 +194,14 @@ <h5 class="card-title">热血精灵派天赋系统……</h5>
194194
</div>
195195
<!-- JavaScript部分 -->
196196
<!-- jQuery和Popper.js，可以从CDN引入或者本地引入 -->
197-
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
198-
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.15.0/dist/umd/popper.min.js"></script>
197+
198+
<script src="src/js/jquery-3.6.0.min.js"></script>
199+
<script src="src/js/popper.min.js"></script>
199200
<!-- Bootstrap JavaScript，可以从CDN引入或者本地引入 -->
200-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
201+
<script src="src/js/bootstrap.min.js"></script>
201202
<!-- Font Awesome JavaScript，可以从CDN引入或者本地引入 -->
202-
<script src="https://kit.fontawesome.com/your-kits-id.js"></script>
203+
<!-- <script src="https://kit.fontawesome.com/your-kits-id.js"></script>-->
204+
203205
<script>
204206
function showPopup(){
205207
const overlay = document.getElementById("overlay");

‎src/css/bootstrap.min.css‎

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

‎src/global.html‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12
<!DOCTYPE html>
23
<html lang="en">
34
<head>
@@ -109,3 +110,116 @@ <h2>Python-PyQt5</h2>
109110
</div>
110111
</body>
111112
</html>
113+
=======
114+
<!DOCTYPE html>
115+
<html lang="en">
116+
<head>
117+
<title>藏书阁</title>
118+
<meta charset="UTF-8">
119+
<style>
120+
body {
121+
font-family: Arial, sans-serif;
122+
margin: 0;
123+
padding: 0;
124+
background: #f2f2f2 url("global/global-src/mylove/ml.jpg") no-repeat center;
125+
background-size: 100%;
126+
}
127+
128+
.container {
129+
display: flex;
130+
justify-content: space-between;
131+
max-width: 1200px;
132+
margin: 0 auto;
133+
padding: 20px;
134+
}
135+
136+
.card {
137+
flex: 1;
138+
background-color: #fff;
139+
border-radius: 5px;
140+
padding: 20px;
141+
box-shadow: 0 0 5px rgba(0, 0, 0, 0.1);
142+
transition: box-shadow 0.3s ease, transform 0.3s ease;
143+
cursor: pointer;
144+
}
145+
146+
.card:hover {
147+
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
148+
transform: scale(1.05);
149+
}
150+
h2 {
151+
color: #333;
152+
margin-bottom: 10px;
153+
}
154+
ul {
155+
list-style-type: none;
156+
padding: 0;
157+
}
158+
li {
159+
margin-bottom: 10px;
160+
}
161+
a {
162+
text-decoration: none;
163+
color: #007bff;
164+
}
165+
a:hover{
166+
padding: 5px;
167+
color: yellow;
168+
}
169+
#type1 {
170+
background-image: linear-gradient(to right, skyblue, lightsteelblue);
171+
}
172+
#type2 {
173+
background-image: linear-gradient(to bottom, slategrey, palegoldenrod);
174+
}
175+
#type3 {
176+
background-image: linear-gradient(to left, silver, lavender);
177+
}
178+
#type4 {
179+
background-image: linear-gradient(to top, sienna, fuchsia);
180+
}
181+
</style>
182+
</head>
183+
<body>
184+
<div class="container">
185+
<div class="card" onclick="location.href='#'" id="type1">
186+
<h2>Dart-Language</h2>
187+
<ul>
188+
<li><a href="h5/other/Dart语言快速入门.html">Dart语言快速入门</a></li>
189+
<li><a href="h5/other/Dart快速入门（2）.html">Dart快速入门（2）</a></li>
190+
<li><a href="h5/other/Dart高级教程.html">Dart高级教程</a></li>
191+
</ul>
192+
</div>
193+
<div class="card" onclick="location.href='#'" id="type2">
194+
<h2>Python-Matplotlib</h2>
195+
<ul>
196+
<li><a href="h5/other/blogMatplotlib.html">blogMatplotlib</a></li>
197+
</ul>
198+
</div>
199+
<div class="card" onclick="location.href='#'" id="type3">
200+
<h2>MakeFile</h2>
201+
<ul>
202+
<li><a href="global/index/mkf1.html">记录1</a></li>
203+
<li><a href="global/index/mkf2.html">记录2</a></li>
204+
<li><a href="global/index/mkf3.html">记录3</a></li>
205+
<li><a href="global/index/mkf4.html">记录4</a></li>
206+
<li><a href="global/index/mkf5.html">记录5</a></li>
207+
<li><a href="global/index/mkf6.html">记录6</a></li>
208+
</ul>
209+
</div>
210+
<br>
211+
</div>
212+
213+
<!--New Line-->
214+
<div class="container">
215+
<div class="card" onclick="location.href='#'" id="type4">
216+
<h2>Python-PyQt5</h2>
217+
<ul>
218+
<li><a href="h5/qt/blogPyQt5.html">PyQt5入门</a></li>
219+
<li><a href="h5/qt/blogPyQt5Depth.html">PyQt5入门（2）</a></li>
220+
</ul>
221+
</div>
222+
</div>
223+
</body>
224+
</html>
225+
>>>>>>> e704743 (NEW)

‎src/h5/effpy/typing的一些类型.html‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,6 +1177,7 @@
11771177
list-style-type: decimal;
11781178
}
11791179
</style>
1180+
<<<<<<< HEAD
11801181
<style>.markdown-body a.footnote-ref {
11811182
text-decoration: none;
11821183
}
@@ -1242,6 +1243,73 @@
12421243
margin: 0 10px;
12431244
border-bottom: 2px dotted black;
12441245
}
1246+
=======
1247+
<style>.markdown-body a.footnote-ref {
1248+
text-decoration: none;
1249+
}
1250+
1251+
.footnotes {
1252+
font-size: .85em;
1253+
opacity: .8;
1254+
}
1255+
1256+
.footnotes li[role="doc-endnote"] {
1257+
position: relative;
1258+
}
1259+
1260+
.footnotes .footnote-back {
1261+
position: absolute;
1262+
font-family: initial;
1263+
top: .2em;
1264+
right: 1em;
1265+
text-decoration: none;
1266+
}
1267+
1268+
.inline-math.invalid,
1269+
.multiple-math.invalid {
1270+
color: rgb(255, 105, 105);
1271+
}
1272+
1273+
.toc-container {
1274+
width: 100%;
1275+
}
1276+
1277+
.toc-container .toc-title {
1278+
font-weight: 700;
1279+
font-size: 1.2em;
1280+
margin-bottom: 0;
1281+
}
1282+
1283+
.toc-container li,
1284+
.toc-container ul,
1285+
.toc-container ul li {
1286+
list-style: none !important;
1287+
}
1288+
1289+
.toc-container > ul {
1290+
padding-left: 0;
1291+
}
1292+
1293+
.toc-container ul li span {
1294+
display : flex;
1295+
}
1296+
1297+
.toc-container ul li span a {
1298+
color: inherit;
1299+
text-decoration: none;
1300+
}
1301+
.toc-container ul li span a:hover {
1302+
color: inherit;
1303+
text-decoration: none;
1304+
}
1305+
1306+
.toc-container ul li span span.dots {
1307+
flex: 1;
1308+
height: 0.65em;
1309+
margin: 0 10px;
1310+
border-bottom: 2px dotted black;
1311+
}
1312+
>>>>>>> e704743 (NEW)
12451313

12461314
/*# sourceURL=webpack://./src/muya/lib/assets/styles/exportStyle.css */
12471315
/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8uL3NyYy9tdXlhL2xpYi9hc3NldHMvc3R5bGVzL2V4cG9ydFN0eWxlLmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtFQUNFLHFCQUFxQjtBQUN2Qjs7QUFFQTtFQUNFLGdCQUFnQjtFQUNoQixXQUFXO0FBQ2I7O0FBRUE7RUFDRSxrQkFBa0I7QUFDcEI7O0FBRUE7RUFDRSxrQkFBa0I7RUFDbEIsb0JBQW9CO0VBQ3BCLFNBQVM7RUFDVCxVQUFVO0VBQ1YscUJBQXFCO0FBQ3ZCOztBQUVBOztFQUVFLHlCQUF5QjtBQUMzQjs7QUFFQTtFQUNFLFdBQVc7QUFDYjs7QUFFQTtFQUNFLGdCQUFnQjtFQUNoQixnQkFBZ0I7RUFDaEIsZ0JBQWdCO0FBQ2xCOztBQUVBOzs7RUFHRSwyQkFBMkI7QUFDN0I7O0FBRUE7RUFDRSxlQUFlO0FBQ2pCOztBQUVBO0VBQ0UsY0FBYztBQUNoQjs7QUFFQTtFQUNFLGNBQWM7RUFDZCxxQkFBcUI7QUFDdkI7QUFDQTtFQUNFLGNBQWM7RUFDZCxxQkFBcUI7QUFDdkI7O0FBRUE7RUFDRSxPQUFPO0VBQ1AsY0FBYztFQUNkLGNBQWM7RUFDZCwrQkFBK0I7QUFDakMiLCJzb3VyY2VSb290IjoiIn0= */</style>

0 commit comments

Comments
 (0)