Skip to content

Commit c105c3b

Browse files
FLLLIGHTFLLLIGHT
committed
version 1.1.0 implement navbar
1 parent 207ae06 commit c105c3b

File tree

33 files changed

+26580
-0
lines changed

33 files changed

+26580
-0
lines changed

‎out/artifacts/SoftwareDeveloping_PJ_war_exploded/WEB-INF/classes/fudan/sd/project/controller/AccountServlet.class

37 Bytes
Binary file not shown.

‎out/artifacts/SoftwareDeveloping_PJ_war_exploded/css/bootstrap.css

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

‎out/artifacts/SoftwareDeveloping_PJ_war_exploded/css/theme.css

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
.navbar-light .navbar-brand {
2+
color: rgba(0, 0, 0, 0.9);
3+
color: black !important;
4+
font-weight: 600;
5+
}
6+
7+
.navbar-expand-lg{
8+
box-shadow: 0 .5rem 1rem rgba(0,0,0,.15)!important;
9+
background-color:rgb(104,88,91);
10+
}
11+
12+
.justify-content-end{
13+
margin-left: 50%;
14+
font-size: 17px;
15+
}
16+
17+
.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
18+
color: black !important;
19+
background-color: rgb(250,226,180) !important;
20+
box-shadow: 0 .3rem .5rem rgba(0,0,0,.15)!important;
21+
}
22+
23+
li:hover .dropdown-menu {
24+
display: block;
25+
}
26+
.dropdown-menu {
27+
top: 80%;
28+
}
29+
30+
.bgcolor a:link{color: white !important;}
31+
.bgcolor a:visited{color: white !important;}
32+
.bgcolor a:hover{color: rgb(250,226,180) !important;}
33+
.bgcolor a:active{color: white !important;}
34+
35+
.bgcolor .bgcolor2 a:link{color: black !important;}
36+
.bgcolor .bgcolor2 a:visited{color: black !important;}
37+
.bgcolor .bgcolor2 a:hover{color: rgb(250,226,180) !important;}
38+
.bgcolor .bgcolor2 a:active{color: black !important;}
39+
40+
a:visited {
41+
color: rgb(104,88,91) !important;
42+
}
43+
a {
44+
color: rgb(104,88,91) !important;
45+
}
46+
.dropdown-item:hover, .dropdown-item:focus {
47+
background-color: rgb(104,88,91) !important;
48+
}
49+
50+
.dropdown-item.active, .dropdown-item:active {
51+
background-color: #007bff;
52+
}
53+
54+
.h1{
55+
font-family: 'Kirang Haerang' !important;
56+
}
57+
58+
59+
.min-vh-80 {
60+
min-height: 80vh; }
61+
td{
62+
font-size:13px !important;
63+
text-align: left !important;
64+
font-family: 'Open Sans' !important;
65+
text-color: #393939 !important;
66+
font-weight:300 !important;
67+
}
68+
th{
69+
font-size:15px !important;
70+
font-family: 'Open Sans' !important;
71+
}
72+
#scrollUp {
73+
background-image: url("https://2019.igem.org/wiki/images/5/5c/T--Fudan--Top.png");
74+
bottom: 20px;
75+
right: 20px;
76+
width: 38px; /* Width of image */
77+
height: 38px; /* Height of image */
78+
}
79+
@font-face {
80+
font-family: 'arciform';
81+
src:url('https://2019.igem.org/File:T--Fudan--arciform.OTF') format('otf');
82+
font-weight: normal;
83+
font-style: normal;
84+
}
85+
86+
.foot a:link{
87+
color: white !important;
88+
}
89+
.foot a:visited{
90+
color: white !important;
91+
}
92+
.foot a:hover{
93+
color:rgba(254,255,157,0.9) !important;
94+
}
95+
.foot a:active{
96+
color: white !important;
97+
}
98+
.dropdown-item a:visited{color:black;}
99+
#globalWrapper{
100+
padding: 0px;
101+
}
102+
103+
#top_title{
104+
display:none;
105+
}
106+
107+
#content{
108+
margin:0;
109+
width:100%;
110+
background-color: rgb(255,227,232);
111+
}
112+
113+
114+
115+
a.nav-link{
116+
padding:10px 16px !important;
117+
118+
}
119+
120+
p {
121+
font-size:18px !important;
122+
text-align: left !important;
123+
font-family: 'Open Sans' !important;
124+
text-color: #393939 !important;
125+
font-weight:300 !important;
126+
}
127+
128+
h4{
129+
font-size:40px !important;
130+
line-height:36px !important;
131+
padding-top:26px !important;
132+
padding-bottom:8px !important;
133+
color: #393939 !important;
134+
font-family: 'Josefin Sans' !important;
135+
font-weight: 700 !important;
136+
margin-bottom: 0.8em !important;
137+
}
138+
139+
h5{
140+
font-size:28px !important;
141+
line-height:36px !important;
142+
padding-top:26px !important;
143+
padding-bottom:8px !important;
144+
color: #393939 !important;
145+
font-family: 'Josefin Sans' !important;
146+
font-weight: 400 !important;
147+
margin-bottom: 0.8em !important;
148+
}
149+
h6{
150+
font-size: 14px !important;
151+
line-height: 1.7 !important;
152+
color: #797979 !important;
153+
font-weight: 400 !important;
154+
text-align: left !important;
155+
font-family: 'Open Sans' !important;
156+
}
157+
158+
159+
160+
.carousel slide img{
161+
height: 900px;
162+
}
163+
164+
165+
.hover-arrow:after {
166+
display: inline-block;
167+
margin-left: .375rem;
168+
transition: transform 0.2s ease;
169+
content: '->';
170+
}
171+
172+
.hover-arrow:hover:after {
173+
transform: translate3d(6px, 0, 0);
174+
}
175+
176+
body.fade-page {
177+
opacity: 0;
178+
}
179+
180+
.bg-primary-3 {
181+
background-color: #1B1F3B !important; }
182+
183+
::selection{background-color:rgba(254,255,157,0.9);color:black;text-shadow: none;}
184+
185+
.target-fix{
186+
position: relative;
187+
top: -60px;
188+
display: block;
189+
}
190+
191+
#content{
192+
margin:0;
193+
padding:0;
194+
width:100%;
195+
}
196+
197+
#globalWrapper{
198+
padding: 0px;
199+
}

‎out/artifacts/SoftwareDeveloping_PJ_war_exploded/images/1595510152159test.png

60 KB
Loading

‎out/artifacts/SoftwareDeveloping_PJ_war_exploded/index.jsp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,19 @@
1010
<html>
1111
<head>
1212
<title>index</title>
13+
<link href="/SoftwareDeveloping_PJ_war_exploded/css/bootstrap.css" rel="stylesheet" type="text/css" media="all" />
14+
<link href="/SoftwareDeveloping_PJ_war_exploded/css/theme.css" rel="stylesheet" type="text/css" media="all" />
15+
16+
<link href="https://fonts.googleapis.com/css?family=Lato:400,700,900" rel="stylesheet">
17+
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
18+
<link href="https://fonts.googleapis.com/css?family=Josefin+Sans:300,400|Roboto:300,400,500" rel="stylesheet">
19+
<link href="https://fonts.googleapis.com/css?family=Kirang+Haerang" rel="stylesheet">
1320
</head>
1421
<body>
22+
<%@ include file="/jsp/navbar.jsp"%>
23+
<div style="margin-top: 100px"></div>
24+
25+
1526
<a href="jsp/login.jsp">login</a>
1627
<br/>
1728
<a href="jsp/register.jsp">register</a>
@@ -25,5 +36,12 @@
2536
<a href="/SoftwareDeveloping_PJ_war_exploded/image/queryUploadedImages">profile</a>
2637
<br/>
2738
<a href="/SoftwareDeveloping_PJ_war_exploded/friend/jumpToFriendPage">friend</a>
39+
<br/>
40+
<a href="jsp/navbar.jsp">navbar</a>
41+
42+
<script type="text/javascript" src="/SoftwareDeveloping_PJ_war_exploded/js/jquery.min.js"></script>
43+
<script type="text/javascript" src="/SoftwareDeveloping_PJ_war_exploded/js/popper.min.js"></script>
44+
<script type="text/javascript" src="/SoftwareDeveloping_PJ_war_exploded/js/bootstrap.js"></script>
45+
2846
</body>
2947
</html>

0 commit comments

Comments
 (0)