Skip to content

Commit fc583db

Browse files
mpliangmpliang
committed
cleaned it up a bit
1 parent c2b69ad commit fc583db

File tree

3 files changed

+30
-185
lines changed

3 files changed

+30
-185
lines changed

‎color/default.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ form#contact-form input:focus,form#contact-form select:focus,form#contact-form t
2828
}
2929

3030
footer {
31-
background-color: #eb5d1e;
31+
background-color: #333;
3232
}
3333

3434

‎index.html‎

Lines changed: 29 additions & 175 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@
1919
<link href="css/style.css" rel="stylesheet">
2020
<link href="color/default.css" rel="stylesheet">
2121

22-
<script>
23-
(function(i, s, o, g, r, a, m) {
24-
i['GoogleAnalyticsObject'] = r;
25-
i[r] = i[r] || function() {
26-
(i[r].q = i[r].q || []).push(arguments)
27-
}, i[r].l = 1 * new Date();
28-
a = s.createElement(o),
29-
m = s.getElementsByTagName(o)[0];
30-
a.async = 1;
31-
a.src = g;
32-
m.parentNode.insertBefore(a, m)
33-
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
34-
35-
ga('create', 'UA-69138050-1', 'auto');
36-
ga('send', 'pageview');
37-
38-
</script>
22+
<script>
23+
(function(i, s, o, g, r, a, m) {
24+
i['GoogleAnalyticsObject'] = r;
25+
i[r] = i[r] || function() {
26+
(i[r].q = i[r].q || []).push(arguments)
27+
}, i[r].l = 1 * new Date();
28+
a = s.createElement(o),
29+
m = s.getElementsByTagName(o)[0];
30+
a.async = 1;
31+
a.src = g;
32+
m.parentNode.insertBefore(a, m)
33+
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
34+
35+
ga('create', 'UA-69138050-1', 'auto');
36+
ga('send', 'pageview');
37+
38+
</script>
3939

4040
</head>
4141

@@ -74,10 +74,8 @@
7474
<ul class="company-social">
7575
<li class="social-linkedin"><a href="https://www.linkedin.com/in/mpliang" target="_blank"><i class="fa fa-linkedin"></i></a></li>
7676
<li class="social-dribble"><a href="https://github.com/mpliang" target="_blank"><i class="fa fa-github"></i></a></li>
77-
<!-- <li class="social-facebook"><a href="https://www.facebook.com/mpliang" target="_blank"><i class="fa fa-facebook"></i></a></li> -->
7877
<li class="social-stackoverflow"><a href="https://stackoverflow.com/users/5121099/mpliang" target="_blank"><i class="fa fa-stack-overflow"></i></a></li>
7978
<li class="social-twitter"><a href="https://twitter.com/mpliang" target="_blank"><i class="fa fa-twitter"></i></a></li>
80-
<!--<li class="social-google"><a href="https://michaelpliang.blogspot.com" target="_blank"><i class="fa fa-google-plus"></i></a></li> -->
8179
</ul>
8280
</li>
8381
</ul>
@@ -195,80 +193,6 @@ <h5>Other</h5>
195193
</div>
196194
</div>
197195

198-
<!-- <div class="col-sm-4 col-md-4 team boxed-grey">
199-
200-
<div class="service-box">
201-
<div class="service-icon">
202-
<i class="fa fa-code fa-3x"></i>
203-
</div>
204-
<div class="service-desc">
205-
<h5>FRONTEND</h5>
206-
<div class="col-md-6">
207-
<p>Javascript ES6</p>
208-
<p>HTML 5</p>
209-
<p>CSS 3</p>
210-
<p>Bootstrap 4</p>
211-
</div>
212-
<div class="col-md-6">
213-
<p>SCSS</p>
214-
<p>jQuery</p>
215-
<p>AngularJS</p>
216-
<p>React/Flux</p>
217-
</div>
218-
</div>
219-
</div>
220-
221-
</div>
222-
<div class="col-sm-4 col-md-4 team boxed-grey">
223-
224-
<div class="service-box">
225-
<div class="service-icon">
226-
<i class="fa fa-suitcase fa-3x"></i>
227-
</div>
228-
<div class="service-desc">
229-
<h5>BACKEND</h5>
230-
<div class="col-md-6">
231-
<p>Node</p>
232-
<p>MongoDB</p>
233-
<p>Mongoose</p>
234-
<p>Express</p>
235-
</div>
236-
<div class="col-md-6">
237-
<p>RESTful API</p>
238-
<p>Firebase</p>
239-
<p>Heroku</p>
240-
</div>
241-
242-
</div>
243-
</div>
244-
245-
</div>
246-
247-
<div class="col-sm-4 col-md-4 team boxed-grey">
248-
249-
<div class="service-box">
250-
<div class="service-icon">
251-
<i class="fa fa-rocket fa-3x"></i>
252-
</div>
253-
<div class="service-desc">
254-
<h5>Other</h5>
255-
<div class="col-md-6">
256-
<p>Git</p>
257-
<p>Mocha/Chai</p>
258-
<p>Ionic</p>
259-
<p>Lodash/Underscore</p>
260-
</div>
261-
<div class="col-md-6">
262-
<p>TDD</p>
263-
<p>SCRUM</p>
264-
<p>Wireframing</p>
265-
<p>Photoshop</p>
266-
</div>
267-
</div>
268-
</div>
269-
270-
</div> -->
271-
272196
</section>
273197

274198
<section id="works" class="home-section text-center bg-gray">
@@ -285,13 +209,13 @@ <h2>Projects</h2>
285209
</div>
286210
<div class="row">
287211
<div class="col-xs-6 col-sm-3 col-md-3">
288-
<a href="http://mpliang.github.io/WeatherApp/">
212+
<a href="http://mpliang.github.io/React-Weather/">
289213
<div class="team boxed-grey">
290214
<div class="inner">
291215
<h5>Weather Forecast</h5>
292216
<div class="avatar">
293217
<img src="http://www.kriesi.at/themes/sentence/files/2012/03/blue-sky-with-white-clouds.jpg" alt="" class="img-responsive" />
294-
<p class="subtitle">jQuery / RESTful API</p>
218+
<p class="subtitle">React / Flux / jQuery / RESTful API</p>
295219
</div>
296220
</div>
297221
</div>
@@ -341,57 +265,6 @@ <h5>Project 4</h5>
341265
</div>
342266
</section>
343267

344-
<!-- <div class="container">
345-
346-
<div class="row">
347-
<div class="col-xs-6 col-sm-3 col-md-3">
348-
<a href="http://mpliang.github.io/WeatherApp/">
349-
350-
<div class="team boxed-grey">
351-
<div class="inner">
352-
<h5>Weather Forecast</h5>
353-
<p class="subtitle">jQuery</p>
354-
<div class="avatar"><img src="http://www.kriesi.at/themes/sentence/files/2012/03/blue-sky-with-white-clouds.jpg" alt="" class="img-responsive" /></div>
355-
</div>
356-
</div>
357-
</a>
358-
</div>
359-
<div class="col-xs-6 col-sm-3 col-md-3">
360-
<div class="team boxed-grey">
361-
<div class="inner">
362-
<h5>Pokemon Shelter</h5>
363-
<p class="subtitle">Full Stack</p>
364-
<div class="avatar"><img src="" alt="" class="img-responsive" /></div>
365-
</div>
366-
367-
</div>
368-
</div>
369-
<div class="col-xs-6 col-sm-3 col-md-3">
370-
371-
<div class="team boxed-grey">
372-
<div class="inner">
373-
<h5>Project 3</h5>
374-
<p class="subtitle">ReactJS</p>
375-
<div class="avatar"><img src="" alt="" class="img-responsive" /></div>
376-
</div>
377-
</div>
378-
379-
</div>
380-
<div class="col-xs-6 col-sm-3 col-md-3">
381-
382-
<div class="team boxed-grey">
383-
<div class="inner">
384-
<h5>Project 4</h5>
385-
386-
<p class="subtitle">Angular</p>
387-
<div class="avatar"><img src="" alt="" class="img-responsive" /></div>
388-
</div>
389-
</div>
390-
391-
</div>
392-
</div>
393-
</div>
394-
</section> -->
395268
<!-- /Section: about -->
396269

397270

@@ -415,11 +288,6 @@ <h2>Get in touch</h2>
415288
</div>
416289
</div>
417290

418-
419-
420-
<!-- Modal -->
421-
422-
<!-- Modal -->
423291
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
424292
<div class="modal-dialog" role="document">
425293
<div class="modal-content">
@@ -433,15 +301,9 @@ <h2>Get in touch</h2>
433301
</div>
434302
</div>
435303

436-
437-
438-
439-
440-
441-
442-
<!-- <div class="col-lg-8 col-md-offset-2">
443-
<div class="boxed-grey"> -->
444-
<!-- <form id="contact-form" action="MAILTO:[email protected]" method="post">
304+
<div class="col-lg-8 col-md-offset-2">
305+
<!-- <div class="boxed-grey">
306+
<form id="contact-form" action="MAILTO:[email protected]" method="post">
445307
<div class="row">
446308
<div class="col-md-6">
447309
<div class="form-group">
@@ -482,22 +344,9 @@ <h2>Get in touch</h2>
482344
Send Message</button>
483345
</div>
484346
</div>
485-
</form> -->
486-
<!-- </div>
347+
</form>
487348
</div> -->
488349

489-
<div class="widget-contact row">
490-
<div class="col-lg-6">
491-
<address>
492-
<!--<strong>Ninestars Ltd.</strong><br>
493-
Big Villa 334 Awesome, Beautiful Suite 1200<br>
494-
San Francisco, CA 94107<br>
495-
<abbr title="Phone">P:</abbr> (123) 456-7890 -->
496-
</address>
497-
</div>
498-
</div>
499-
</div>
500-
501350
</div>
502351

503352
</div>
@@ -509,8 +358,13 @@ <h2>Get in touch</h2>
509358
<div class="row">
510359
<div class="col-md-12 col-lg-12">
511360

361+
<p><strong>Michael Liang</strong></p>
362+
<address>
363+
46684 Windmill Dr.<br>
364+
Fremont, CA 94539<br>
365+
<abbr title="Phone">P:</abbr> (262) 716-3720
366+
</address>
512367
<p>Copyright &copy; 2015</p>
513-
<p>Michael Liang</p>
514368
</div>
515369
</div>
516370
</div>

‎main.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +0,0 @@
1-
// ( function( $ ) {
2-
// // Init Skrollr
3-
// var s = skrollr.init({
4-
// render: function(data) {
5-
// //Debugging - Log the current scroll position.
6-
// //console.log(data.curTop);
7-
// }
8-
// });
9-
// } )( jQuery );

0 commit comments

Comments
 (0)