Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Bootstrap, modernize markup #8

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade Bootstrap, modernize markup #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
299cacd
Separate column contents from column definitions
sch Oct 12, 2014
d774958
Update Bootstrap to 3.2, markup to match
sch Oct 12, 2014
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
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"mustache": "~0.7.2",
"flight-components": "0.1.1",
"underscore-amd": "~1.5.0",
"bootstrap": "~3.0.0",
"bootstrap": "~3.2.0",
"moment": "~2.1.0"
},
"devDependencies": {
Expand Down
16 changes: 9 additions & 7 deletions public/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,22 @@
========================================================================== */

.site-header {
margin: 2.5em -1.25em;
border-radius: 4px;
padding: 1em;
vertical-align: center;
margin: 40px 0;
}

.site-title {
margin: 0;
display: inline-block;
vertical-align: bottom;
margin: 0 0 0 0.2em;
font-size: 5em;
font-weight: normal;
line-height: 75px;
}

.site-tagline {
margin: 0;
margin-top: 40px;
font-size: 1.75em;
font-weight: normal;
line-height: 75px;
}

.site-main img {
Expand Down Expand Up @@ -69,3 +67,7 @@
#footer {
margin-bottom:10px;
}

.u-overflowRegion {
overflow: auto;
}
67 changes: 38 additions & 29 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@

<div class="site-header" role="banner">
<div class="row">
<div class="col-lg-1">
<div class="col-sm-6">
<img src="img/flight-logo.png" width="75" height="75" alt="Twitter logo">
</div>
<div class="col-lg-2">
<h1 class="site-title">Flight</h1>
</div>
<div class="pull-right">
<h2 class="site-tagline">Discover <a href='http://flightjs.github.io/'>Flight</a> components.</h2>
<div class="col-sm-6">
<h2 class="site-tagline text-right">Discover <a href='http://flightjs.github.io/'>Flight</a> components.</h2>
</div>
</div>
<hr/>
Expand All @@ -37,37 +35,48 @@ <h2 class="site-tagline">Discover <a href='http://flightjs.github.io/'>Flight</a

<div class='components-wrapper'>
<div class="row">
<ul id='top-forks' class='top-list col-lg-4 nav nav-pills nav-stacked'>
<li class='header'>Most forked</li>
</ul>
<ul id='top-stars' class='top-list col-lg-4 nav nav-pills nav-stacked'>
<li class='header'>Most starred</li>
</ul>
<ul id='recently-created' class='top-list col-lg-4 nav nav-pills nav-stacked'>
<li class='header'>Recently created</li>
</ul>
<div class="col-md-4">
<div id='top-forks' class='top-list list-group active'>
<div class='list-group-item header'>Most forked</div>
</div>
</div>
<div class="col-md-4">
<ul id='top-stars' class='top-list list-group active'>
<li class='list-group-item header'>Most starred</li>
</ul>
</div>
<div class="col-md-4">
<ul id='recently-created' class='top-list list-group active'>
<li class='list-group-item header'>Recently created</li>
</ul>
</div>
</div>

<div class="main-section row">
<div class="col-lg-4 col-lg-offset-4">
<input type='text' id='filter' class='form-control input-md' placeholder='Search for Flight components' />
<div class="main-section">
<div class="row">
<div class="col-md-4 col-md-offset-4 form-group">
<input type='text' id='filter' class='form-control input-md' placeholder='Search for Flight components' />
</div>
</div>

<div class="u-overflowRegion">
<table id="components" class="table table-hover">
<thead>
<tr>
<th> Name </th>
<th> Description </th>
<th> Owner </th>
<th> Forks </th>
<th> Stars </th>
</tr>
</thead>
</table>
</div>
<table id="components" class="table table-hover">
<thead>
<tr>
<th> Name </th>
<th> Description </th>
<th> Owner </th>
<th> Forks </th>
<th> Stars </th>
</tr>
</thead>
</table>
</div>
</div>

<div id='footer'>
This list is automatically generated from the <a href='http://sindresorhus.com/bower-components/'>Bower</a> components list. Components must be prefixed with <strong>"flight-"</strong> in order to be visible.
<p class="text-muted text-center">This list is automatically generated from the <a href='http://sindresorhus.com/bower-components/'>Bower</a> components list. Components must be prefixed with <strong>"flight-"</strong> in order to be visible.</p>
</div>
</div>

Expand Down
11 changes: 7 additions & 4 deletions public/js/component/ui_top_components_list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,14 @@ define(function (require) {


this.htmlFor = function (component) {
var template = [
'<a class="list-group-item" href="{{website}}">',
'<span class="badge">{{stat}}</span>',
'{{name}}',
'</a>'
].join('\n');
component.stat = this.attr.displayFunction(component[this.attr.compare]);
return Mustache.render(
"<li><a href='{{website}}'>{{name}}" +
"<span class='stat'>{{stat}}</span></a></li>"
, component);
return Mustache.render(template, component);
};
this.displayTopList = function (ev, data) {
data.components.forEach(function (component) {
Expand Down