personal website

Commit 1d1c7d6a

1d1c7d6a7b10Merged

Justin Dorfman <[email protected]> · 10 years ago · 1 file · ~1 modified

Description

Fixed merge conflict

Details

Commit
1d1c7d6a7b10
Parent
8715bcb26015

public/2016/index.source.htmlmodifiedView file

@@ -13,7 +13,7 @@
1313 <meta name="author" content="Justin Dorfman">
1414 <link rel="shortcut icon" href="favicon.ico">
1515 <!-- Remove Montserrat-->
16- <link href='https://fonts.googleapis.com/css?family=Montserrat:400,700' rel='stylesheet' type='text/css'>
16+ <link href='http://fonts.googleapis.com/css?family=Montserrat:400,700' rel='stylesheet' type='text/css'>
1717 <!-- Global CSS -->
1818 <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
1919 <!-- Plugins CSS -->
@@ -69,7 +69,7 @@
6969 </div><!--//section-inner-->
7070 </section><!--//section-->
7171
72- <section class="latest section">
72+ <!-- <section class="latest section">
7373 <div class="section-inner">
7474 <h2 class="heading">Future Talks</h2>
7575 <div class="content">
@@ -86,12 +86,12 @@
8686
8787 <div class="desc text-left">
8888 <p>Open Source isn’t just a commit, a patch or a pull request. It is about bringing people together of all different skill sets, from different backgrounds, different genders and solving issues as one.</p>
89- </div><!--//desc-->
89+ </div>
9090 <a class="btn btn-cta-secondary" href="https://allthingsopen.org/talk/open-source-is-people/" target="_blank" rel="noopener noreferrer"> Register Now</a>
91- </div><!--//item-->
92- </div><!--//content-->
93- </div><!--//section-inner-->
94- </section><!--//section-->
91+ </div>
92+ </div>
93+ </div>
94+ </section> -->
9595 <a name="pasttalks" />
9696 <section class="latest section">
9797 <div class="section-inner">
@@ -101,6 +101,17 @@
101101 <hr class="divider" />
102102
103103 <div class="item row">
104+ <a class="col-md-4 col-sm-4 col-xs-12" href="https://allthingsopen.org/talk/open-source-is-people/" target="_blank" rel="noopener noreferrer">
105+ <img class="img-responsive project-image" src="assets/images/past-talks_ato-2016.jpg" alt="All Things Open 2016" />
106+ </a>
107+ <div class="desc col-md-8 col-sm-8 col-xs-12">
108+ <h3 class="title"><a href="https://allthingsopen.org/talk/open-source-is-people/" target="_blank" rel="noopener noreferrer">All Thing Open 2016 - Raleigh, North Carolina</a></h3>
109+ <p>A conference exploring open source, open tech, and the open web in the enterprise</p>
110+ <p><a class="more-link" href="https://allthingsopen.org/talk/open-source-is-people/" target="_blank" rel="noopener noreferrer"><i class="fa fa-external-link"></i> Find out more</a></p>
111+ </div><!--//desc-->
112+ </div><!--//item-->
113+
114+ <div class="item row">
104115 <a class="col-md-4 col-sm-4 col-xs-12" href="http://opensourcebridge.org/sessions/1695" target="_blank" rel="noopener noreferrer">
105116 <img class="img-responsive project-image" src="assets/images/past-talks_os-bridge-2016.jpg" alt="Open Source Bridge 2016" />
106117 </a>
@@ -228,7 +239,7 @@
228239 <footer class="footer">
229240 <div class="container text-center">
230241 <!--/* This template is released under the Creative Commons Attribution 3.0 License. Please keep the attribution link below when using for your own project. Thank you for your support. :) If you'd like to use the template without the attribution, you can check out other license options via our website: themes.3rdwavemedia.com */-->
231- <small class="copyright">v3.2.0-alpha | © 1985 - 2016<br />Designed with <i class="fa fa-heart"></i> by <a href="http://themes.3rdwavemedia.com" target="_blank" rel="noopener noreferrer">Xiaoying Riley</a> for developers</small>
242+ <small class="copyright">v3.2.0-alpha.1 | © 1985 - 2016<br />Designed with <i class="fa fa-heart"></i> by <a href="http://themes.3rdwavemedia.com" target="_blank" rel="noopener noreferrer">Xiaoying Riley</a> for developers</small>
232243 </div><!--//container-->
233244 </footer><!--//footer-->
234245
@@ -244,8 +255,6 @@
244255 <!-- <script src="https://cdn.jsdelivr.net/mustache.js/0.7.2/mustache.js" integrity="sha256-l9JyahnZYUjrrJBs1mt+KUm701RTKuivyTdRTpQP64o=" crossorigin="anonymous"></script> -->
245256 <!-- <script type="text/javascript" src="assets/plugins/github-activity/src/github-activity.js"></script> -->
246257 <!-- custom js -->
247- <!-- <script type="text/javascript" src="assets/js/main.min.js"></script> -->
248- <script>!function(e,t,a,n,c,s,o){e.GoogleAnalyticsObject=c,e[c]=e[c]||function(){(e[c].q=e[c].q||[]).push(arguments)},e[c].l=1*new Date,s=t.createElement(a),o=t.getElementsByTagName(a)[0],s.async=1,s.src=n,o.parentNode.insertBefore(s,o)}(window,document,"script","https://www.google-analytics.com/analytics.js","ga"),ga("create","UA-273847-13","auto"),ga("send","pageview");</script>
249- <script>function _gaLt(t){if(ga.hasOwnProperty("loaded")&&1==ga.loaded){for(var e=t.srcElement||t.target;e&&("undefined"==typeof e.tagName||"a"!=e.tagName.toLowerCase()||!e.href);)e=e.parentNode;if(e&&e.href){var a=e.href;if(-1==a.indexOf(location.host)&&!a.match(/^javascript\:/i)){var n=(e.target&&!e.target.match(/^_(self|parent|top)$/i)?e.target:!1,!1),o=function(){n||(n=!0,window.location.href=a)};e.target&&!e.target.match(/^_(self|parent|top)$/i)?ga("send","event","Outgoing Links",a,document.location.pathname+document.location.search):(ga("send","event","Outgoing Links",a,document.location.pathname+document.location.search,{hitCallback:o}),setTimeout(o,1e3),t.preventDefault?t.preventDefault():t.returnValue=!1)}}}}var w=window;w.addEventListener?w.addEventListener("load",function(){document.body.addEventListener("click",_gaLt,!1)},!1):w.attachEvent&&w.attachEvent("onload",function(){document.body.attachEvent("onclick",_gaLt)});</script>
258+ <script type="text/javascript" src="assets/js/main.min.js"></script>
250259 </body>
251260 </html>