From 13ff27554f1c6f22b45ae03926813da7b106c669 Mon Sep 17 00:00:00 2001 From: Till Breuer Date: Tue, 27 May 2014 12:56:14 +0200 Subject: [PATCH 1/2] Hack in some sorting drop down responsiveness --- app/assets/stylesheets/content/_modal.sass | 13 ++++++++++++ .../work_packages/modals/sorting.html | 20 ++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/content/_modal.sass b/app/assets/stylesheets/content/_modal.sass index f572787638..232b93c753 100644 --- a/app/assets/stylesheets/content/_modal.sass +++ b/app/assets/stylesheets/content/_modal.sass @@ -74,3 +74,16 @@ $ng-modal-image-width: $ng-modal-image-height margin: 30px 7px 0 0 .select2-container margin: 0 0 10px 0 + + + #modal-sorting + min-width: 900px + .select2-container + @media(max-width: 1800px) + width: 280px + @media(max-width: 1400px) + width: 230px + @media(max-width: 1100px) + width: 160px + @media(max-width: 800px) + width: 120px diff --git a/public/templates/work_packages/modals/sorting.html b/public/templates/work_packages/modals/sorting.html index f6cd201aff..fd57b6c32c 100644 --- a/public/templates/work_packages/modals/sorting.html +++ b/public/templates/work_packages/modals/sorting.html @@ -4,15 +4,17 @@

Sorting

-
- - +
From eb3f1689d7d2efdf4768cd9db6283c3aee8aaa9f Mon Sep 17 00:00:00 2001 From: Till Breuer Date: Tue, 27 May 2014 13:01:22 +0200 Subject: [PATCH 2/2] Make UserService a local variable --- app/assets/javascripts/angular/services/user-service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/angular/services/user-service.js b/app/assets/javascripts/angular/services/user-service.js index 441e399a60..b54e83771b 100644 --- a/app/assets/javascripts/angular/services/user-service.js +++ b/app/assets/javascripts/angular/services/user-service.js @@ -31,7 +31,7 @@ angular.module('openproject.services') .service('UserService', ['$http', 'PathHelper', function($http, PathHelper) { var registeredUserIds = [], cachedUsers = {}; - UserService = { + var UserService = { getUsers: function(projectIdentifier) { var url, params;