Skip to content

Commit 6d431ca

Browse files
act-iveact-ive
committed
Merge branch 'next' of https://github.com/WebGoat/WebGoat into next
Conflicts: src/main/webapp/WEB-INF/pages/main_new.jsp src/main/webapp/css/main.css overrode the local with the remote version
2 parents 8b2eeb1 + 2a87ee6 commit 6d431ca

File tree

10 files changed

+648
-301
lines changed

10 files changed

+648
-301
lines changed

‎newDesign/assets/css/main.css‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ img {
100100
color: #F6F6F6;
101101
}
102102
#header .toggle-navigation.toggle-left {
103-
margin: 23px 0 0 20px;
103+
margin-top: 5px;
104+
margin-left: 20px;
104105
display: inline-block;
105106
}
106107
#header .btn-default {
@@ -119,10 +120,31 @@ img {
119120
cursor: pointer;
120121
color: #797979;
121122
}
123+
#header .btn-default .fa-info,
124+
#header .btn-default .fa-envelope,
125+
#header .btn-default .fa-user {
126+
color: #797979;
127+
}
128+
#header .user-nav button:hover,
129+
#header .user-nav button:active {
130+
background: #e84c3d;
131+
}
132+
#header .user-nav button:hover i {
133+
color: #F6F6F6;
134+
}
135+
#header .lessonTitle {
136+
display: inline-block;
137+
margin:0 0 0 20px;
138+
}
139+
#header .pull-right {
140+
float: right !important;
141+
margin-top:25px;
142+
margin-right:20px;
143+
}
122144
/* Sidebar */
123145
.sidebar {
124146
width: 240px;
125-
height: auto;
147+
height: 100%;
126148
background: #222;
127149
position: absolute;
128150
-webkit-transition: all 0.3s ease-in-out;
@@ -324,17 +346,17 @@ a.btn-primary:visited {
324346
a.btn-primary:hover,
325347
a.btn-primary:active {
326348
color: #ffffff;
327-
background-color: #1dd2af;
328-
border-color: #1dd2af;
349+
background-color: #C62F28;
350+
border-color: #C62F28;
329351
}
330352
.btn-primary:hover,
331353
.btn-primary:focus,
332354
.btn-primary:active,
333355
.btn-primary.active,
334356
.open .dropdown-toggle.btn-primary {
335357
color: #ffffff;
336-
background-color: #1dd2af;
337-
border-color: #1dd2af;
358+
background-color: #C62F28;
359+
border-color: #C62F28;
338360
}
339361
.btn-primary:active,
340362
.btn-primary.active,

‎newDesign/index.html‎

Lines changed: 53 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
s<!DOCTYPE html>
1+
<!DOCTYPE html>
22
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
33
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
44
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
@@ -53,6 +53,20 @@
5353
<i class="fa fa-bars"></i>
5454
</button>
5555
</div><!--toggle navigation end-->
56+
<div class="lessonTitle">
57+
<h1>Lesson Title in here</h1>
58+
</div><!--lesson title end-->
59+
<div class="user-nav pull-right">
60+
<button type="button" class="btn btn-default">
61+
<i class="fa fa-info"></i>
62+
</button>
63+
<button type="button" class="btn btn-default">
64+
<i class="fa fa-envelope"></i>
65+
</button>
66+
<button type="button" class="btn btn-default">
67+
<i class="fa fa-user"></i>
68+
</button>
69+
</div>
5670
</header>
5771
<!--sidebar left start-->
5872
<aside class="sidebar">
@@ -160,20 +174,46 @@
160174
<!--main content start-->
161175
<section class="main-content-wrapper">
162176
<section id="main-content">
163-
<div class="row">
164-
<div class="col-md-12">
165-
<div class="panel">
166-
<div class="panel-body">
167-
<h1>About WebGoat</h1> <span style="btn">Text</span>
168-
<hr />
169-
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque volutpat feugiat nunc, non vulputate urna dictum ut. Nam consectetur porttitor diam ut ultricies. Aenean dolor dolor, congue sed ornare non, elementum in mauris. Phasellus orci sem, rhoncus eu laoreet eu, aliquam nec ante. Suspendisse sit amet justo eget eros tempor tincidunt vel quis justo. Sed pulvinar enim id neque pellentesque, eu rhoncus lorem eleifend. Morbi congue tortor sit amet pulvinar posuere.</p>
170-
<p>Integer rhoncus gravida arcu, at bibendum magna feugiat sit amet. Vivamus id lacinia massa. Praesent eu quam ullamcorper, tempor elit nec, lobortis massa. In in eros eu augue rhoncus semper. Vestibulum ornare purus vitae bibendum vulputate. Cras eleifend commodo lectus, eget pharetra justo mollis quis. Donec tempor magna lectus, vitae suscipit turpis venenatis et. Nulla facilisi.</p>
171-
<p>Nam placerat magna in massa euismod fringilla. Pellentesque in cursus risus, eu hendrerit ligula. Quisque ultrices eget tortor ut eleifend. Praesent auctor libero nec quam fringilla faucibus. Curabitur cursus risus eu faucibus rutrum. Morbi dapibus nulla risus, et euismod eros posuere volutpat. Quisque ut diam diam. Quisque sed enim tortor. Suspendisse commodo magna nec felis ultricies laoreet. Donec sit amet vehicula eros. Phasellus at dapibus enim. Sed massa quam, aliquet eu mattis at, porttitor a nisi.</p>
172-
<hr />
173-
<p>Nam placerat magna in massa euismod fringilla. Pellentesque in cursus risus, eu hendrerit ligula. Quisque ultrices eget tortor ut eleifend. Praesent auctor libero nec quam fringilla faucibus. Curabitur cursus risus eu faucibus rutrum. Morbi dapibus nulla risus, et euismod eros posuere volutpat. Quisque ut diam diam. Quisque sed enim tortor. Suspendisse commodo magna nec felis ultricies laoreet. Donec sit amet vehicula eros. Phasellus at dapibus enim. Sed massa quam, aliquet eu mattis at, porttitor a nisi.</p>
177+
<div class="row">
178+
<div class="col-md-8">
179+
<div class="col-md-12" align="left">
180+
<div class="panel">
181+
<div class="panel-body">
182+
<button type="button" class="btn btn-primary">Java [Source]</button>
183+
<button type="button" class="btn btn-primary">Solution</button>
184+
</div>
185+
</div>
186+
</div>
187+
<div class="col-md-12">
188+
<div class="panel">
189+
<div class="panel-body">
190+
<h1>About WebGoat</h1>
191+
<hr />
192+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque volutpat feugiat nunc, non vulputate urna dictum ut. Nam consectetur porttitor diam ut ultricies. Aenean dolor dolor, congue sed ornare non, elementum in mauris. Phasellus orci sem, rhoncus eu laoreet eu, aliquam nec ante. Suspendisse sit amet justo eget eros tempor tincidunt vel quis justo. Sed pulvinar enim id neque pellentesque, eu rhoncus lorem eleifend. Morbi congue tortor sit amet pulvinar posuere.</p>
193+
<p>Integer rhoncus gravida arcu, at bibendum magna feugiat sit amet. Vivamus id lacinia massa. Praesent eu quam ullamcorper, tempor elit nec, lobortis massa. In in eros eu augue rhoncus semper. Vestibulum ornare purus vitae bibendum vulputate. Cras eleifend commodo lectus, eget pharetra justo mollis quis. Donec tempor magna lectus, vitae suscipit turpis venenatis et. Nulla facilisi.</p>
194+
<p>Nam placerat magna in massa euismod fringilla. Pellentesque in cursus risus, eu hendrerit ligula. Quisque ultrices eget tortor ut eleifend. Praesent auctor libero nec quam fringilla faucibus. Curabitur cursus risus eu faucibus rutrum. Morbi dapibus nulla risus, et euismod eros posuere volutpat. Quisque ut diam diam. Quisque sed enim tortor. Suspendisse commodo magna nec felis ultricies laoreet. Donec sit amet vehicula eros. Phasellus at dapibus enim. Sed massa quam, aliquet eu mattis at, porttitor a nisi.</p>
195+
<hr />
196+
<p>Nam placerat magna in massa euismod fringilla. Pellentesque in cursus risus, eu hendrerit ligula. Quisque ultrices eget tortor ut eleifend. Praesent auctor libero nec quam fringilla faucibus. Curabitur cursus risus eu faucibus rutrum. Morbi dapibus nulla risus, et euismod eros posuere volutpat. Quisque ut diam diam. Quisque sed enim tortor. Suspendisse commodo magna nec felis ultricies laoreet. Donec sit amet vehicula eros. Phasellus at dapibus enim. Sed massa quam, aliquet eu mattis at, porttitor a nisi.</p>
197+
</div>
174198
</div>
175199
</div>
176-
</div>
200+
</div><!--col-md-8 end-->
201+
<div class="col-md-4">
202+
<div class="col-md-12">
203+
<div class="panel">
204+
<div class="panel-body">
205+
<div align="left">
206+
<button type="button" class="btn btn-default">Params</button>
207+
<button type="button" class="btn btn-default">Hints</button>
208+
<button type="button" class="btn btn-default">Cookies</button>
209+
</div>
210+
<hr />
211+
<h3>Hints</h3>
212+
<p>Nam placerat magna in massa euismod fringilla. Pellentesque in cursus risus, eu hendrerit ligula. Quisque ultrices eget tortor ut eleifend. Praesent auctor libero nec quam fringilla faucibus. Curabitur cursus risus eu faucibus rutrum. Morbi dapibus nulla risus, et euismod eros posuere volutpat. Quisque ut diam diam. Quisque sed enim tortor. Suspendisse commodo magna nec felis ultricies laoreet. Donec sit amet vehicula eros. Phasellus at dapibus enim. Sed massa quam, aliquet eu mattis at, porttitor a nisi.</p>
213+
</div>
214+
</div>
215+
</div>
216+
</div><!--col-md-4 end-->
177217
</div>
178218
</section>
179219
</section>

0 commit comments

Comments
 (0)