From 18fa9eb7144eb9094fe83123b0249857e3d4b460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Fri, 15 Mar 2013 09:43:29 +0100 Subject: [PATCH] allow scrolling in some boxes --- univcloud/apps/base.py | 1 + univcloud/apps/feed.py | 1 + univcloud/apps/welcome.py | 1 + univcloud/static/css/style.css | 5 ++++- univcloud/templates/univcloud/homepage.html | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/univcloud/apps/base.py b/univcloud/apps/base.py index 4863c13..96acbe0 100644 --- a/univcloud/apps/base.py +++ b/univcloud/apps/base.py @@ -6,6 +6,7 @@ class BaseApp(object): sizey = 1 template_name = None background_color = None + scroll = False def __init__(self, app_id, row=1, col=1, background_color=None): self.app_id = app_id diff --git a/univcloud/apps/feed.py b/univcloud/apps/feed.py index 40695ca..9f732fe 100644 --- a/univcloud/apps/feed.py +++ b/univcloud/apps/feed.py @@ -5,6 +5,7 @@ class App(BaseApp): template_name = 'apps/feed.html' sizex = 2 sizey = 2 + scroll = True def __init__(self, app_id, feed_url='#', **kwargs): super(App, self).__init__(app_id, **kwargs) diff --git a/univcloud/apps/welcome.py b/univcloud/apps/welcome.py index 3a9b213..926df15 100644 --- a/univcloud/apps/welcome.py +++ b/univcloud/apps/welcome.py @@ -4,3 +4,4 @@ class App(BaseApp): template_name = 'apps/welcome.html' sizex = 2 sizey = 2 + scroll = True diff --git a/univcloud/static/css/style.css b/univcloud/static/css/style.css index af67630..5493fe7 100644 --- a/univcloud/static/css/style.css +++ b/univcloud/static/css/style.css @@ -34,6 +34,10 @@ div.gridster > ul > li { box-shadow: 0 0 5px black; } +div.gridster > ul > li.scroll { + overflow-y: auto; +} + div.rssHeader { text-align: center; } @@ -102,7 +106,6 @@ ul li h2 { /* rss */ .feed { padding: 10px; - overflow: scroll; } div.rssHeader a { diff --git a/univcloud/templates/univcloud/homepage.html b/univcloud/templates/univcloud/homepage.html index acb2dad..db403c5 100644 --- a/univcloud/templates/univcloud/homepage.html +++ b/univcloud/templates/univcloud/homepage.html @@ -23,6 +23,7 @@ Univcloud {% for app in apps %}
  • o ×