3pp-mirror/rallly
1
0
Fork 0
mirror of https://github.com/lukevella/rallly.git synced 2025-05-12 16:36:49 +02:00
Code Issues Projects Releases Packages Wiki Activity

Updated layout

Browse source
This commit is contained in:
Luke Vella 2015-01-12 17:37:45 +01:00
parent 0eeb4866f4
commit 6b1e9893e9
13 changed files with 46 additions and 59 deletions
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

2
public/js/controllers/event.controller.js
View file

@ -1,5 +1,6 @@
angular.module('rallly') angular.module('rallly')
.controller('EventCtrl', function($scope, $http, $state, Event, Participant){ .controller('EventCtrl', function($scope, $http, $state, Event, Participant){
$(".nav-link").removeClass('active');
var id = $state.params.id; var id = $state.params.id;
$scope.event = Event.get({id:id}, function(data){}, function(e){ $scope.event = Event.get({id:id}, function(data){}, function(e){
$state.go('notfound'); $state.go('notfound');
@ -18,7 +19,6 @@ angular.module('rallly')
id : $scope.event._id, id : $scope.event._id,
pid : participant._id pid : participant._id
}, participant); }, participant);
// Event.update({'_id':$scope.event.id}, $scope.event);
} }
$scope.edit = function(participant){ $scope.edit = function(participant){
$scope.defaults[$scope.event.participants.indexOf(participant)] = angular.copy(participant); $scope.defaults[$scope.event.participants.indexOf(participant)] = angular.copy(participant);

2
public/js/controllers/newevent.controller.js
View file

@ -1,6 +1,8 @@
angular.module('rallly') angular.module('rallly')
.controller('NewEventCtrl', function($scope, $http, $state){ .controller('NewEventCtrl', function($scope, $http, $state){
$(".nav-link[href='/']").addClass('active');
$scope.event = {}; $scope.event = {};
$scope.isNewEvent = true;
$scope.submit = function(){ $scope.submit = function(){
$http.post('/api/event', $scope.event) $http.post('/api/event', $scope.event)
.success(function(event, status, headers, config){ .success(function(event, status, headers, config){

4
public/scss/partials/_buttons.scss
View file

@ -9,7 +9,7 @@
.btn-primary { .btn-primary {
border:1px solid #E0E3E9; border:1px solid #E0E3E9;
border-radius: 2px; border-radius: 2px;
box-shadow: inset 0 1px 0 white, 0 1px 2px rgba(black, 0.1); box-shadow: inset 0 1px 0 white, 0 1px 1px rgba(black, 0.1);
@include background-image(linear-gradient(#FAFAFA, #EFF1F3)); @include background-image(linear-gradient(#FAFAFA, #EFF1F3));
font-size: em(12px); font-size: em(12px);
font-weight:600; font-weight:600;
@ -17,7 +17,7 @@
text-decoration:none; text-decoration:none;
padding: em(8px) em(20px); padding: em(8px) em(20px);
&.danger { &.danger {
color: $red-clr; color: $danger-clr;
} }
&:focus { &:focus {
outline:0; outline:0;

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

@ -21,10 +21,6 @@
} }
} }
tr:hover { tr:hover {
td {
color: $blue-clr;
background: rgba(#F6FBFF,0.5);
}
.hover { .hover {
visibility:visible; visibility:visible;
} }
@ -57,7 +53,7 @@
color: $text-clr; color: $text-clr;
&:focus { &:focus {
outline:0; outline:0;
border-color: $primary-clr; border-color: $blue-clr;
} }
} }
} }

23
public/scss/partials/_header.scss
View file

@ -1,28 +1,25 @@
.header { .header {
border-top: 5px solid $primary-clr; @include span-columns(3);
@include row(); .fixed {
@include linear-gradient(white, transparent 50%, $fallback:transparent); position: fixed;
}
.primary-section { .primary-section {
@include span-columns(6); margin: em(35px) 0;
} }
.secondary-section { .secondary-section {
@include span-columns(6);
text-align:right;
} }
.nav-links { .nav-links {
font-size: em(12px); font-size: em(16px);
font-weight: 600; font-weight: normal;
line-height: em(24px); line-height: em(24px);
.nav-link { .nav-link {
display:block;
text-decoration:none; text-decoration:none;
color: $dark-gray-clr; color: $dark-gray-clr;
margin: 0 em(10px); &:hover, &.active {
&:hover {
color: $text-clr; color: $text-clr;
} }
} }
.btn {
margin: 0 0 0 em(20px);
}
} }
} }

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

@ -1,14 +0,0 @@
.rly-modal {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
display:table;
background: rgba(white,0.9);
div {
display:table-cell;
vertical-align:middle;
text-align:center;
}
}

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

@ -8,6 +8,7 @@ $primary-clr: #60DF9D;
$dark-gray-clr: #969FA9; $dark-gray-clr: #969FA9;
$light-gray-clr: #f9f9f9; $light-gray-clr: #f9f9f9;
$text-clr: #3D4752; $text-clr: #3D4752;
$danger-clr: #E55A5A;
$red-clr: #E55A84; $red-clr: #E55A84;
$blue-clr: #5AC4E5; $blue-clr: #5AC4E5;
$medium-gray-clr: #798490; $medium-gray-clr: #798490;

7
public/scss/style.scss
View file

@ -24,10 +24,15 @@ body {
@import "partials/eventsuccess"; @import "partials/eventsuccess";
.container { .container {
@include outer-container(800px); @include outer-container();
padding: em(30px) em(40px); padding: em(30px) em(40px);
} }
.main-content {
@include span-columns(8);
@include shift(2);
}
.rl-section { .rl-section {
@include outer-container(800px); @include outer-container(800px);
border-top:1px solid #ddd; border-top:1px solid #ddd;

4
public/templates/event.html
View file

@ -60,8 +60,8 @@
<td> <td>
<a ng-hide="editMode" href="javascript:" ng-click="editMode = true; edit(participant)" class="btn-primary hover">Edit</a> <a ng-hide="editMode" href="javascript:" ng-click="editMode = true; edit(participant)" class="btn-primary hover">Edit</a>
<a ng-hide="editMode" href="javascript:" ng-click="delete(participant)" class="btn-primary danger hover">Delete</a> <a ng-hide="editMode" href="javascript:" ng-click="delete(participant)" class="btn-primary danger hover">Delete</a>
<a ng-show="editMode" href="javascript:" ng-click="editMode = false; update(participant)" class="btn-primary hover">Save</a> <a ng-show="editMode" href="javascript:" ng-click="editMode = false; update(participant)" class="btn-primary">Save</a>
<a ng-show="editMode" href="javascript:" ng-click="editMode = false; cancel($index)" class="btn-primary hover">Cancel</a> <a ng-show="editMode" href="javascript:" ng-click="editMode = false; cancel($index)" class="btn-primary danger">Cancel</a>
</td> </td>
</tr> </tr>
<tr class="event-poll-input"> <tr class="event-poll-input">

34
views/index.ejs
View file

@ -12,25 +12,25 @@
<script type="text/javascript" src="/build/app.js"></script> <script type="text/javascript" src="/build/app.js"></script>
</head> </head>
<body> <body>
<header class="header"> <div class="container">
<div class="container"> <header class="header">
<section class="primary-section"> <div class="fixed">
<a href="/"> <section class="primary-section">
<img src="/images/logo@2x.png" width="100" alt="Rallly - Collabrative Scheduling" /> <a href="/">
</a> <img src="/images/logo@2x.png" width="100" alt="Rallly - Collabrative Scheduling" />
</section>
<section class="secondary-section">
<nav class="nav-links">
<a class="nav-link" href="/about">What is this?</a>
<a class="btn btn-flat" href="/">
Schedule New Event
</a> </a>
</nav> </section>
</div> <section class="secondary-section">
</div> <nav class="nav-links">
</header> <a class="nav-link" href="/">New Event</a>
<div class="container" ui-view> <a class="nav-link" href="/about">What is this?</a>
</nav>
</section>
</div>
</header>
<div class="main-content" ui-view>
</div>
</div> </div>
</body> </body>
</html> </html>