Skip to content

Commit 2b2e773

Browse files
committed
Merge pull request #7 from plantvsbirds/master
img dragging fix; some change to portfolio section; rm wangyu.fb
2 parents 3b8f5ec + eef7dcf commit 2b2e773

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

_config.yml

-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ people:
4646
url: mailto:[email protected]
4747
- title: github
4848
url: https://github.com/yuwang17
49-
- title: facebook
50-
url: https://www.facebook.com/profile.php?id=100007201530170
5149
- title: linkedin
5250
url: https://www.linkedin.com/in/wangyu2165
5351

_includes/css/agency.css

+5-1
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,10 @@ section h3.section-subheading {
367367
-webkit-transition: all ease .5s;
368368
-moz-transition: all ease .5s;
369369
transition: all ease .5s;
370-
background: rgba(254,209,54,.9); /* Fallback when no plugin support */
370+
background: rgba(254,209,54,.9);
371+
/*
371372
background: rgba({{ site.color.primary | hex_to_rgb | join: ',' }}, .9);
373+
*/
372374
}
373375

374376
#portfolio .portfolio-item .portfolio-link .portfolio-hover:hover {
@@ -516,6 +518,7 @@ section h3.section-subheading {
516518
text-align: center;
517519
color: #fff;
518520
background-color: #{{ site.color.primary }};
521+
pointer-events: none;
519522
}
520523

521524
.timeline>li .timeline-image h4 {
@@ -657,6 +660,7 @@ section h3.section-subheading {
657660
.team-member img {
658661
margin: 0 auto;
659662
border: 8px solid #f7f7f7;
663+
pointer-events: none;
660664
}
661665

662666
.team-member h4 {

_includes/modals.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h2>{{ post.title }}</h2>
2828
</strong>
2929
</li>
3030
</ul>
31-
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
31+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
3232
</div>
3333
</div>
3434
</div>

_includes/portfolio_grid.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ <h3 class="section-subheading text-muted">Our past and ongoing projects.</h3>
1010
<div class="row">
1111
{% for post in site.posts %}
1212
<div class="col-md-3 col-sm-6 portfolio-item">
13-
{% if post.github != null %}
13+
{% if post.github %}
1414
<!-- Optional "Fork me on GitHub" badge -->
1515
<div class="portfolio-link portfolio-github-badge">
1616
<div class="github-fork-ribbon-wrapper right">
@@ -23,7 +23,7 @@ <h3 class="section-subheading text-muted">Our past and ongoing projects.</h3>
2323
<a href="#portfolioModal{{ post.modal-id }}" class="portfolio-link" data-toggle="modal">
2424
<div class="portfolio-hover">
2525
<div class="portfolio-hover-content">
26-
<i class="fa fa-star fa-3x"></i>
26+
<i class="fa fa-info fa-3x"></i>
2727
</div>
2828
</div>
2929
<img src="img/portfolio/{{ post.thumbnail }}" class="img-responsive" alt="">

0 commit comments

Comments
 (0)