Skip to content

Commit

Permalink
Merge pull request #48 from Randgalt/master
Browse files Browse the repository at this point in the history
Support for blogs
  • Loading branch information
Randgalt committed Mar 7, 2013
2 parents 007cf68 + acbee96 commit 6ab0f70
Show file tree
Hide file tree
Showing 6 changed files with 374 additions and 218 deletions.
39 changes: 39 additions & 0 deletions blogs/meetup-2.html
@@ -0,0 +1,39 @@
<h1>
NetflixOSS Meetup - Season 1, Episode 2
</h1>

<p>
The second NetflixOSS Meetup. Stay up to date with the latest projects, and be the first to hear exciting announcements!
See the <a href="http://www.meetup.com/Netflix-Open-Source-Platform/events/102517072/">meetup page</a> for complete details.
</p>

<p>
Netflix has Open Sourced many components of our infrastructure over the last year - ranging from our deployment console Asgard and
Simian Army Monkeys, to the Cassandra and Zookeeper clients that we use internally. You can find all of our Open Source projects at
<a href="http://netflix.github.com">our Github site</a>.
</p>

<p>
The components can be used separately, but we use them as an integrated platform to support the Netflix web site and services.
We have several missing pieces that we plan to release over the coming months that will fill out the platform functionality.
</p>

<p>
So far we’ve had great interest and involvement from the open source community, and would like to extend an invitation to our
NetflixOSS Meetup. At this event you can meet the authors of the components and deep-dive into technology and architectural choices.
We’ll show how all the components fit together, and share some details on what’s coming next on our Open Source Platform roadmap.
</p>

<p>
You can also follow <a href="http://www.twitter.com/NetflixOSS">@NetflixOSS</a> on Twitter for announcements, and
join our <a href="http://www.meetup.com/Netflix-Open-Source-Platform/">Meetup Group</a> or our
<a href="http://www.linkedin.com/groups/NetflixOSS-4788745?gid=4788745&trk=hb_side_g">LinkedIn Community</a> to discuss NetflixOSS with us.
</p>

<p>
<strong>Event schedule: Wednesday, March 13th</strong><br><br>

6:30pm - 7:00pm - Refreshments/snacks<br><br>

7:00pm - 9:00pm - Updates, announcements and meet the NetflixOSS developers
</p>
25 changes: 25 additions & 0 deletions css/blog.css
@@ -0,0 +1,25 @@
#blog-content
{
margin: 10px;
padding: 10px;
background-color: white;
box-shadow: 2px 2px 2px #000;
}

#blog-content h1
{
font-weight: bold;
color: #b9090b;
font-size: 21px;
margin-bottom: 18px;
}

#blog-content h2
{
margin-bottom: 5px;
}

#blog-content p
{
margin-bottom: 5px;
}
108 changes: 61 additions & 47 deletions css/style.css
Expand Up @@ -33,19 +33,63 @@ td a:hover
{ {
overflow: auto; overflow: auto;
position: absolute; position: absolute;
width: 100%; width: 99%;
top: 100px; top: 100px;
bottom: 0; bottom: 0;
} }


.header .header
{ {
position: relative;
background-color: #b9090b; background-color: #b9090b;
width: 100%; width: 99%;
height: 60px; height: 60px;
} }


.header-logo
{
padding-top: 12px;
padding-left: 12px;
height: 60px;
width: 100%;
}

.header-text
{
position: relative;
text-align: center;
top: -35px;
font-size: 200%;
color: white;
font-weight: bold;
text-shadow: 2px 2px #000;
}

#sub-header
{
background-color: #6B6765;
width: 99%;
height: 28px;
overflow: hidden;
}

.sub-header-item
{
float: left;
border-right: 1px solid #E1E1E1;
border-left: 1px solid #6B6765;
border-bottom: 1px solid #6B6765;
color: white;
height: 16px;
padding: 5px 20px 5px 20px;
}

#sub-header a:hover .sub-header-item
{
background-color: #E1E1E1;
border-top: 1px solid #6B6765;
color: #b9090b;
}

#repo-hero #repo-hero
{ {
text-align: center; text-align: center;
Expand All @@ -66,25 +110,6 @@ td a:hover
display: none; display: none;
} }


.header-logo
{
padding-top: 12px;
padding-left: 12px;
height: 60px;
width: 100%;
}

.header-text
{
position: relative;
text-align: center;
top: -35px;
font-size: 200%;
color: white;
font-weight: bold;
text-shadow: 2px 2px #000;
}

.repo-item-button .repo-item-button
{ {
z-index: 20; z-index: 20;
Expand Down Expand Up @@ -226,31 +251,6 @@ td a:hover
padding: 0; padding: 0;
} }


#sub-header
{
background-color: #6B6765;
height: 28px;
overflow: hidden;
}

.sub-header-item
{
float: left;
border-right: 1px solid #E1E1E1;
border-left: 1px solid #6B6765;
border-bottom: 1px solid #6B6765;
color: white;
height: 16px;
padding: 5px 20px 5px 20px;
}

#sub-header a:hover .sub-header-item
{
background-color: #E1E1E1;
border-top: 1px solid #6B6765;
color: #b9090b;
}

#tab-content-lists #tab-content-lists
{ {
display: none; display: none;
Expand All @@ -266,6 +266,20 @@ td a:hover
height: 81%; height: 81%;
} }


.section-heading
{
font-size: 21px;
font-weight: bold;
margin: 20px 0px 20px 10px;
}

.section-sub-heading
{
font-size: 17px;
font-weight: bold;
margin: 20px 0px 20px 10px;
}

#lists-content #lists-content
{ {
width: 600px; width: 600px;
Expand Down
30 changes: 21 additions & 9 deletions index.html
Expand Up @@ -10,8 +10,9 @@
<script type="text/javascript" src="js/jquery.dateFormat-1.0.js"></script> <script type="text/javascript" src="js/jquery.dateFormat-1.0.js"></script>
<script type="text/javascript" src="http://d3js.org/d3.v2.min.js"></script> <script type="text/javascript" src="http://d3js.org/d3.v2.min.js"></script>


<link rel="stylesheet" type="text/css" href="css/style.css?v=201303062240"> <link rel="stylesheet" type="text/css" href="css/style.css?v=201303071100">
<link rel="stylesheet" type="text/css" href="css/commits.css?v=201303062240"> <link rel="stylesheet" type="text/css" href="css/blog.css?v=201303071100">
<link rel="stylesheet" type="text/css" href="css/commits.css?v=201303071100">
<!--[if IE]> <!--[if IE]>
<style> <style>
.repo-item-cover, .repo-item-shadow, .repo-item-button .repo-item-cover, .repo-item-shadow, .repo-item-button
Expand Down Expand Up @@ -39,7 +40,8 @@
} }
</script> </script>
<script type="text/javascript" src="http://githubproxy-942908148.us-east-1.elb.amazonaws.com/REST/v2/consolidated?jsonp=repos"></script> <script type="text/javascript" src="http://githubproxy-942908148.us-east-1.elb.amazonaws.com/REST/v2/consolidated?jsonp=repos"></script>
<script type="text/javascript" src="js/nf.js?v=201303062240"></script> <script type="text/javascript" src="js/models.js?v=201303071100"></script>
<script type="text/javascript" src="js/nf.js?v=201303071100"></script>
</head> </head>


<body> <body>
Expand Down Expand Up @@ -71,11 +73,11 @@
</div> </div>


<div id="tab-content-timeline"> <div id="tab-content-timeline">
<div class="title">Netflix OSS GitHub Repositories</div> <div class="section-heading">Netflix OSS GitHub Repositories</div>
<div id="commits" orgName="Netflix" top-bottom-padding="380" left-right-padding="40" right-margin="50"></div> <div id="commits" orgName="Netflix" top-bottom-padding="380" left-right-padding="40" right-margin="50"></div>
<div class="help">Scroll to expand or compress the timelines, drag to shift the timelines earlier or later, and mouse over a timeline to see the committers's names and commit messages.</div> <div class="help">Scroll to expand or compress the timelines, drag to shift the timelines earlier or later, and mouse over a timeline to see the committers's names and commit messages.</div>
<script type="text/javascript" src="http://javaposseroundup.github.com/d3github/commitsbase.js"></script> <script type="text/javascript" src="http://javaposseroundup.github.com/d3github/commitsbase.js"></script>
<script type="text/javascript" src="js/commits.js?v=201303062240"></script> <script type="text/javascript" src="js/commits.js?v=201303071100"></script>
</div> </div>


<div id="tab-content-lists"> <div id="tab-content-lists">
Expand All @@ -98,27 +100,38 @@
</div> </div>


<div id="tab-content-community"> <div id="tab-content-community">
<div class="title">Netflix OSS is popular! Here are some outside projects that utilize Netflix OSS:</div> <div class="section-heading">Netflix OSS is popular! Here are some outside projects that utilize Netflix OSS:</div>


<div id="community-table-content" class="display-table-content"> <div id="community-table-content" class="display-table-content">
</div> </div>
</div> </div>


<div id="tab-content-powered-by"> <div id="tab-content-powered-by">
<div class="content-padding-light"> <div class="content-padding-light">
<div class="title">These companies are using Netflix OSS Components</div> <div class="section-heading">These companies are using Netflix OSS Components</div>
<div id="content-powered-by"> <div id="content-powered-by">
</div> </div>
</div> </div>
</div> </div>


<div id="tab-content-web"> <div id="tab-content-web">
<div class="title">Articles and blogs about Netflix OSS</div> <div class="section-heading">Articles and blogs about Netflix OSS</div>


<div id="web-table-content" class="display-table-content"> <div id="web-table-content" class="display-table-content">
</div> </div>
</div> </div>


<div id="tab-content-blog">
<div class="section-heading">The Netflix OSS Blog</div>

<div id="blog-content">
</div>

<div class="section-sub-heading">All Blogs</div>
<div id="blog-table-content" class="display-table-content">
</div>
</div>

<div id="info-box"> <div id="info-box">
<div id="info-box-content"> <div id="info-box-content">
<div class="info-box-content-item-header"> <div class="info-box-content-item-header">
Expand All @@ -143,7 +156,6 @@
<div class="info-box-content-item"> <div class="info-box-content-item">
<div class="info-box-content-item-line"><a href="http://netflix.github.com/">Netflix Open Source</a></div> <div class="info-box-content-item-line"><a href="http://netflix.github.com/">Netflix Open Source</a></div>
<div class="info-box-content-item-line"><a href="https://github.com/Netflix/">Netflix GitHub</a></div> <div class="info-box-content-item-line"><a href="https://github.com/Netflix/">Netflix GitHub</a></div>
<div class="info-box-content-item-line"><a href="#" onClick="showListContent(); return false;">Mailing Lists</a></div>
<div class="info-box-content-item-line">Get in on the fun: <a href="http://www.netflix.com/jobs">Join Us!</a></div> <div class="info-box-content-item-line">Get in on the fun: <a href="http://www.netflix.com/jobs">Join Us!</a></div>
</div> </div>


Expand Down

0 comments on commit 6ab0f70

Please sign in to comment.