Skip to content
This repository was archived by the owner on Jun 10, 2021. It is now read-only.

Commit d625aa3

Browse files
StapxsStapxs
committed
Cha | merge pull
2 parents a2474fc + d4481a5 commit d625aa3

File tree

22 files changed

+967
-73
lines changed

22 files changed

+967
-73
lines changed

‎.idea/webContexts.xml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎out/artifacts/Outel_Web_exploded/WEB-INF/classes/com/outside/outel/ToolClass/Tools.class

3.18 KB
Binary file not shown.

‎out/artifacts/Outel_Web_exploded/WEB-INF/classes/com/outside/outel/UserPasser/LoginPass.class

3.53 KB
Binary file not shown.

‎out/artifacts/Outel_Web_exploded/WEB-INF/classes/com/outside/outel/UserPasser/RegPass.class

4.32 KB
Binary file not shown.

‎out/artifacts/Outel_Web_exploded/home/home.css

+22-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
html,body{
22
padding: 0px;
33
margin: 0px;
4-
background-color: #F7F9FA;
4+
/*background-color: #F7F9FA;*/
55
}
66

77
.home{
@@ -62,13 +62,17 @@ html,body{
6262
.centerhome{
6363
width: 598px;
6464
height: 100%;
65+
<<<<<<< HEAD
6566
background-color: #FFFFFF;
67+
=======
68+
background-color: red;
69+
>>>>>>> d4481a58c19fe0b046d10972b02c6f20578c0c77
6670
left: 280px;
6771
border:1px solid #EBEEF0;
6872
position: absolute;
69-
top: 53px;
7073
}
7174

75+
<<<<<<< HEAD
7276
.centerTopBar{
7377
z-index: 999;
7478
height: 53px;
@@ -83,6 +87,22 @@ html,body{
8387
border-right: 1px solid #EBEEF0;
8488
border-left: 1px solid #EBEEF0;
8589
}
90+
=======
91+
/*.centerTopBar{*/
92+
/* z-index: 999;*/
93+
/* height: 53px;*/
94+
/* width: 570px;*/
95+
/* padding-left: 15px;*/
96+
/* padding-right: 13px;*/
97+
/* position: absolute;*/
98+
/* float: left;*/
99+
/* left: 280px;*/
100+
/* margin: 0 auto;*/
101+
/* background-color: #FFFFFF;*/
102+
/* border-right: 1px solid #EBEEF0;*/
103+
/* border-left: 1px solid #EBEEF0;*/
104+
/*}*/
105+
>>>>>>> d4481a58c19fe0b046d10972b02c6f20578c0c77
86106

87107

88108

‎out/artifacts/Outel_Web_exploded/home/homeindex.css

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
html,body{
2+
padding: 0px;
3+
margin: 0px;
4+
overflow: hidden;
5+
}
6+
7+
.centerTopBar{
8+
z-index: 999;
9+
height: 53px;
10+
width: 570px;
11+
padding-left: 15px;
12+
padding-right: 13px;
13+
position: fixed;
14+
/*float: left;*/
15+
/*left: 280px;*/
16+
margin: 0 auto;
17+
background-color: #FFFFFF;
18+
/*border-right: 1px solid #EBEEF0;*/
19+
/*border-left: 1px solid #EBEEF0;*/
20+
}
21+
22+
/*中间*/
23+
.centerhome{
24+
width: 598px;
25+
height: 100%;
26+
background-color: #FFFFFF;
27+
/*left: 280px;*/
28+
border-top:1px solid #EBEEF0;
29+
position: absolute;
30+
top: 53px;
31+
}
32+
33+
.outnowbar{
34+
width: 598px;
35+
height: 120px;
36+
background-color: #FFFFFF;
37+
padding-top: 5px;
38+
padding-bottom: 5px;
39+
border-bottom:1px solid #EBEEF0;
40+
}
41+
42+
.cutline{
43+
width: 598px;
44+
height: 10px;
45+
background-color: #F7F9FA;
46+
}
47+

‎out/artifacts/Outel_Web_exploded/home/homeindex.html

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
<!DOCTYPE html>
2+
<html lang="cn">
3+
<head>
4+
<meta charset="UTF-8">
5+
<title>HOME / Outel - 畅所欲言</title>
6+
<link rel="icon" href="icon.png" sizes="32x32">
7+
<link rel="stylesheet" href="homeindex.css">
8+
</head>
9+
<body>
10+
11+
12+
<!--Center Top Bar-->
13+
<div class="centerTopBar">
14+
<div>
15+
<span style="font-family: 'Microsoft YaHei'; font-weight: bold; font-size: 1.2rem; color: #000000; line-height: 53px">主页</span>
16+
<img src="icon.png" height="37px" style="position: absolute; right: 0px; padding-right: 15px; margin-top: 8px">
17+
</div>
18+
</div>
19+
20+
<!--center home-->
21+
<div class="centerhome">
22+
23+
<!-- Out now -->
24+
<div class="outnowbar">
25+
26+
</div>
27+
28+
29+
<!-- This is a cut line with #F7F9FA-->
30+
<div class="cutline"></div>
31+
32+
33+
yidaiduanwenzimiaosu
34+
<br>
35+
<br>
36+
<br>
37+
<br>
38+
asdadadas
39+
<br>
40+
<br>
41+
<br>
42+
<br>
43+
asdadadas
44+
<br>
45+
<br>
46+
<br>
47+
<br>
48+
asdadadas
49+
<br>
50+
<br>
51+
<br>
52+
<br>
53+
asdadadas
54+
<br>
55+
<br>asdadadas
56+
<br>
57+
<br>
58+
<br>
59+
<br>asdadadas
60+
<br>
61+
<br>
62+
<br>
63+
<br>asdadadas
64+
<br>
65+
<br>
66+
<br>
67+
<br>asdadadas
68+
<br>
69+
<br>
70+
<br>
71+
<br>asdadadas
72+
<br>
73+
<br>
74+
<br>
75+
<br>asdadadas
76+
<br>
77+
<br>
78+
<br>
79+
<br>asdadadas
80+
<br>
81+
<br>
82+
<br>
83+
<br>
84+
<br>
85+
<br>
86+
asdadadas
87+
</div>
88+
89+
90+
91+
92+
93+
94+
95+
96+
97+
98+
99+
</body>
100+
</html>

‎out/artifacts/Outel_Web_exploded/home/index.html

+20-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html lang="cn">
33
<head>
44
<meta charset="UTF-8">
55
<title>主页 / Outel - 畅所欲言</title>
@@ -112,23 +112,28 @@
112112

113113

114114

115-
<!--Center Top Bar-->
116-
<div class="centerTopBar">
117-
<div>
118-
<span style="font-family: 'Microsoft YaHei'; font-weight: bold; font-size: 1.2rem; color: #000000; line-height: 53px">主页</span>
119-
<img src="icon.png" height="37px" style="position: absolute; right: 0px; padding-right: 15px; margin-top: 8px">
120-
</div>
121-
</div>
115+
<!-- &lt;!&ndash;Center Top Bar&ndash;&gt;-->
116+
<!-- <div class="centerTopBar">-->
117+
<!-- <div>-->
118+
<!-- <span style="font-family: 'Microsoft YaHei'; font-weight: bold; font-size: 1.2rem; color: #000000; line-height: 53px">主页</span>-->
119+
<!-- <img src="icon.png" height="37px" style="position: absolute; right: 0px; padding-right: 15px; margin-top: 8px">-->
120+
<!-- </div>-->
121+
<!-- </div>-->
122122

123123
<!--center home-->
124124
<div class="centerhome">
125+
<<<<<<< HEAD
126+
=======
127+
<iframe src="homeindex.html" frameborder="no" border="0" scrolling="auto" width="100%" height="100%"></iframe>
128+
>>>>>>> d4481a58c19fe0b046d10972b02c6f20578c0c77
125129

126-
<!-- Out now -->
127-
<div class="outnowbar">
130+
<!--&lt;!&ndash; Out now &ndash;&gt;-->
131+
<!-- <div class="outnowbar">-->
128132

129-
</div>
133+
<!-- </div>-->
130134

131135

136+
<<<<<<< HEAD
132137
<!-- This is a cut line with #F7F9FA-->
133138
<div class="cutline"></div>
134139

@@ -159,6 +164,10 @@
159164
<br>
160165
<br>
161166
asdadadas
167+
=======
168+
<!--&lt;!&ndash; This is a cut line with #F7F9FA&ndash;&gt;-->
169+
<!-- <div class="cutline"></div>-->
170+
>>>>>>> d4481a58c19fe0b046d10972b02c6f20578c0c77
162171
</div>
163172

164173

‎out/production/Outel/com/outside/outel/ToolClass/Tools.class

3.18 KB
Binary file not shown.

‎out/production/Outel/com/outside/outel/UserPasser/LoginPass.class

3.53 KB
Binary file not shown.

‎out/production/Outel/com/outside/outel/UserPasser/RegPass.class

4.32 KB
Binary file not shown.

‎web/home/home.css

+17-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
html,body{
22
padding: 0px;
33
margin: 0px;
4-
background-color: #F7F9FA;
4+
/*background-color: #F7F9FA;*/
55
}
66

77
.home{
@@ -62,27 +62,26 @@ html,body{
6262
.centerhome{
6363
width: 598px;
6464
height: 100%;
65-
background-color: #FFFFFF;
65+
background-color: red;
6666
left: 280px;
6767
border:1px solid #EBEEF0;
6868
position: absolute;
69-
top: 53px;
7069
}
7170

72-
.centerTopBar{
73-
z-index: 999;
74-
height: 53px;
75-
width: 570px;
76-
padding-left: 15px;
77-
padding-right: 13px;
78-
position: absolute;
79-
float: left;
80-
left: 280px;
81-
margin: 0 auto;
82-
background-color: #FFFFFF;
83-
border-right: 1px solid #EBEEF0;
84-
border-left: 1px solid #EBEEF0;
85-
}
71+
/*.centerTopBar{*/
72+
/* z-index: 999;*/
73+
/* height: 53px;*/
74+
/* width: 570px;*/
75+
/* padding-left: 15px;*/
76+
/* padding-right: 13px;*/
77+
/* position: absolute;*/
78+
/* float: left;*/
79+
/* left: 280px;*/
80+
/* margin: 0 auto;*/
81+
/* background-color: #FFFFFF;*/
82+
/* border-right: 1px solid #EBEEF0;*/
83+
/* border-left: 1px solid #EBEEF0;*/
84+
/*}*/
8685

8786

8887

@@ -102,7 +101,7 @@ html,body{
102101
z-index: 999;
103102
width: 352px;
104103
height: 103px;
105-
border-radius: 18px;
104+
border-radius: 18px 18px 0px 0px;
106105
background-color: #FFFFFF;
107106
box-shadow: 0px 0px 15px -9px #333333;
108107
position: fixed;

0 commit comments

Comments
 (0)