From ce534fdcb8e955f2a803ce9cdd2c23f874a6b5ae Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 16 Oct 2012 22:16:55 +0200 Subject: [PATCH] Make layout work for smaller resolutions --- .../scripts/app/templates/layouts/sidebar.hbs | 8 +++-- assets/styles/app/github.sass | 15 +++++++- assets/styles/layout.sass | 4 +++ public/scripts/app.js | 2 +- public/scripts/min/app.js | 2 +- public/styles/app.css | 36 ++++++++++++++----- 6 files changed, 53 insertions(+), 14 deletions(-) diff --git a/assets/scripts/app/templates/layouts/sidebar.hbs b/assets/scripts/app/templates/layouts/sidebar.hbs index abc7acfc..3ea91b3b 100644 --- a/assets/scripts/app/templates/layouts/sidebar.hbs +++ b/assets/scripts/app/templates/layouts/sidebar.hbs @@ -1,6 +1,8 @@ - - {{t layouts.application.fork_me}} - +
+ + {{t layouts.application.fork_me}} + +
  diff --git a/assets/styles/app/github.sass b/assets/styles/app/github.sass index 3ebe3550..fdf9f1b1 100644 --- a/assets/styles/app/github.sass +++ b/assets/styles/app/github.sass @@ -1,9 +1,20 @@ @import "_mixins/all" +#github-wrapper + position: absolute + z-index: 1001 + top: -40px + right: 0px + width: 135px + height: 135px + overflow: hidden + pointer-events: none + #github display: block position: absolute - top: 0 + z-index: 1001 + top: 40px right: -70px width: 250px padding: 3px 0 @@ -20,6 +31,8 @@ letter-spacing: -1px text-shadow: 0 0 10px #522600 + pointer-events: auto + @include rotate(45deg) @include box-shadow(rgba(black, 0.5) 1px 1px 10px, rgba(black, 0.07) 0 0 3px 1px inset) diff --git a/assets/styles/layout.sass b/assets/styles/layout.sass index ef110de0..e3727b01 100644 --- a/assets/styles/layout.sass +++ b/assets/styles/layout.sass @@ -14,12 +14,16 @@ html, body width: 100% min-height: 100% +.application > div + overflow-x: auto + #top position: absolute top: 0 left: 0 width: 100% height: 40px + z-index: 1000 #page position: relative diff --git a/public/scripts/app.js b/public/scripts/app.js index d79ffc75..a5034a8a 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_key);\n return this.tailing = new Travis.Tailing();\n },\n signIn: function() {\n return this.get('auth').signIn();\n },\n autoSignIn: function() {\n return this.get('auth').autoSignIn();\n },\n signOut: function() {\n this.get('auth').signOut();\n return this.get('router').send('afterSignOut');\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: $('