diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2013-03-05 09:11:54 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2013-03-05 09:11:54 -0600 |
| commit | 0d1750e43bac5d0430fa9376cbc03d11f331a33f (patch) | |
| tree | 64640a5e93d47c3c1c142a48f78e9383111948f4 | |
| parent | b5ac06ea4a08802c381d86a02001165ec9460004 (diff) | |
| parent | fb0df1a738d3a9dc01c5b54619f286148532c6ce (diff) | |
| download | askbot-0d1750e43bac5d0430fa9376cbc03d11f331a33f.tar.gz askbot-0d1750e43bac5d0430fa9376cbc03d11f331a33f.tar.bz2 askbot-0d1750e43bac5d0430fa9376cbc03d11f331a33f.zip | |
Merge branch 'master' of github.com:ASKBOT/askbot-devel
| -rwxr-xr-x | .gitignore | 1 | ||||
| -rw-r--r-- | askbot/context.py | 1 | ||||
| -rw-r--r-- | askbot/media/style/style.css | 1 | ||||
| -rw-r--r-- | askbot/media/style/style.less | 1 |
4 files changed, 4 insertions, 0 deletions
@@ -12,6 +12,7 @@ run nbproject settings_local.py settings.py +tinymce .idea .coverage *.iml diff --git a/askbot/context.py b/askbot/context.py index 523e8e09..fba17b5f 100644 --- a/askbot/context.py +++ b/askbot/context.py @@ -46,6 +46,7 @@ def application_settings(request): 'ASKBOT_USE_LOCAL_FONTS', False ) + my_settings['CSRF_COOKIE_NAME'] = settings.CSRF_COOKIE_NAME my_settings['DEBUG'] = settings.DEBUG my_settings['USING_RUNSERVER'] = 'runserver' in sys.argv my_settings['ASKBOT_VERSION'] = askbot.get_version() diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css index 0d325360..a53ebf37 100644 --- a/askbot/media/style/style.css +++ b/askbot/media/style/style.css @@ -275,6 +275,7 @@ body.user-messages { height: 20px; padding-bottom: 5px; + white-space: nowrap; } #userToolsNav a { height: 35px; diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less index 53573280..a0813f1a 100644 --- a/askbot/media/style/style.less +++ b/askbot/media/style/style.less @@ -273,6 +273,7 @@ body.user-messages { #userToolsNav {/* Navigation bar containing login link or user information, check widgets/user_navigation.html*/ height: 20px; padding-bottom:5px; + white-space: nowrap; a { height: 35px; |