Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: hackatron/sveglia
base: d12b9461a8
...
head fork: hackatron/sveglia
compare: 21aeeb1030
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
7 assets/javascripts/application.js
@@ -1,3 +1,10 @@
+//= require date_input.js
+//= require parallax.js
+//= require models/timer.js
+//= require collections/timers.js
+//= require views/timer_list_view.js
+//= require views/timer_list_item_view.js
+//= require views/timer_view.js
//= require_self
var AppRouter = Backbone.Router.extend({
View
32 assets/stylesheets/application.css
@@ -1,30 +1,31 @@
+/*
+ *= require reset.css
+ *= require_self
+ */
+
body {
font-family: 'Open Sans', sans-serif;
- color: #222;
+ color: #666;
+}
+
+h1, h2 {
+ font-family: 'Dosis', sans-serif;
+ text-transform: uppercase;
+ color: #0090d3;
}
h1 {
margin-bottom: 60px;
- font-size: 100px;
+ font-size: 110px;
}
h1 a {
- background: #ff0;
- padding: 2px;
- text-decoration: none;
background-image: url(/images/clock.png);
background-repeat: no-repeat;
background-position: 95% 50%;
padding-right: 130px;
}
-h1 a,
-h1 a:hover,
-h1 a:active,
-h1 a:visited {
- color: #000;
-}
-
h2 {
font-size: 24px;
margin-top: 20px;
@@ -32,13 +33,11 @@ h2 {
}
a {
- background: #222;
- padding: 2px;
text-decoration: none;
}
a, a:hover, a:active, a:visited {
- color: #ff0;
+ color: #0090d3;
}
p {
@@ -104,9 +103,10 @@ footer * {
/* date input */
#date_input {
+ color: #666;
width: 100%;
font-size: 60px;
- font-family: 'Open Sans', sans-serif;
+ font-family: 'Open sans', sans-serif;
border: #ccc 1px solid;
background-color: rgba(255, 255, 255, 0.5);
}
View
BIN  public/images/bg.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
13 public/index.html
@@ -5,9 +5,9 @@
<meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible' />
<title>Sveglia</title>
<link href='/favicon.ico' rel='icon' type='image/x-icon' />
- <link href='/reset.css' media='all' rel='stylesheet' type='text/css' />
<link href='//fonts.googleapis.com/css?family=Open+Sans:400italic,400,700' rel='stylesheet' type='text/css' />
- <link href='/stylesheets/application.css' media='all' rel='stylesheet' type='text/css' />
+ <link href='//fonts.googleapis.com/css?family=Dosis:400' rel='stylesheet' type='text/css'>
+ <link href='/assets/application.css' media='all' rel='stylesheet' type='text/css' />
</head>
<body id='ground'>
<div id='container'>
@@ -95,13 +95,6 @@
<script src='//documentcloud.github.com/underscore/underscore-min.js' type='text/javascript'></script>
<script src='//documentcloud.github.com/backbone/backbone-min.js' type='text/javascript'></script>
<script src='//www.datejs.com/build/date.js' type='text/javascript'></script>
- <script src='/javascripts/date_input.js' type='text/javascript'></script>
- <script src='/javascripts/parallax.js' type='text/javascript'></script>
- <script src='/javascripts/models/timer.js' type='text/javascript'></script>
- <script src='/javascripts/collections/timers.js' type='text/javascript'></script>
- <script src='/javascripts/views/timer_list_view.js' type='text/javascript'></script>
- <script src='/javascripts/views/timer_list_item_view.js' type='text/javascript'></script>
- <script src='/javascripts/views/timer_view.js' type='text/javascript'></script>
- <script src='/javascripts/application.js' type='text/javascript'></script>
+ <script src='/assets/application.js' type='text/javascript'></script>
</body>
</html>
View
2  spec/javascripts/support/jasmine.yml
@@ -11,7 +11,7 @@
# - dist/**/*.js
#
src_files:
- - public/javascripts/**/*.js
+ - assets/javascripts/**/*.js
# stylesheets
#
View
2  sveglia.rb
@@ -14,7 +14,7 @@
require_relative 'models/timer'
require_relative 'lib/goliath/rack/sprockets'
-VERSION = "0.1.8".freeze
+VERSION = "0.1.9".freeze
class SprocketsAPI < Goliath::API
use Goliath::Rack::Sprockets

No commit comments for this range

Something went wrong with that request. Please try again.