Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/shadowfiles/startup
Browse files Browse the repository at this point in the history
  • Loading branch information
LikeMyBread committed Mar 21, 2015
2 parents 950c9c2 + bd91324 commit 81c4236
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Dancing+Script:400,700' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Allan:400,700' rel='stylesheet' type='text/css'>
<link href="http://fonts.googleapis.com/css?family=Corben:bold" rel="stylesheet" type="text/css">
<link href='http://fonts.googleapis.com/css?family=Corben:400' rel='stylesheet' type='text/css'>
<link href="http://fonts.googleapis.com/css?family=Nobile" rel="stylesheet" type="text/css">
<link href="http://fonts.googleapis.com/css?family=Droid+Serif" rel="stylesheet" type="text/css">
<link href="http://fonts.googleapis.com/css?family=Droid+Sans" rel="stylesheet" type="text/css">
Expand Down
6 changes: 3 additions & 3 deletions js/data.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions js/main.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var seed = Math.floor(Math.random() * 10000000000);
var seed = Math.floor(Math.random() * 10000000000000000);

var accent;
var navTop;
Expand Down Expand Up @@ -83,7 +83,7 @@ $(document).ready(function() {
$("#home-text-wrapper").css("padding", "15px 0");
}

if (seedChance(seed * 243 * 9, 0.4)) {
if (seedChance(seed * 243 * 9, 0.3)) {
// Generate a flat color
$("#home-content").css("background", accent);
if (seedChance(seed * 243 * 81, 0.6)) {
Expand All @@ -96,7 +96,7 @@ $(document).ready(function() {
$("#home .btn-default").css("background-color", darkenColor(accent, 40));
} else {
// Generate an image
var bgAlpha = getAlpha(seed * 243 * 27, 0.2, 0.6);
var bgAlpha = getAlpha(seed * 243 * 27, 0.3, 0.6);
var bgOverlay = "rgba(0, 0, 0, " + bgAlpha + ")";
if (seedChance(seed * 3, 0.1)) {
bgOverlay = "url('img/misc/diag/" + seedChoice(seed * 9, diagonals) + "')";
Expand Down

0 comments on commit 81c4236

Please sign in to comment.