From c36ea44925d5359588f17a9a4930721f4530890b Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Sat, 14 Oct 2017 08:35:37 +1300 Subject: [PATCH] User 'you' tag; Unifying backend response format --- build_tools/VERSION.md | 2 +- mopidy_iris/handlers.py | 9 ++++++--- src/js/views/User.js | 2 +- src/scss/global/_core.scss | 6 ++++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/build_tools/VERSION.md b/build_tools/VERSION.md index e0940d40..e5b82034 100755 --- a/build_tools/VERSION.md +++ b/build_tools/VERSION.md @@ -1 +1 @@ -3.4.9 \ No newline at end of file +3.5.0 \ No newline at end of file diff --git a/mopidy_iris/handlers.py b/mopidy_iris/handlers.py index 764b7cdd..1c8a3bb9 100755 --- a/mopidy_iris/handlers.py +++ b/mopidy_iris/handlers.py @@ -162,7 +162,8 @@ class HttpHandler(tornado.web.RequestHandler): else: mem.iris.raven_client.captureMessage("Method "+slug+" does not exist") self.write({ - 'error': 'Method "'+slug+'" does not exist' + 'status': 0, + 'message': 'Method "'+slug+'" does not exist' }) self.finish() @@ -177,14 +178,16 @@ class HttpHandler(tornado.web.RequestHandler): except urllib2.HTTPError as e: self.write({ - 'error': 'Invalid JSON payload' + 'status': 0, + 'message': 'Invalid JSON payload' }) self.finish() else: mem.iris.raven_client.captureMessage("Method "+slug+" does not exist") self.write({ - 'error': 'Method "'+slug+'" does not exist' + 'status': 0, + 'message': 'Method "'+slug+'" does not exist' }) self.finish() diff --git a/src/js/views/User.js b/src/js/views/User.js index 57e7e8f4..361d08f4 100755 --- a/src/js/views/User.js +++ b/src/js/views/User.js @@ -93,7 +93,7 @@ class User extends React.Component{
diff --git a/src/scss/global/_core.scss b/src/scss/global/_core.scss index 91b33c3d..33682d17 100755 --- a/src/scss/global/_core.scss +++ b/src/scss/global/_core.scss @@ -393,6 +393,12 @@ footer { background: lighten($dark_grey,10%); color: $mid_grey; } + + h1 &, + h2 & { + line-height: 1.4em; + vertical-align: middle; + } }