3pp-mirror/rallly
1
0
Fork 0
mirror of https://github.com/lukevella/rallly.git synced 2025-04-30 10:46:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Minor style and layout changes

Browse source
This commit is contained in:
Luke Vella 2015-01-15 19:05:38 +01:00
parent 6ad493a079
commit 2f0c8fdeab
8 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/build/app.js
View file

File diff suppressed because one or more lines are too long

2
public/css/style.css
View file

File diff suppressed because one or more lines are too long

2
public/css/style.css.map
View file

File diff suppressed because one or more lines are too long

6
public/js/filters/elapsed.filter.js
View file

@ -1,5 +1,5 @@
angular.module('rallly') angular.module('rallly')
.filter('elapsed', function(){ .filter('elapsed', function($filter){
return function(date){ return function(date){
if (!date) return; if (!date) return;
var time = Date.parse(date), var time = Date.parse(date),
@ -9,7 +9,9 @@ angular.module('rallly')
minutes = Math.floor(seconds / 60), minutes = Math.floor(seconds / 60),
hours = Math.floor(minutes / 60), hours = Math.floor(minutes / 60),
days = Math.floor(hours / 24); days = Math.floor(hours / 24);
if (days > 1) { if (days > 30) {
return 'on ' + $filter('date')(date, 'MMMM d');
} else if (days > 1) {
return days + " days ago"; return days + " days ago";
} else if (days == 1) { } else if (days == 1) {
return "1 day ago" return "1 day ago"

6
public/scss/partials/_modal.scss
View file

@ -2,7 +2,7 @@
background:white; background:white;
position: fixed; position: fixed;
top: 50%; top: 50%;
box-shadow: 0 0 5px rgba(black, 0.5); box-shadow: 0 0 5px rgba(black, 0.1);
left: 50%; left: 50%;
width: 50%; width: 50%;
max-width: 400px; max-width: 400px;
@ -12,6 +12,7 @@
z-index: 2000; z-index: 2000;
overflow:hidden; overflow:hidden;
border-radius: 5px; border-radius: 5px;
border: 1px solid #ddd;
@include transform(translateX(-50%) translateY(-50%)); @include transform(translateX(-50%) translateY(-50%));
.rl-modal-message { .rl-modal-message {
padding: 0 20px 20px 20px; padding: 0 20px 20px 20px;
@ -21,6 +22,7 @@
.rl-modal-title { .rl-modal-title {
padding:20px 20px 5px 20px; padding:20px 20px 5px 20px;
font-size: em(18px); font-size: em(18px);
font-weight: bold;
} }
.rl-modal-actions { .rl-modal-actions {
border-top:1px solid #ddd; border-top:1px solid #ddd;
@ -37,6 +39,6 @@
left:0; left:0;
width:100%; width:100%;
height:100%; height:100%;
background:transparent; background:rgba(black,0.1);
} }

2
public/scss/partials/_vars.scss
View file

@ -1,6 +1,6 @@
/****** BASIC *******/ /****** BASIC *******/
$em-base: 16px; $em-base: 16px;
$primary-font: "Source Sans Pro"; $primary-font: "Roboto";
/****** BASIC *******/ /****** BASIC *******/
/****** COLORS *******/ /****** COLORS *******/

2
public/scss/style.scss
View file

@ -1,4 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700,400italic); @import url(http://fonts.googleapis.com/css?family=Roboto:400,600,700,400italic);
@import "partials/vars"; @import "partials/vars";
@import "partials/mixins"; @import "partials/mixins";
@import "partials/normalize"; @import "partials/normalize";

2
views/index.ejs
View file

@ -23,7 +23,7 @@
</section> </section>
<section class="secondary-section"> <section class="secondary-section">
<nav class="nav-links"> <nav class="nav-links">
<a class="nav-link" href="/">New Event</a> <a class="nav-link" target="_blank" href="/">New Event</a>
<a class="nav-link" href="/about">What is this?</a> <a class="nav-link" href="/about">What is this?</a>
</nav> </nav>
</section> </section>