Skip to content

Commit

Permalink
Merge pull request #26 from mubassirhayat/master
Browse files Browse the repository at this point in the history 
Local Font Awesome removed, Extra code removed, Nav bar modified closes #25
  • Loading branch information
@mubassirhayat
mubassirhayat committed Aug 19, 2014
2 parents 5a7a5fd + 68eff6d commit 51080fd
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 125 deletions.
143 changes: 21 additions & 122 deletions app/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<link rel="stylesheet" href="styles/main.css">
<link rel="stylesheet" href="styles/custom.css">
<!-- endbuild -->
<script src="../bower_components/modernizr/modernizr.js"></script>
<script src="../bower_components/modernizr/modernizr.js"></script>
<link href='http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300' rel='stylesheet' type='text/css'>
</head>
<body id="home" data-spy="scroll" data-target=".navbar">
Expand Down Expand Up @@ -112,29 +112,6 @@ <h1 class="team-text text-center midnight-blue" align="center">We are a team of
</div>
</form>
</div>
<!-- <div class="col-xs-12 col-sm-10 col-md-4 col-lg-3 col-lg-offset-2 col-md-offset-1 col-sm-offset-1">
<h2 class="red">Contact info</h2>
<p class="address">
Basecamp<br>
Arbab Tower<br>
NasirBagh Road, Peshawar<br>
<span class="red">Email:</span>
<a style="text-decoration: none" href="mailto:hello@sweetpixelstudios.com">hello@sweetpixelstudios.com</a><br>
<span class="red">Web:</span>
<a style="text-decoration: none" href="http://sweetpixelstudios.com">sweetpixelstudios.com</a>
</p>
<div class="row">
<div class="col-xs-2 col-sm-2 col-md-3 col-lg-3">
<a href="https://www.facebook.com/SweetPixelStudios"><img src="/images/facebookbutton.png" class="img-responsive" onmouseover="this.src='/images/facebookbuttonhighlighted.png'" onmouseout="this.src='/images/facebookbutton.png'" /></a>
</div>
<div class="col-xs-2 col-sm-2 col-md-3 col-lg-3">
<a href="https://twitter.com/sweetpixlstdios"><img src="/images/twitterbutton.png" class="img-responsive" onmouseover="this.src='/images/twitterbuttonhighlighted.png'" onmouseout="this.src='/images/twitterbutton.png'" /></a>
</div>
<div class="col-xs-2 col-sm-2 col-md-3 col-lg-3">
<a href="mailto:hello@sweetpixelstudios.com"><img src="/images/mailbutton.png" class="img-responsive" onmouseover="this.src='/images/mailbuttonhighlighted.png'" onmouseout="this.src='/images/mailbutton.png'" /></a>
</div>
</div>
</div> -->
</div>
</div>
</body>
Expand All @@ -150,104 +127,26 @@ <h2 class="red">Contact info</h2>
<div class="container">

<div class="row">
<!-- <div class="span12"> -->
<!-- <div class="row" align="center" style="margin-right: 40px;">
<h3>Send us a message</h3>
</div> -->

<!-- <form id="contact-form">
<fieldset>
<div class="row" align="center" style="margin-left: 140px;">
<div class="holder span8"><div class="message"><div class="top"></div>
<div class="contents"><div id="alert"></div></div>
<div class="bottom"></div></div></div>
<div class="field span8">
<input type="text" value="" class="input-text m-wrap m-ctrl-large" id="name" name="name" placeholder="Your Name"/></div>
<div class="field span8">
<input type="text" value="" class="input-text m-wrap m-ctrl-large" id="email" name="email" placeholder="Your Email Address" />
</div>
<div class="field span8">
<textarea placeholder="Your Message" class="input-textarea m-wrap m-ctrl-large" id="message" name="message"></textarea>
</div>
<div class="field span8">
<input type="submit" class="m-btn green" value="Submit" /></div>
</div>
</fieldset>
</form> -->
<!-- </div> -->

<div class="col-xs-12 col-sm-12 col-md-4 col-lg-5 col-lg-offset-4 col-md-offset-4 col-sm-offset-3">
<!-- <h3>Contact info</h3>
<p>Basecamp<br>
Arbab Tower<br>
NasirBagh Road, Peshawar<br>
Email: hello@sweetpixelstudios.com
Web: sweetpixelstudios.com</p> -->
<p></p>
<div class="row">
<div class="col-xs-4 col-sm-2 col-md-4 col-lg-3">
<a href="https://www.facebook.com/SweetPixelStudios"><img src="/images/facebookbutton.png" class="img-responsive" onmouseover="this.src='/images/facebookbuttonhighlighted.png'" onmouseout="this.src='/images/facebookbutton.png'" /></a>
</div>
<div class="col-xs-4 col-sm-2 col-md-4 col-lg-3">
<a href="https://twitter.com/sweetpixlstdios"><img src="/images/twitterbutton.png" class="img-responsive" onmouseover="this.src='/images/twitterbuttonhighlighted.png'" onmouseout="this.src='/images/twitterbutton.png'" /></a>
</div>
<div class="col-xs-4 col-sm-2 col-md-4 col-lg-3">
<a href="https://plus.google.com/115605109379554799863" rel="publisher" ><img src="/images/googleplusbutton.png" class="img-responsive" onmouseover="this.src='/images/googleplusbutton.png'" onmouseout="this.src='/images/googleplusbutton.png'" /></a>
</div>
</div>
<p></p>
</div>


</div>


</div> <!-- /container -->

</div> <!-- /form -->

<!-- /CONTACT FORM ############################################### -->

</div> <!-- /container -->



<script type="text/javascript">

var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-30702122-1']);
_gaq.push(['_trackPageview']);

(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();

</script>

</body>


<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->

<!-- build:js scripts/main.js -->
<script src="scripts/jquery.js"></script>
<script src="scripts/jquery.mousewheel-3.0.4.pack.js"></script>
<script src="scripts/jquery.gmap.js"></script>
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
<script src="js/jquery.form.js"></script>
<script src="scripts/custom.js"></script>
<script src="scripts/jquery.isotope.min.js"></script>
<script src="scripts/bootstrap-scrollspy.js"></script>
<script src="scripts/anchor.js" type="text/javascript"></script>
<script src="scripts/bootstrap.js"></script>
<!-- endbuild -->


<div class="col-xs-12 col-sm-12 col-md-4 col-lg-5 col-lg-offset-4 col-md-offset-4 col-sm-offset-3">
<div class="row">
<div class="col-xs-4 col-sm-2 col-md-4 col-lg-3">
<a href="https://www.facebook.com/SweetPixelStudios"><img src="/images/facebookbutton.png" class="img-responsive" onmouseover="this.src='/images/facebookbuttonhighlighted.png'" onmouseout="this.src='/images/facebookbutton.png'" /></a>
</div>
<div class="col-xs-4 col-sm-2 col-md-4 col-lg-3">
<a href="https://twitter.com/sweetpixlstdios"><img src="/images/twitterbutton.png" class="img-responsive" onmouseover="this.src='/images/twitterbuttonhighlighted.png'" onmouseout="this.src='/images/twitterbutton.png'" /></a>
</div>
<div class="col-xs-4 col-sm-2 col-md-4 col-lg-3">
<a href="https://plus.google.com/115605109379554799863" rel="publisher" ><img src="/images/googleplusbutton.png" class="img-responsive" onmouseover="this.src='/images/googleplusbutton.png'" onmouseout="this.src='/images/googleplusbutton.png'" /></a>
</div>
</div>
<p></p>
</div>
</div>
</div> <!-- /container -->
</div> <!-- /form -->
<!-- /CONTACT FORM ############################################### -->
</div> <!-- /container -->
</body>
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
Expand Down
4 changes: 2 additions & 2 deletions app/styles/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ h2, .h2 {
transition: opacity 0.15s linear 0s;
}

.navbar .nav > li.active, .navbar .nav > li.hover, .navbar .nav > li.focus{
.navbar .nav > li.active, .navbar .nav > li:hover, .navbar .nav > li.focus{
background-color: transparent;
border-top: 11px solid #D91E18;
color: #333333;
Expand All @@ -53,7 +53,7 @@ h2, .h2 {

.navbar .nav > li > a{
background-color: transparent;
border-top: 0px solid transparent;
border-top: 11px solid transparent;
color: #D91E18;
float: none;
padding: 10px 15px;
Expand Down
1 change: 0 additions & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"jquery": "*",
"bootstrap": "*",
"modernizr": "*",
"font-awesome": "*",
"animate.css": "*"
},
"devDependencies": {}
Expand Down

0 comments on commit 51080fd

Please sign in to comment.