Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Front-end changes in main page and sponsor page #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fredfalcon merged 7 commits into from
Jun 4, 2017
Merged

Front-end changes in main page and sponsor page #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0e7db8b
main page ui changed
Roboneet May 25, 2017
1801bbb
sponser page changed
Roboneet May 29, 2017
f4e52b8
merging master
Roboneet Jun 3, 2017
021cba6
responsive user-menu
Roboneet Jun 4, 2017
eb7b650
merging master
Roboneet Jun 4, 2017
13724dc
resolving conflicts
Roboneet Jun 4, 2017
df6632d
Merge branch 'master' of https://github.com/owasp/BLT into ui
Roboneet Jun 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
217 changes: 217 additions & 0 deletions website/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
body{
font-family: 'Open Sans',arial;
background-color: #fff;
}

.navbar-default{
background-color: #fff;
padding: 20px;
border-width: 0;
}

@media only screen and (max-width: 800px){
.navbar-header{
float: left;
}
.navbar-default .tagline{
display: none;
}
}

.navbar-default .tagline{
font-size: 18px;
color: #999;
line-height: 54px;

font-weight: 300;
}

.page-header{
font-weight: 400;
font-size: 40px;
padding: 30px;
}

.chrome-plugin{
color: #dd4252;
}

a:hover{
color: #009688;
}

.login-button{
height:50px;
font-size:14px;
border-width: 0;
float:right;
color:#dd4252;
border-radius: 0;
}

.login-button:hover{
border-width: 0;
color: #009688;
}

#form1{
max-width: 400px;
margin: 30px 10px;
overflow: contain;
}
@media only screen and (max-width: 800px)
{
#form1{
margin: 30px auto;
}
}

.form input,.form textarea,.form label{
margin:5px auto;
}

.form label{
color: #777;
}

.form .form-group{
margin-top: 20px;
}

.form input,.form textarea{
background-color: #eee;
border-width: 0;
box-shadow: 0 0 0 #000;
}

.form input:focus,
.form textarea:focus{
box-shadow: inset 0 2px 0 #ccc;
}

.form input[type="file"]{
margin: 10px 0;
line-height: 22px;
font-size: 18px;
background-color: #fff;
}




#form1 .login_options li{
list-style: none;
display: inline-block;

margin-top: 20px;
}

#form1 ul{

margin: 20px 0;
}

#video_span{
display: inline-block;
margin-top: 30px;
border: 1px solid #ddd;
padding: 5px;
border-radius: 5px;
background-color: #eee;
}


.page-sub-header{
font-size: 22px;
color: #999;
text-transform: uppercase;
border-bottom: 1px solid #eee;
padding: 20px 0;
font-weight: 300;

}

.panel-default > .panel-heading{
background-color: transparent;
border-color: transparent;
border-bottom: 1px solid #eee;
color: #999;
text-align: center;
}


.panel-default{
padding: 10px;
border-color: #fff;
box-shadow : 0 0 0 #fff;
margin: 0 auto;
}

.panel-footer{
background-color: #fff;
border-width: 1px;
margin-top: 20px;

}

.panel-footer ul{

overflow: contain;
margin: 0 auto;
}

.panel-footer li{
display: inline-block;
float: left;
margin: 40px 10px;

}


.panel-footer li a,.user-menu a{
color: #dd4252;
}

.submit_button{

background: #fff;
border-width: 0;
color: #dd4252;
padding: 10px;
display: inline-block;
border: 1px solid #dd4252;
border-radius: 6px;
}

.submit_button:hover{
background-color: #ddd;
color: #009688;
border-color: #009688;

}

.free-plan-text{
display: inline-block;

}

.user-menu{
float: right;
}

@media only screen and (max-width: 1200px){
.panel-footer li{
margin:10px;
}
}

.login_options .btn-default:hover{
color: #009866;

}

.login_options .btn-default{
color: #dd4252;
}


20 changes: 20 additions & 0 deletions website/static/js/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
$(document).ready(function(){
var prev_html = $('.user-menu .dropdown-toggle').html();
var small_icon= false;
$(window).resize(function(){
if($(window).width()<400 && !small_icon){
small_icon = true;
$('.user-menu .dropdown-toggle').html("<label>&#9776</label>");
return;
}

if($(window).width()>400 && small_icon){
small_icon = false;
$('.user-menu .dropdown-toggle').html(prev_html);
return;
}


}
);
});
52 changes: 30 additions & 22 deletions website/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
<meta property="og:type" content="website" />
<link href="{% static "vendor/bootstrap/css/bootstrap.css" %}" rel="stylesheet">
<link href="{% static "css/sb-admin-2.css" %}" rel="stylesheet">
<link href="{% static "css/style.css" %}" rel="stylesheet">
<link href="{% static "vendor/font-awesome/css/font-awesome.min.css" %}" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400" rel="stylesheet">
<script src="{% static "vendor/jquery/jquery.min.js" %}"></script>
<script src="{% static "js/notify.js" %}"></script>
<!--[if lt IE 9]>
Expand All @@ -35,17 +37,18 @@
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0;">
<div class="navbar-header" style="z-index:4;">
<a class="navbar-brand" href="/" ><img src="{% static "img/logo-small-transparent.png" %}" style="margin-left:20px;"></a>
<span class="tagline">| Make the web a better place</span>
</div>

<ul class="nav navbar-top-links navbar-right">

{% if request.user.is_authenticated %}
<li class="dropdown">
<li class="dropdown user-menu">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
{% if request.user.userprofile.avatar %}
<img src="{{ request.user.userprofile.avatar }}" width="20" height="20">
{% elif request.user.socialaccount_set.all.0.get_avatar_url %}
- <img src="{{request.user.socialaccount_set.all.0.get_avatar_url}}" width="20" height="20">
<img src="{{request.user.socialaccount_set.all.0.get_avatar_url}}" width="20" height="20">
{% else %}
{% gravatar request.user.email 20 %}
{% endif %}
Expand All @@ -66,11 +69,11 @@
</li>
{% else %}
<a href="/accounts/login/">
<button class="btn btn-default" style="float:right; height:43px; font-size:14px;margin-top:3px; margin-right:15px; color:#dd4252">
<button class="btn btn-default login-button">
Login
</button>
</a>
<a href="/accounts/login">
<!-- <a href="/accounts/login">
<button class="btn btn-default btn-caution" style="float:right; height:43px; font-size:14px;margin-top:3px; margin-right:15px; color:#dd4252">
<i class="fa fa-envelope fa-2x"></i>
</button>
Expand All @@ -89,33 +92,37 @@
<button class="btn btn-default btn-caution" style="float:right; height:43px; font-size:14px;margin-top:3px; margin-right:15px; color:#dd4252">
<i class="fa fa-github fa-2x"></i>
</button>
</a>
</a> -->

{% endif %}
<li style="float:right;"><a id="chrome_ext" href="https://chrome.google.com/webstore/detail/bugheist/bififchikfckcnblimmncopjinfgccme?hl=en" target="_new" class="chrome-plugin">
+ Add to chrome
</a></li>
</ul>
</nav>
<div id="page-wrapper" >
<div class="container-fluid" >
<div class="container" >
{% block content %}
{% endblock %}
</div>
</div>
<div class="panel-footer">
<div class="col-lg-3 col-md-6 col-md-offset-3">
<ul>
<li><a href="/terms">Terms of Service</a></li>
<li><a href="http://github.com/bugheist/website" target="_new">Source</a></li>
<li><a href="/stats">Stats</a></li>
<li><a href="/scoreboard">Company Scoreboard</a></li>
</ul>
</div>
<div class="col-lg-3 col-md-6 ">
<ul>
<li><a href="http://twitter.com/bugheist" target="_new">Follow us on Twitter</a></li>
<li><a href="http://facebook.com/bugheist" target="_new">Like us on Facebook</a></li>
<li><a href="https://www.owasp.org/index.php/OWASP_Bug_Logging_Tool" target="_new">Powered by OWASP BLT</a></li>
<li><a href="/about" target="_new">About</a></li>
</ul>

<div class="container">
<div class="panel-footer" >

<ul>
<li><a href="/terms">Terms of Service</a></li>
<li><a href="http://github.com/bugheist/website" target="_new">Source</a></li>
<li><a href="/stats">Stats</a></li>
<li><a href="/scoreboard">Company Scoreboard</a></li>

<li><a href="http://twitter.com/bugheist" target="_new">Follow us on Twitter</a></li>
<li><a href="http://facebook.com/bugheist" target="_new">Like us on Facebook</a></li>
<li><a href="https://www.owasp.org/index.php/OWASP_Bug_Logging_Tool" target="_new">Powered by OWASP BLT</a></li>
<li><a href="/about" target="_new">About</a></li>
</ul>


</div>
</div>
<script src="{% static "vendor/bootstrap/js/bootstrap.min.js" %}"></script>
Expand All @@ -126,6 +133,7 @@
<script> $.notify("{{ message }}",{ position: 'top center', className: "{{message.level_tag }}" }); </script>
{% endfor %}
{% endif %}
<script src="{% static 'js/ui.js' %}"></script>
</div>
</body>
</html>
11 changes: 7 additions & 4 deletions website/templates/hunt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% block content %}
<script src="{% static "js/jquery.validate.js" %}"></script>
<link href="{% static "css/bootstrap-slider.css" %}" rel="stylesheet">
<form role="form" id="form1" action="/hunt/" method="post" enctype="multipart/form-data" >
<form role="form" id="form2" action="/hunt/" method="post" enctype="multipart/form-data" class="form" >
<div class="row">
<div class="col-lg-6">
<h1 class="page-header">Start a bug hunt!</h1>
Expand Down Expand Up @@ -35,7 +35,7 @@ <h1 class="page-header">Start a bug hunt!</h1>
</div>

<div class="form-group" style="margin-top:10px;">
<label style="margin-bottom:35px;">Grand Prize:</label>
<label style="margin-bottom:15px; color: #212121;">Grand Prize:</label><br>
(Maximum tip Amount, you are encouraged to tip the bug finders, this is the maximum amount they can expect)
<div style="display:inline;margin-left:25px;padding-top:20px;">
<input class="slider" style="width:100%"
Expand All @@ -55,7 +55,7 @@ <h1 class="page-header">Start a bug hunt!</h1>

<div class="col-lg-12">
Payments are handled through Paypal. You will be charged from Coderbounty, Inc. (our current parent company)
<h1 class="page-header">Subscription:</h1>
<h1 class="page-sub-header">Subscription:</h1>
</div>
</div>
<div class="row">
Expand Down Expand Up @@ -149,7 +149,10 @@ <h1 class="page-header">Subscription:</h1>
</div>
<div class="row">
<div class="col-lg-12">
<h2>Free Plan:</h2>Limited to 5 bugs per month:</br> <button type="submit" onclick="javascript:document.getElementById('plan').value='Free'" class="btn btn-primary btn-lg " >Start</button>
<div class="free-plan-text">
<h2>Free Plan:</h2><p>Limited to 5 bugs per month:</p>
</div>
<button type="submit" class="submit_button" onclick="javascript:document.getElementById('plan').value='Free'" class="btn btn-primary btn-lg " >Start</button>
</div>
</div>
</form>
Expand Down
Loading