Skip to content
This repository has been archived by the owner on Jan 15, 2021. It is now read-only.

Updated homepage with dynamic contributors #31

Merged
merged 7 commits into from
Feb 7, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions source/Glimpse.Site/App_Start/BundleConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public static void RegisterBundles(BundleCollection bundles)
"~/Scripts/site.google.js",
"~/Content/_v2/website-assets/scripts/jquery.scrollTo.js",
"~/Content/_v2/website-assets/scripts/jquery.tipsy.js",
"~/Scripts/mustache.js",
"~/Content/_v2/website-assets/scripts/global.js",
"~/Content/_v2/website-assets/scripts/home.js"
));
Expand Down
1,718 changes: 1,561 additions & 157 deletions source/Glimpse.Site/Content/_v2/website-assets/css/global.css

Large diffs are not rendered by default.

54 changes: 50 additions & 4 deletions source/Glimpse.Site/Content/_v2/website-assets/css/global.less
Original file line number Diff line number Diff line change
Expand Up @@ -386,13 +386,58 @@ hr.clearer {
}
&#contributors {
background: @darkColor;
min-height:415px;
padding: 40px 0;
text-align: left;
h1 {text-align:left; color:#fff;}

img.waiting {
display:block;
height:120px;
left:50%;
margin:-60px auto 0 -60px;
position:absolute;
-o-transition: opacity 2s ease-in-out;
-moz-transition: opacity 2s ease-in-out;
-webkit-transition: opacity 2s ease-in-out;
transition: opacity 2s ease-in-out;
top:50%;
width:120px;
}

section {
opacity:0;
-o-transition:opacity 2s ease-in-out;
-moz-transition:opacity 2s ease-in-out;
-webkit-transition:opacity 2s ease-in-out;
transition:opacity 2s ease-in-out;
}
}
&#contributors.loaded {
background-color: @darkColor;
background-image:none;
color: #FFF;
text-align: left;

img.waiting {
opacity:0;
}

section {
opacity:1;
}

h1 {
color:#fff;
text-align:left;
}

#people {

}
ul {
list-style:none;
margin:0;
overflow:hidden;
padding:0;
}
.person-container {
-webkit-perspective:1000;
Expand Down Expand Up @@ -491,10 +536,11 @@ hr.clearer {
display: block;
padding: 5px 0;
.icon {
display: inline-block;
background: transparent @sprite left top no-repeat;
float:left;
margin-right:3px;
width: 22px;

background: transparent @sprite left top no-repeat;

&.small-twitter {
background-position: 0 -289px;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions source/Glimpse.Site/Content/_v2/website-assets/scripts/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,23 @@ function loadInlineVideo() {
$('.inner-monitor').empty().append(inlineVideoHTML);
}

function loadContributors() {
$.getJSON('/api/contributors', function (data) {
var tmpl = $('#contrib-tmpl').html(),
contribElem = $('#contributors');

contribElem
.addClass('loaded')
.find('section')
.html(Mustache.render(tmpl, { people: data }));
});
}


$().ready(function () {
//prep the page

loadContributors();

$('.hover-point').each(function() {
//console.log($(this).attr('data-tipsy'));
Expand Down
4 changes: 2 additions & 2 deletions source/Glimpse.Site/Glimpse.Site.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@
<Content Include="Content\_v2\website-assets\scripts\jquery.scrollTo.js" />
<Content Include="Content\_v2\website-assets\scripts\jquery.scrollTo.min.js" />
<Content Include="Content\_v2\website-assets\scripts\jquery.tipsy.js" />
<Content Include="Scripts\mustache.js" />
<Content Include="Views\Support\Index.cshtml" />
<Content Include="Views\Talk\Index.cshtml" />
<Content Include="Views\Protocol\Index.cshtml" />
Expand Down Expand Up @@ -476,7 +477,6 @@
<Content Include="Views\Home\_Contributors.cshtml" />
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="Areas\api\Models\" />
<Folder Include="Areas\api\Views\Shared\" />
<Folder Include="Areas\Version\Models\" />
Expand Down Expand Up @@ -549,4 +549,4 @@ attrib -r Glimpse.mdf
</Target>
<Target Name="AfterBuild">
</Target> -->
</Project>
</Project>
Loading