diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-11-23 09:48:38 -0300 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-11-23 09:48:38 -0300 |
| commit | 577326eebc05af3db66bca0d69b4bd7243a5e0ed (patch) | |
| tree | fa0772f6483f02dd7c61fc6cc6abd2c9f12816d0 | |
| parent | 01e342e9b7032538ff7c995f578425c575691222 (diff) | |
| parent | 7f2aaab10159fff957301a4332154b415f05f083 (diff) | |
| download | askbot-577326eebc05af3db66bca0d69b4bd7243a5e0ed.tar.gz askbot-577326eebc05af3db66bca0d69b4bd7243a5e0ed.tar.bz2 askbot-577326eebc05af3db66bca0d69b4bd7243a5e0ed.zip | |
Merge branch 'master' of github.com:ASKBOT/askbot-devel
| -rw-r--r-- | askbot/skins/default/media/style/style.less | 5 | ||||
| -rw-r--r-- | askbot/views/readers.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index c2d366dd..3d436958 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -627,6 +627,11 @@ body.user-messages { color: #777; text-align:center; } + + /* notify by email box */ + .notify-sidebar #question-subscribe-sidebar { + margin: 7px 0 0 3px; + } } .statsWidget p{ diff --git a/askbot/views/readers.py b/askbot/views/readers.py index ec3ca57b..53ef519e 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -372,7 +372,7 @@ def tags(request):#view showing a listing of available tags - plain list return render_into_skin('tags.html', data, request) @csrf.csrf_protect -@cache_page(60 * 5) +#@cache_page(60 * 5) def question(request, id):#refactor - long subroutine. display question body, answers and comments """view that displays body of the question and all answers to it |