Skip to content

Code cleanup #43

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
divayprakash merged 9 commits into from
Apr 8, 2016
Merged

Code cleanup #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e212915
Cleaned main.css
divayprakash Apr 8, 2016
4bbc417
Removed plugins.js
divayprakash Apr 8, 2016
cbc2451
Cleaned main.js
divayprakash Apr 8, 2016
e102b79
Added extra.css
divayprakash Apr 8, 2016
a3b0e80
Cleaned 404.html
divayprakash Apr 8, 2016
20e82e4
Cleaned under_construction.html
divayprakash Apr 8, 2016
0fd5113
Fixed CC issues
divayprakash Apr 8, 2016
0727084
Cleaned index.html
divayprakash Apr 8, 2016
451a297
Cleaned about.html, team.html
divayprakash Apr 8, 2016
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
5 changes: 5 additions & 0 deletions .codeclimate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ engines:
checks:
important:
enabled: false
universal-selector:
enabled: false
exclude_fingerprints:
- 848e5919702cf8f6a02651161eb843a1
- ae759468e01cd0871d3448db506f4a33
duplication:
enabled: true
config:
Expand Down
40 changes: 2 additions & 38 deletions 404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,10 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Page Not Found</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<style>
* {
line-height: 1.2;
margin: 0;
}
html {
color: #888;
display: table;
font-family: sans-serif;
height: 100%;
text-align: center;
width: 100%;
}
body {
display: table-cell;
vertical-align: middle;
margin: 2em auto;
}
h1 {
color: #555;
font-size: 2em;
font-weight: 400;
}
p {
margin: 0 auto;
width: 280px;
}
@media only screen and (max-width: 280px) {
body, p {
width: 95%;
}
h1 {
font-size: 1.5em;
margin: 0 0 0.3em;
}
}
</style>
<link rel="stylesheet" href="./css/extra.css">
</head>
<body>
<h1>Page Not Found</h1>
Expand Down
2 changes: 2 additions & 0 deletions about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
</div>
<div class="empty"></div>
<div class="space"></div>
<!-- Page Content -->
<div>
<div class="row row-content">
<center><h1>ABOUT</h1></center>
Expand All @@ -91,6 +92,7 @@
</div>
</div>
<div class="space"></div>
<!-- Footer -->
<footer>
<div class="container">
<div class="row row-footer">
Expand Down
36 changes: 36 additions & 0 deletions css/extra.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
* {
line-height: 1.2;
margin: 0;
}
html {
color: #888;
display: table;
font-family: sans-serif;
height: 100%;
text-align: center;
width: 100%;
}
body {
display: table-cell;
vertical-align: middle;
margin: 2em auto;
}
h1 {
color: #555;
font-size: 2em;
font-weight: 400;
}
p {
margin: 0 auto;
width: 280px;
}
@media only screen and (max-width: 280px) {
body, p {
width: 95%;
}
h1 {
font-size: 1.5em;
margin: 0 0 0.3em;
}
}

26 changes: 1 addition & 25 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,6 @@ video{
margin-top: 5%;
margin-left: 2%;
}
/*
html {
position: relative;
min-height: 100%;
}
body {
margin-bottom: 100px;
}
.footer {
position: absolute;
bottom: 0;
width: 100%;
height: 100px;
background-color: #393939;
}*/
.footer-text {
color: #FF9900;
}
Expand All @@ -91,19 +76,11 @@ body {
padding: 20px 0;
background-color: #393939;
}

/* navbar */
.navbar{
background-color: transparent;
background: transparent;
border-color: transparent;
}
/*
.navbar li
{
color: #000;
}*/
/* link */
.navbar .navbar-nav > li > a {
color: #FFF;
}
Expand All @@ -116,7 +93,6 @@ body {
.navbar .navbar-nav > .active > a:focus {
color: #FF5A09;
}
/* mobile version */
.navbar .navbar-toggle {
border-color: #FFF;
}
Expand All @@ -143,4 +119,4 @@ body {
}
#image{
cursor: pointer;
}
}
9 changes: 6 additions & 3 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
</div>
</div>
<div class="empty"></div>
<!-- Page Content -->
<div>
<div class="container">
<ul class="row row-content">
Expand All @@ -90,14 +91,16 @@
</ul>
</div>
</div>
<!-- Modal -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
</div>
</div>
</div>
<!-- Footer -->
<footer>
<div class="container">
<div class="row row-footer">
Expand Down
24 changes: 12 additions & 12 deletions js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
(function(i,s,o,g,r,a,m) {
i['GoogleAnalyticsObject']=r;
i[r]=i[r]||function() {
(i[r].q=i[r].q||[]).push(arguments)}, i[r].l=1*new Date();
a=s.createElement(o), m=s.getElementsByTagName(o)[0];
a.async=1;a.src=g; m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function() {
(i[r].q = i[r].q || []).push(arguments)}, i[r].l = 1 * new Date();
a = s.createElement(o), m = s.getElementsByTagName(o)[0];
a.async = 1; a.src = g; m.parentNode.insertBefore(a,m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', 'UA-76075660-1', 'auto');
ga('send', 'pageview');
$(document).ready(function() {
Expand All @@ -19,19 +19,19 @@ $(document).ready(function() {
}
});
});
function empty(){
function empty() {
$('.empty').height($("#H").innerHeight());
}
$(document).ready(function(){
$('li img').on('click',function(){
$(document).ready(function() {
$('li img').on('click', function() {
var src = $(this).attr('src');
var img = '<img src="' + src + '" class="img-responsive"/>';
$('#myModal').modal();
$('#myModal').on('shown.bs.modal', function(){
$('#myModal').on('shown.bs.modal', function() {
$('#myModal .modal-body').html(img);
});
$('#myModal').on('hidden.bs.modal', function(){
$('#myModal').on('hidden.bs.modal', function() {
$('#myModal .modal-body').html('');
});
});
})
})
Empty file removed js/plugins.js
View file
Open in desktop
Empty file.
2 changes: 2 additions & 0 deletions team.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
</div>
<div class="empty"></div>
<div class="space"></div>
<!-- Page Content -->
<div>
<div class="row row-content">
<center><h1>MEET THE TEAM</h1></center>
Expand Down Expand Up @@ -123,6 +124,7 @@
</div>
</div>
<div class="space"></div>
<!-- Footer -->
<footer>
<div class="container">
<div class="row row-footer">
Expand Down
40 changes: 2 additions & 38 deletions under_construction.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,10 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Under Construction</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<style>
* {
line-height: 1.2;
margin: 0;
}
html {
color: #888;
display: table;
font-family: sans-serif;
height: 100%;
text-align: center;
width: 100%;
}
body {
display: table-cell;
vertical-align: middle;
margin: 2em auto;
}
h1 {
color: #000;
font-size: 2em;
font-weight: 400;
}
p {
margin: 0 auto;
width: 280px;
}
@media only screen and (max-width: 280px) {
body, p {
width: 95%;
}
h1 {
font-size: 1.5em;
margin: 0 0 0.3em;
}
}
</style>
<link rel="stylesheet" href="./css/extra.css">
</head>
<body>
<h1>Under Construction</h1>
Expand Down