Skip to content
Extraits de code Groupes Projets
Valider 283e7304 rédigé par Maxwell Salzberg's avatar Maxwell Salzberg
Parcourir les fichiers

AHHH CRAZY. stupid branchs. WIP

parent e1bf6441
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Affichage de
avec 12 ajouts et 7 suppressions
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
//= require_tree ./pages //= require_tree ./pages
//= require_tree ./collections //= require_tree ./collections
//= require_tree ./views //= require_tree ./views
//= require ./forms
//= require_tree ./forms
var app = { var app = {
collections: {}, collections: {},
models: {}, models: {},
......
//= require ../post_view
app.views.Post.Day = app.views.Post.extend({ app.views.Post.Day = app.views.Post.extend({
templateName : "day", templateName : "day",
className : "day post loaded", className : "day post loaded",
......
//= require ./stream_object_view //= require ./stream_object_view
app.views.Post = app.views.StreamObject.extend({ app.views.Post = app.views.StreamObject.extend({
presenter : function() { presenter : function() {
return _.extend(this.defaultPresenter(), { return _.extend(this.defaultPresenter(), {
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
//= require_tree ./helpers //= require_tree ./helpers
//= require_tree ./pages //= require_tree ./pages
//= require_tree ./widgets //= require_tree ./widgets
//= require_tree ./forms
//= require view //= require view
//= require aspects-dropdown //= require aspects-dropdown
//= require contact-edit //= require contact-edit
......
/* variables */ /* variables */
$light-grey: #999; $light-grey: #999;
$pane-width: 420px; $pane-width: 420px;
...@@ -87,7 +88,7 @@ $pane-width: 420px; ...@@ -87,7 +88,7 @@ $pane-width: 420px;
@mixin dark-hatched-bg() { @mixin dark-hatched-bg() {
background-color: #444; background-color: #444;
background-image: image-url("hatched-bg-dark.png"); background-image: url("../images/hatched-bg-dark.png");
} }
@mixin photo-shadow() { @mixin photo-shadow() {
...@@ -107,15 +108,15 @@ $pane-width: 420px; ...@@ -107,15 +108,15 @@ $pane-width: 420px;
/* bootstrap extentions */ /* bootstrap extentions */
.icon-red { .icon-red {
background-image: url("/img/glyphicons-halflings-red.png"); background-image: url(../img/glyphicons-halflings-red.png);
} }
.icon-green { .icon-green {
background-image: url("/img/glyphicons-halflings-green.png"); background-image: url(../img/glyphicons-halflings-green.png);
} }
.icon-blue { .icon-blue {
background-image: url("/img/glyphicons-halflings-blue.png"); background-image: url(../img/glyphicons-halflings-blue.png);
} }
/* styles */ /* styles */
...@@ -515,7 +516,7 @@ body.idle { ...@@ -515,7 +516,7 @@ body.idle {
border-top: 1px solid #444; border-top: 1px solid #444;
text-align: left; text-align: left;
background-image: image-url("hatched-bg-dark.png"); background-image: url("../images/hatched-bg-dark.png");
} }
#new-post-comment-container { #new-post-comment-container {
...@@ -807,4 +808,4 @@ text-rendering: optimizelegibility; ...@@ -807,4 +808,4 @@ text-rendering: optimizelegibility;
.headline p{ .headline p{
@include media-text(); @include media-text();
} }
\ No newline at end of file
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter