Permalink
Browse files

Cleanup

  • Loading branch information...
1 parent 41f1a85 commit e76dffbbf351795f6c2e72ef722301857c6cc34e @dstroot committed Mar 7, 2014
View
@@ -57,7 +57,7 @@ module.exports.controller = function(app) {
async.parallel({
artistInfo: function(done) {
lastfm.request('artist.getInfo', {
- artist: 'Epica',
+ artist: 'Morcheeba',
handlers: {
success: function(data) {
done(null, data);
@@ -70,7 +70,7 @@ module.exports.controller = function(app) {
},
artistTopAlbums: function(done) {
lastfm.request('artist.getTopAlbums', {
- artist: 'Epica',
+ artist: 'Morcheeba',
handlers: {
success: function(data) {
var albums = [];
View
@@ -1,8 +1,8 @@
@import "bootstrap.less";
@import "../public/lib/bootstrap-social/bootstrap-social.less";
@import "../public/lib/font-awesome/less/font-awesome.less";
-// @import (less) "../lib/animate.css/animate.css";
@fa-font-path: "../lib/font-awesome/fonts";
+// @import (less) "../lib/animate.css/animate.css";
/**
* First, import base frameworks:
@@ -173,12 +173,12 @@
// NOT have a 200 weight, so we will substitute a 300 weight and skip the italic
// version. In the Head section include the font stylesheet:
//
-// <link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,300,400,700', rel='stylesheet'>
+// <link href='http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,300,400,500,700', rel='stylesheet'>
// 2) Override the the "@font-family-sans-serif" variable from variables.less:
// @font-family-sans-serif: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-// 3) Override Jumbotron paragraph and page .lead:
+// 3) Override Jumbotron paragraph and page .lead if you don't have a 200 weight:
// .lead {
// font-weight: 300;
// }
@@ -192,7 +192,6 @@
// Boom! Done.
@font-family-sans-serif: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-@font-size-base: 14px;
/**
* Scaffolding
@@ -210,6 +209,7 @@ body {
margin-bottom: 80px;
}
+/* thin style for large headers */
h1, h2 {
font-weight: 300;
}
@@ -240,6 +240,7 @@ h1, h2 {
* Flash Alerts
*/
+/* remove rounded border */
@alert-border-radius: 0px;
.alert {
@@ -257,7 +258,6 @@ h1, h2 {
.jumbotron {
margin-bottom: 0px;
h1 {
- font-weight: 300;
text-align: center;
margin-top: 0px;
margin-bottom: 10px;
@@ -273,7 +273,6 @@ h1, h2 {
margin-bottom: 50px;
}
h2 {
- font-weight: 300;
text-align: center;
margin-top: 50px;
font-size: 40px;
@@ -353,7 +352,6 @@ h1, h2 {
padding: 30px 15px;
text-align: center;
h1 {
- font-weight: 300;
margin-top: 0;
}
p {
@@ -369,7 +367,7 @@ h1, h2 {
font-size: 45px;
}
p {
- font-size: 22px;
+ font-size: 18px;
}
}
}
@@ -448,7 +446,7 @@ h1, h2 {
* Panel Headers Like Buttons
*/
-.panel-heading:hover {
+.panel-button:hover {
background: darken(#f5f5f5, 15%);
}
a.noDecoration {
View
@@ -1,6 +1,6 @@
{
"private": true,
- "version": "0.0.2-5",
+ "version": "0.0.2-6",
"name": "Skeleton",
"company": "Skeleton, Inc.",
"subdomain": "skeleton-app",
View
@@ -6013,6 +6013,7 @@ body {
/* Sticky Footer: margin bottom = footer height */
margin-bottom: 80px;
}
+/* thin style for large headers */
h1,
h2 {
font-weight: 300;
@@ -6037,6 +6038,7 @@ h2 {
/**
* Flash Alerts
*/
+/* remove rounded border */
.alert {
margin-bottom: 0px;
text-align: center;
@@ -6048,7 +6050,6 @@ h2 {
margin-bottom: 0px;
}
.jumbotron h1 {
- font-weight: 300;
text-align: center;
margin-top: 0px;
margin-bottom: 10px;
@@ -6064,7 +6065,6 @@ h2 {
margin-bottom: 50px;
}
.jumbotron h2 {
- font-weight: 300;
text-align: center;
margin-top: 50px;
font-size: 40px;
@@ -6139,7 +6139,6 @@ h2 {
text-align: center;
}
.mini-tron h1 {
- font-weight: 300;
margin-top: 0;
}
.mini-tron p {
@@ -6155,7 +6154,7 @@ h2 {
font-size: 45px;
}
.mini-tron p {
- font-size: 22px;
+ font-size: 18px;
}
}
/**
@@ -6221,7 +6220,7 @@ h2 {
/**
* Panel Headers Like Buttons
*/
-.panel-heading:hover {
+.panel-button:hover {
background: #cfcfcf;
}
a.noDecoration {

Large diffs are not rendered by default.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -33,7 +33,7 @@ block content
hr
#accordion.panel-group
.panel.panel-default
- .panel-heading
+ .panel-heading.panel-button
p.panel-title
a.noDecoration(data-toggle='collapse', data-parent='#accordion', href='#collapseOne')
| Use your email and password&nbsp;
@@ -90,7 +90,7 @@ block content
.row
.col-sm-6.col-sm-offset-1
.page-header
- h3 Change Your Password
+ h2 Change Your Password
form(action='/account/password', method='POST')
input.form-control(type='hidden', name='_csrf', value=token)
.form-group
@@ -107,10 +107,10 @@ block content
| &nbsp;Change Password
.col-sm-4
.page-header
- h3 Delete Account
+ h2 Delete Account
#accordion.panel-group
.panel.panel-default
- .panel-heading
+ .panel-heading.panel-button
p.panel-title
a.noDecoration(data-toggle='collapse', data-parent='#accordion', href='#collapseOne')
| Delete my account&nbsp;
View
@@ -7,7 +7,7 @@ block content
.mini-tron.bg-brand1.white
h1 Welcome to #{application}!
- p This is the "logged in" home page.
+ h2 This is the "logged in" home page.
.container
.row
@@ -33,7 +33,6 @@ block content
h3
| Give us a star on&nbsp;
a(href='https://github.com/dstroot/skeleton')
- | &nbsp;
i.fa.fa-fw.fa-github
| &nbsp;GitHub
h3 Built with:
View
@@ -35,7 +35,7 @@ block content
| &nbsp;Scrobbles: #{artist.stats.playcount}
p
- img.img-responsive(src='#{artist.image}')
+ img.img-rounded.img-responsive(src='#{artist.image}')
p
for tag in artist.tags
View
@@ -15,4 +15,4 @@ block content
.col-md-8.col-md-offset-2
br
br
- img.img-responsive.center-block(src='img/403.gif')
+ img.img-responsive.center-block(src='/img/403.gif')
View
@@ -7,12 +7,12 @@ block head
block content
.mini-tron.bg-brand5.brand3
- h1 404 Page not Found!&nbsp;&nbsp;:(
+ h1 404 Page Not Found!&nbsp;&nbsp;:(
p You tried to reach: #{url}
p That page doesn't exist. Puzzling...
.container
.row
.col-md-8.col-md-offset-2
br
br
- img.img-responsive.center-block(src='img/404.jpg')
+ img.img-responsive.center-block(src='/img/404.jpg')
View
@@ -47,7 +47,7 @@ head
//- link(rel='stylesheet', href='//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css')
//- Fonts
- link(href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,300,400,700', rel='stylesheet', type='text/css')
+ link(href='http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,300,400,500,700', rel='stylesheet', type='text/css')
//- favicon.ico and apple-touch-icon(s)

0 comments on commit e76dffb

Please sign in to comment.