From 927c8de8b032530f04d48c72d079b1e5388411b2 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Tue, 9 Oct 2012 15:53:23 +0200 Subject: [PATCH] remove flash count binding and solve that in css --- assets/scripts/app/views/flash.coffee | 5 ----- assets/styles/app/flash.sass | 7 +++---- public/scripts/app.js | 2 +- public/scripts/min/app.js | 2 +- public/styles/app.css | 25 ++++++++++++------------- public/version | 2 +- 6 files changed, 18 insertions(+), 25 deletions(-) diff --git a/assets/scripts/app/views/flash.coffee b/assets/scripts/app/views/flash.coffee index 5774e862..44e05f01 100644 --- a/assets/scripts/app/views/flash.coffee +++ b/assets/scripts/app/views/flash.coffee @@ -3,11 +3,6 @@ elementId: 'flash' tagName: 'ul' templateName: 'layouts/flash' - countBinding: 'controller.length' - - display: (-> - @set('classNames', if @get('count') == 0 then [] else ['display']) - ).observes('count') FlashItemView: Travis.View.extend tagName: 'li' diff --git a/assets/styles/app/flash.sass b/assets/styles/app/flash.sass index 50b7a12b..1dc61eaf 100644 --- a/assets/styles/app/flash.sass +++ b/assets/styles/app/flash.sass @@ -1,16 +1,15 @@ @import "_mixins/all" #flash - display: none - margin: -20px -40px 20px -30px color: gray font-weight: bold - border-bottom: 1px solid $color-border-light - @include box-shadow(transparent 0 0 0 0, $color-border-normal 0 1px 6px 0, transparent 0 0 0 0, transparent 0 0 0 0) li position: relative + margin: -20px -40px 20px -30px padding: 15px 40px 15px 30px + @include box-shadow(transparent 0 0 0 0, $color-border-normal 0 1px 6px 0, transparent 0 0 0 0, transparent 0 0 0 0) + border-bottom: 1px solid $color-border-light .success background-color: #ebfcc2 diff --git a/public/scripts/app.js b/public/scripts/app.js index d44a1e6e..788f84e4 100644 --- a/public/scripts/app.js +++ b/public/scripts/app.js @@ -29619,4 +29619,4 @@ var _require=function(){function c(a,c){document.addEventListener?a.addEventList ++g&&setTimeout(c,0)})}}(); (function(){!window.WebSocket&&window.MozWebSocket&&(window.WebSocket=window.MozWebSocket);if(window.WebSocket)Pusher.Transport=window.WebSocket,Pusher.TransportType="native";var c=(document.location.protocol=="http:"?Pusher.cdn_http:Pusher.cdn_https)+Pusher.VERSION,a=[];window.JSON||a.push(c+"/json2"+Pusher.dependency_suffix+".js");if(!window.WebSocket)window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION=!0,a.push(c+"/flashfallback"+Pusher.dependency_suffix+".js");var b=function(){return window.WebSocket?function(){Pusher.ready()}: function(){window.WebSocket?(Pusher.Transport=window.WebSocket,Pusher.TransportType="flash",window.WEB_SOCKET_SWF_LOCATION=c+"/WebSocketMain.swf",WebSocket.__addTask(function(){Pusher.ready()}),WebSocket.__initialize()):(Pusher.Transport=null,Pusher.TransportType="none",Pusher.ready())}}(),e=function(a){var b=function(){document.body?a():setTimeout(b,0)};b()},g=function(){e(b)};a.length>0?_require(a,g):g()})(); -;minispade.register('app', "(function() {(function() {\nminispade.require('auth');\nminispade.require('controllers');\nminispade.require('helpers');\nminispade.require('models');\nminispade.require('pusher');\nminispade.require('routes');\nminispade.require('slider');\nminispade.require('store');\nminispade.require('tailing');\nminispade.require('templates');\nminispade.require('views');\nminispade.require('config/locales');\nminispade.require('data/sponsors');\n\n Travis.reopen({\n App: Em.Application.extend({\n autoinit: false,\n currentUserBinding: 'auth.user',\n authStateBinding: 'auth.state',\n init: function() {\n this._super.apply(this, arguments);\n this.store = Travis.Store.create();\n this.store.loadMany(Travis.Sponsor, Travis.SPONSORS);\n this.set('auth', Travis.Auth.create({\n app: this,\n endpoint: Travis.config.api_endpoint\n }));\n this.slider = new Travis.Slider();\n this.pusher = new Travis.Pusher(Travis.config.pusher);\n return this.tailing = new Travis.Tailing();\n },\n signIn: function() {\n return this.get('auth').signIn();\n },\n signOut: function() {\n this.get('auth').signOut();\n return this.get('router').send('showRoot');\n },\n receive: function() {\n return this.store.receive.apply(this.store, arguments);\n },\n toggleSidebar: function() {\n var element;\n $('body').toggleClass('maximized');\n element = $('');\n $('#top .profile').append(element);\n Em.run.later((function() {\n return element.remove();\n }), 10);\n element = $('');\n $('#repo').append(element);\n return Em.run.later((function() {\n return element.remove();\n }), 10);\n }\n })\n });\n\n}).call(this);\n\n})();\n//@ sourceURL=app");minispade.register('auth', "(function() {(function() {\n\n this.Travis.Auth = Ember.Object.extend({\n iframe: $('