From 234c50b83480e65d645d4f18912f4b023bdc3954 Mon Sep 17 00:00:00 2001 From: Emmanuel ROHEE Date: Wed, 27 Aug 2014 18:00:08 +0200 Subject: BF: mFileInput dependency got lost somewhere and upload buttons did not work anymore --- webclient/room/room-controller.js | 2 +- webclient/settings/settings-controller.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'webclient') diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 641ccddce7..6c98db269e 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -angular.module('RoomController', ['ngSanitize', 'mUtilities']) +angular.module('RoomController', ['ngSanitize', 'mFileInput', 'mUtilities']) .controller('RoomController', ['$scope', '$http', '$timeout', '$routeParams', '$location', 'matrixService', 'eventStreamService', 'eventHandlerService', 'mFileUpload', 'mUtilities', '$rootScope', function($scope, $http, $timeout, $routeParams, $location, matrixService, eventStreamService, eventHandlerService, mFileUpload, mUtilities, $rootScope) { 'use strict'; diff --git a/webclient/settings/settings-controller.js b/webclient/settings/settings-controller.js index 5d3f7cb2b8..f7d5e8eb75 100644 --- a/webclient/settings/settings-controller.js +++ b/webclient/settings/settings-controller.js @@ -16,7 +16,7 @@ limitations under the License. 'use strict'; -angular.module('SettingsController', ['matrixService', 'mFileUpload']) +angular.module('SettingsController', ['matrixService', 'mFileUpload', 'mFileInput']) .controller('SettingsController', ['$scope', 'matrixService', 'mFileUpload', function($scope, matrixService, mFileUpload) { $scope.config = matrixService.config(); -- cgit 1.4.1 From f53c4300fd3a83b4bb40fc93cad4dbf0e53d1b52 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 27 Aug 2014 17:03:16 +0100 Subject: improve iOS layout a bit --- webclient/app.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'webclient') diff --git a/webclient/app.css b/webclient/app.css index 8abdd1cb44..16f9dd72b7 100644 --- a/webclient/app.css +++ b/webclient/app.css @@ -7,6 +7,16 @@ .leftBlock { width: 8em ! important; + font-size: 8px ! important; + } + + .rightBlock { + width: 0px ! important; + display: none ! important; + } + + .avatar { + width: 36px ! important; } #header, -- cgit 1.4.1