Skip to content

Commit

Permalink
Merge branch 'next' of https://github.com/WebGoat/WebGoat into next
Browse files Browse the repository at this point in the history 
Conflicts:
	src/main/webapp/WEB-INF/pages/main_new.jsp
	src/main/webapp/css/main.css
overrode the local with the remote version
  • Loading branch information
@act-ive
act-ive committed Sep 4, 2014
2 parents 8b2eeb1 + 2a87ee6 commit 6d431ca
Show file tree
Hide file tree
Showing 10 changed files with 648 additions and 301 deletions.
34 changes: 28 additions & 6 deletions newDesign/assets/css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ img {
color: #F6F6F6;
}
#header .toggle-navigation.toggle-left {
margin: 23px 0 0 20px;
margin-top: 5px;
margin-left: 20px;
display: inline-block;
}
#header .btn-default {
Expand All @@ -119,10 +120,31 @@ img {
cursor: pointer;
color: #797979;
}
#header .btn-default .fa-info,
#header .btn-default .fa-envelope,
#header .btn-default .fa-user {
color: #797979;
}
#header .user-nav button:hover,
#header .user-nav button:active {
background: #e84c3d;
}
#header .user-nav button:hover i {
color: #F6F6F6;
}
#header .lessonTitle {
display: inline-block;
margin:0 0 0 20px;
}
#header .pull-right {
float: right !important;
margin-top:25px;
margin-right:20px;
}
/* Sidebar */
.sidebar {
width: 240px;
height: auto;
height: 100%;
background: #222;
position: absolute;
-webkit-transition: all 0.3s ease-in-out;
Expand Down Expand Up @@ -324,17 +346,17 @@ a.btn-primary:visited {
a.btn-primary:hover,
a.btn-primary:active {
color: #ffffff;
background-color: #1dd2af;
border-color: #1dd2af;
background-color: #C62F28;
border-color: #C62F28;
}
.btn-primary:hover,
.btn-primary:focus,
.btn-primary:active,
.btn-primary.active,
.open .dropdown-toggle.btn-primary {
color: #ffffff;
background-color: #1dd2af;
border-color: #1dd2af;
background-color: #C62F28;
border-color: #C62F28;
}
.btn-primary:active,
.btn-primary.active,
Expand Down
66 changes: 53 additions & 13 deletions newDesign/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
s<!DOCTYPE html>
<!DOCTYPE html>
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
Expand Down Expand Up @@ -53,6 +53,20 @@
<i class="fa fa-bars"></i>
</button>
</div><!--toggle navigation end-->
<div class="lessonTitle">
<h1>Lesson Title in here</h1>
</div><!--lesson title end-->
<div class="user-nav pull-right">
<button type="button" class="btn btn-default">
<i class="fa fa-info"></i>
</button>
<button type="button" class="btn btn-default">
<i class="fa fa-envelope"></i>
</button>
<button type="button" class="btn btn-default">
<i class="fa fa-user"></i>
</button>
</div>
</header>
<!--sidebar left start-->
<aside class="sidebar">
Expand Down Expand Up @@ -160,20 +174,46 @@
<!--main content start-->
<section class="main-content-wrapper">
<section id="main-content">
<div class="row">
<div class="col-md-12">
<div class="panel">
<div class="panel-body">
<h1>About WebGoat</h1> <span style="btn">Text</span>
<hr />
<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>
<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>
<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>
<hr />
<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>
<div class="row">
<div class="col-md-8">
<div class="col-md-12" align="left">
<div class="panel">
<div class="panel-body">
<button type="button" class="btn btn-primary">Java [Source]</button>
<button type="button" class="btn btn-primary">Solution</button>
</div>
</div>
</div>
<div class="col-md-12">
<div class="panel">
<div class="panel-body">
<h1>About WebGoat</h1>
<hr />
<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>
<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>
<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>
<hr />
<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>
</div>
</div>
</div>
</div>
</div><!--col-md-8 end-->
<div class="col-md-4">
<div class="col-md-12">
<div class="panel">
<div class="panel-body">
<div align="left">
<button type="button" class="btn btn-default">Params</button>
<button type="button" class="btn btn-default">Hints</button>
<button type="button" class="btn btn-default">Cookies</button>
</div>
<hr />
<h3>Hints</h3>
<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>
</div>
</div>
</div>
</div><!--col-md-4 end-->
</div>
</section>
</section>
Expand Down
Loading

0 comments on commit 6d431ca

Please sign in to comment.