Permalink
Browse files

Release OpenProject Community Edition 6.1.1

  • Loading branch information...
2 parents f1ee5ba + 729df61 commit f1c0fea8564fcb9326d6a4ab8e3af5f273dfad6c @oliverguenther oliverguenther committed Nov 29, 2016
Showing with 2,135 additions and 1,545 deletions.
  1. +1 −0 .gitignore
  2. +2 −1 Gemfile
  3. +27 −25 Gemfile.lock
  4. +1 −1 Procfile.dev
  5. +3 −1 app/assets/javascripts/specific/main_menu.js.erb
  6. +0 −19 app/assets/stylesheets/_misc_legacy.sass
  7. +0 −5 app/assets/stylesheets/_work_packages_show_view_overwrite.scss
  8. +3 −1 app/assets/stylesheets/content/_forms.sass
  9. +6 −0 app/assets/stylesheets/content/_typeahead.sass
  10. 0 app/assets/stylesheets/content/{_user_avatars.lsg → _user.lsg}
  11. +3 −0 app/assets/stylesheets/content/{_user_avatars.sass → _user.sass}
  12. +5 −0 app/assets/stylesheets/content/_watchers.sass
  13. +5 −0 app/assets/stylesheets/content/work_packages/_table_content.sass
  14. +3 −0 app/assets/stylesheets/content/work_packages/inplace_editing/_edit_fields.sass
  15. +11 −5 app/assets/stylesheets/content/work_packages/inplace_editing/_legacy_inplace_styles.sass
  16. +0 −5 app/assets/stylesheets/content/work_packages/tabs/_relations.sass
  17. +1 −1 app/assets/stylesheets/default.css.sass
  18. +2 −1 app/assets/stylesheets/layout/_main_menu.sass
  19. +3 −1 app/assets/stylesheets/layout/_toolbar.sass
  20. +1 −1 app/assets/stylesheets/layout/_top_menu.sass
  21. +7 −1 app/assets/stylesheets/layout/_work_package.sass
  22. +5 −1 app/controllers/application_controller.rb
  23. +1 −1 app/controllers/custom_fields_controller.rb
  24. +1 −1 app/controllers/groups_controller.rb
  25. +2 −0 app/controllers/repositories_controller.rb
  26. +4 −0 app/controllers/work_packages_controller.rb
  27. +5 −1 app/helpers/my_helper.rb
  28. +13 −2 app/helpers/queries_helper.rb
  29. +2 −1 app/mailers/user_mailer.rb
  30. +6 −6 app/models/custom_value.rb
  31. +19 −11 app/models/custom_value/bool_strategy.rb
  32. +11 −3 app/models/custom_value/format_strategy.rb
  33. +18 −2 app/models/custom_value/user_strategy.rb
  34. +17 −1 app/models/custom_value/version_strategy.rb
  35. +12 −7 app/models/group.rb
  36. +23 −11 app/models/group/destroy.rb
  37. +22 −8 app/models/member.rb
  38. +12 −4 app/models/member_role.rb
  39. +1 −4 app/models/message.rb
  40. +2 −0 app/models/permitted_params.rb
  41. +1 −1 app/models/project/copy.rb
  42. +47 −52 app/models/queries/base_filter.rb
  43. +17 −7 app/models/queries/register.rb
  44. +2 −3 app/models/queries/work_packages/filter/custom_field_filter.rb
  45. +2 −2 app/models/queries/work_packages/filter/work_package_filter.rb
  46. +2 −2 app/models/query.rb
  47. +87 −27 app/models/watcher.rb
  48. +1 −4 app/models/wiki_page.rb
  49. +1 −1 app/services/api/v3/params_to_query_service.rb
  50. +2 −2 app/views/members/index.html.erb
  51. +2 −0 app/views/user_mailer/copy_project_failed.html.erb
  52. +2 −0 app/views/user_mailer/copy_project_failed.text.erb
  53. +1 −1 app/views/wiki/rename.html.erb
  54. +5 −4 app/workers/copy_project_job.rb
  55. +9 −0 config/application.rb
  56. +27 −3 config/database.yml.example
  57. +5 −0 config/initializers/active_record_query_trace.rb
  58. +73 −0 config/initializers/check_mysql_flags.rb
  59. +4 −1 config/locales/js-en.yml
  60. +4 −5 doc/operation_guides/docker/installation-guide.md
  61. +0 −10 doc/operation_guides/packager/installation-guide.md
  62. +1 −2 doc/operation_guides/system_requirements.md
  63. +58 −0 frontend/app/components/api/api-v3/hal-link/hal-link.service.test.ts
  64. +26 −0 frontend/app/components/api/api-v3/hal-link/hal-link.service.ts
  65. +1 −1 frontend/app/components/api/api-v3/hal-resources/work-package-resource.service.ts
  66. +19 −29 ...k-package-watcher-directive.js → components/common/typeahead/op-fullwidth-typeahead.directive.ts}
  67. +10 −0 frontend/app/components/common/typeahead/users/typeahead-match.html
  68. +1 −1 frontend/app/components/common/xss/bindUnescapedHtml/bindUnescapedHtml.directive.test.ts
  69. +1 −1 frontend/app/components/common/xss/bindUnescapedHtml/bindUnescapedHtml.directive.ts
  70. +1 −1 frontend/app/components/common/xss/expression.service.ts
  71. +1 −0 frontend/app/components/filters/query-model/query-model.service.ts
  72. +35 −17 frontend/app/components/routing/wp-list/wp-list.controller.ts
  73. +1 −0 frontend/app/components/routing/wp-list/wp.list.html
  74. +18 −0 frontend/app/components/work-packages/wp-display-attr/wp-display-attr.directive.test.ts
  75. +6 −2 frontend/app/components/work-packages/wp-display-attr/wp-display-attr.directive.ts
  76. +1 −1 frontend/app/components/work-packages/wp-single-view/wp-single-view.directive.html
  77. +1 −1 frontend/app/components/wp-activity/revision/revision-activity-directive.test.ts
  78. +1 −1 frontend/app/components/wp-activity/user/user-activity-directive.test.js
  79. +1 −1 frontend/app/components/wp-attachments/wp-attachment-list/wp-attachment-list-item.html
  80. +7 −5 frontend/app/components/wp-display/field-types/wp-display-spent-time-field.module.ts
  81. +0 −8 frontend/app/components/wp-display/wp-display-field/wp-display-field.module.ts
  82. +1 −1 frontend/app/components/wp-edit/wp-edit-field/wp-edit-field.directive.ts
  83. +4 −1 frontend/app/components/wp-edit/wp-edit-form.directive.ts
  84. +8 −0 frontend/app/components/wp-field/wp-field.module.ts
  85. +4 −0 frontend/app/components/wp-list/wp-list.service.ts
  86. +59 −71 frontend/app/components/wp-panels/watchers-panel/watchers-panel.controller.ts
  87. +18 −3 frontend/app/components/wp-panels/watchers-panel/watchers-panel.directive.html
  88. +0 −126 frontend/app/components/wp-panels/watchers-panel/wp-watchers.service.js
  89. +0 −160 frontend/app/components/wp-panels/watchers-panel/wp-watchers.service.test.js
  90. +1 −1 frontend/app/components/wp-relations/wp-relation-row/wp-relation-row.template.html
  91. +0 −7 ...wp-relations/wp-relations-create/wp-relations-autocomplete/wp-relations-autocomplete.directive.ts
  92. +3 −2 ...p-relations/wp-relations-create/wp-relations-autocomplete/wp-relations-autocomplete.template.html
  93. +1 −1 ...d/app/components/wp-relations/wp-relations-hierarchy-row/wp-relations-hierarchy-row.template.html
  94. +8 −4 frontend/app/components/wp-table/wp-table.directive.html
  95. +8 −2 frontend/app/components/wp-table/wp-table.directive.ts
  96. +32 −0 frontend/app/components/wp-watchers/wp-watcher-entry.directive.html
  97. +91 −0 frontend/app/components/wp-watchers/wp-watcher-entry.directive.ts
  98. +1 −2 frontend/app/templates/timelines/timeline_table.html
  99. +2 −2 frontend/app/templates/work_packages/activities/_user.html
  100. +0 −53 frontend/app/templates/work_packages/watchers/lookup.html
  101. +0 −33 frontend/app/templates/work_packages/watchers/watcher.html
  102. +1 −10 frontend/app/work_packages/directives/index.js
  103. +0 −91 frontend/app/work_packages/directives/work-package-watchers-lookup-directive.js
  104. +1 −1 frontend/bower.json
  105. +9 −4 lib/api/decorators/offset_paginated_collection.rb
  106. +2 −2 lib/api/v3/work_packages/available_relation_candidates_helper.rb
  107. +21 −6 lib/api/v3/work_packages/watchers_api.rb
  108. +69 −21 lib/api/v3/work_packages/work_package_collection_representer.rb
  109. +41 −7 lib/open_project/text_formatting.rb
  110. +1 −1 lib/open_project/version.rb
  111. +19 −0 lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb
  112. +2 −40 lib/redmine/wiki_formatting.rb
  113. +5 −33 lib/tasks/parallel_testing.rake
  114. +9 −1 script/templates/database.travis.mysql.yml
  115. +15 −0 spec/controllers/work_packages_controller_spec.rb
  116. +29 −17 config/constants/query_register.rb → spec/features/search_spec.rb
  117. +3 −3 spec/features/security/angular_xss_spec.rb
  118. +12 −9 spec/features/time_entry/root_time_entries_spec.rb
  119. +58 −66 spec/features/timelines/view_custom_fields_spec.rb
  120. +49 −0 spec/features/work_packages/hidden_types_spec.rb
  121. +35 −0 spec/features/work_packages/table/invalid_query_spec.rb
  122. +3 −9 spec/features/work_packages/tabs/watcher_tab_spec.rb
  123. +0 −29 spec/helpers/custom_fields_helper_spec.rb
  124. +4 −8 spec/lib/custom_field_form_builder_spec.rb
  125. +21 −0 spec/lib/open_project/text_formatting_spec.rb
  126. +5 −2 spec/models/copy_project_job_spec.rb
  127. +4 −4 spec/models/custom_value/bool_strategy_spec.rb
  128. +47 −12 spec/models/custom_value/user_strategy_spec.rb
  129. +45 −10 spec/models/custom_value/version_strategy_spec.rb
  130. +18 −15 spec/models/custom_value_spec.rb
  131. +9 −1 spec/models/messages_spec.rb
  132. +12 −0 spec/models/queries/base_filter_spec.rb
  133. +144 −0 spec/models/watcher_spec.rb
  134. +6 −0 spec/models/wiki_page_spec.rb
  135. +1 −1 spec/models/work_package/work_package_custom_fields_spec.rb
  136. +26 −2 spec/requests/api/v3/watcher_resource_spec.rb
  137. +10 −0 spec/requests/api/v3/work_packages/available_relation_candidates_spec.rb
  138. +0 −9 spec/spec_helper.rb
  139. +6 −0 spec/support/pages/abstract_work_package.rb
  140. +10 −3 spec/support/rspec_retry.rb
  141. +7 −31 spec_legacy/legacy_spec_helper.rb
  142. +1 −1 spec_legacy/unit/helpers/application_helper_spec.rb
  143. +1 −1 spec_legacy/unit/lib/redmine/wiki_formatting/macros_spec.rb
  144. +2 −6 spec_legacy/unit/project_spec.rb
  145. +2 −1 spec_legacy/unit/repository_git_spec.rb
  146. +1 −1 vendored-plugins/openproject-auth_plugins/lib/open_project/auth_plugins/version.rb
  147. +1 −1 vendored-plugins/openproject-backlogs/lib/open_project/backlogs/version.rb
  148. +2 −2 vendored-plugins/openproject-costs/.travis.yml
  149. +3 −0 vendored-plugins/openproject-costs/app/assets/stylesheets/costs/costs.sass
  150. +6 −6 vendored-plugins/openproject-costs/app/controllers/cost_objects_controller.rb
  151. +2 −2 vendored-plugins/openproject-costs/app/controllers/cost_types_controller.rb
  152. +3 −3 vendored-plugins/openproject-costs/app/controllers/costlog_controller.rb
  153. +4 −4 vendored-plugins/openproject-costs/app/controllers/hourly_rates_controller.rb
  154. +13 −5 vendored-plugins/openproject-costs/app/models/work_package/abstract_costs.rb
  155. +2 −2 vendored-plugins/openproject-costs/app/models/work_package/labor_costs.rb
  156. +0 −3 vendored-plugins/openproject-costs/app/views/cost_objects/_edit.html.erb
  157. +3 −3 vendored-plugins/openproject-costs/app/views/cost_objects/subform/_labor_budget_subform.html.erb
  158. +3 −3 vendored-plugins/openproject-costs/app/views/cost_objects/subform/_material_budget_subform.html.erb
  159. +3 −2 vendored-plugins/openproject-costs/app/views/cost_types/edit.html.erb
  160. +0 −64 vendored-plugins/openproject-costs/features/manage_budget.feature
  161. +26 −3 vendored-plugins/openproject-costs/lib/open_project/costs/engine.rb
  162. +1 −1 vendored-plugins/openproject-costs/lib/open_project/costs/patches/projects_controller_patch.rb
  163. +105 −107 vendored-plugins/openproject-costs/lib/open_project/costs/patches/work_package_patch.rb
  164. +1 −1 vendored-plugins/openproject-costs/lib/open_project/costs/version.rb
  165. +2 −2 vendored-plugins/openproject-costs/spec/controllers/cost_types_controller_spec.rb
  166. +22 −18 vendored-plugins/openproject-costs/spec/controllers/costlog_controller_spec.rb
  167. +1 −1 vendored-plugins/openproject-costs/spec/controllers/hourly_rates_controller_spec.rb
  168. +4 −1 vendored-plugins/openproject-costs/spec/controllers/work_packages_bulk_controller_spec.rb
  169. +2 −0 vendored-plugins/openproject-costs/spec/features/add_budget_spec.rb
  170. +70 −0 vendored-plugins/openproject-costs/spec/features/time_entries_spec.rb
  171. +6 −3 vendored-plugins/openproject-costs/spec/features/view_own_rates_spec.rb
  172. +2 −2 vendored-plugins/openproject-costs/spec/support/pages/budget_form.rb
  173. +2 −1 vendored-plugins/openproject-costs/spec/support/pages/edit_budget.rb
  174. +2 −1 vendored-plugins/openproject-costs/spec/support/pages/new_budget.rb
  175. +1 −1 vendored-plugins/openproject-documents/lib/open_project/documents/version.rb
  176. +1 −1 vendored-plugins/openproject-github_integration/lib/open_project/github_integration/version.rb
  177. +2 −2 vendored-plugins/openproject-global_roles/features/global_create_project.feature
  178. +1 −1 vendored-plugins/openproject-global_roles/lib/open_project/global_roles/version.rb
  179. +1 −1 vendored-plugins/openproject-local_avatars/lib/open_project/local_avatars/version.rb
  180. +1 −1 vendored-plugins/openproject-meeting/app/assets/stylesheets/meeting/meeting.css.erb
  181. +1 −1 vendored-plugins/openproject-meeting/lib/open_project/meeting/version.rb
  182. +1 −2 vendored-plugins/openproject-my_project_page/.travis.yml
  183. +1 −0 ...gins/openproject-my_project_page/app/assets/stylesheets/my_project_page/my_projects_overview.sass
  184. +1 −1 vendored-plugins/openproject-my_project_page/app/controllers/my_projects_overviews_controller.rb
  185. +1 −1 vendored-plugins/openproject-my_project_page/app/views/my_projects_overviews/_block.html.erb
  186. +3 −2 ...-plugins/openproject-my_project_page/app/views/my_projects_overviews/_block_textilizable.html.erb
  187. +1 −1 vendored-plugins/openproject-my_project_page/app/views/my_projects_overviews/_textilizable.html.erb
  188. +1 −1 .../openproject-my_project_page/app/views/my_projects_overviews/blocks/_project_description.html.erb
  189. +1 −1 ...ect-my_project_page/frontend/app/components/projects-overview/overview-textile-block.directive.ts
  190. +1 −1 vendored-plugins/openproject-my_project_page/lib/open_project/my_project_page/version.rb
  191. +11 −11 ...ored-plugins/openproject-my_project_page/spec/controllers/my_projects_overview_controller_spec.rb
  192. +10 −2 vendored-plugins/openproject-my_project_page/spec/features/block_editing_spec.rb
  193. +1 −1 vendored-plugins/openproject-openid_connect/lib/open_project/openid_connect/version.rb
  194. +1 −1 vendored-plugins/openproject-pdf_export/lib/open_project/pdf_export/version.rb
  195. +1 −1 vendored-plugins/openproject-reporting/lib/open_project/reporting/version.rb
  196. +1 −1 vendored-plugins/openproject-themes-dark/lib/open_project/themes/dark/version.rb
  197. +1 −1 vendored-plugins/openproject-webhooks/lib/open_project/webhooks/version.rb
  198. +1 −1 vendored-plugins/openproject-xls_export/lib/open_project/xls_export/version.rb
  199. +3 −1 vendored-plugins/openproject-xls_export/lib/open_project/xls_export/work_package_xls_export.rb
  200. +7 −4 vendored-plugins/openproject-xls_export/spec/lib/work_package_xls_export_spec.rb
  201. +36 −6 vendored-plugins/reporting_engine/lib/assets/stylesheets/reporting_engine/reporting.css.erb
  202. +1 −1 vendored-plugins/reporting_engine/lib/reporting_engine/version.rb
View
@@ -86,3 +86,4 @@ npm-debug.log*
/.sass-cache/
# Frontend debug log
/frontend/npm-debug.log*
+node_modules/
View
@@ -103,7 +103,7 @@ gem 'rack-protection', '~> 2.0.0.beta2'
gem 'rack-attack', '~> 5.0.1'
# Patch Rails HTML whitelisting for Angular curly braces
-gem 'rails-angular-xss', git: 'https://github.com/opf/rails-angular-xss', ref: '5f5622e'
+gem 'rails-angular-xss', git: 'https://github.com/opf/rails-angular-xss', ref: 'a45267d5'
gem "syck", '~> 1.0.5', require: false
gem 'gon', '~> 4.0'
@@ -224,6 +224,7 @@ group :development do
gem 'pry-doc', '~> 0.9.0'
gem 'rubocop'
+ gem 'active_record_query_trace'
end
group :development, :test do
View
@@ -94,21 +94,21 @@ GIT
GIT
remote: https://github.com/opf/openproject-translations.git
- revision: 3ec505f4e77c46baf60c3c2c34dd27ae05cd6ad9
+ revision: 12a7a422b4e4348c8bde1aee9650063dfa4c499f
branch: stable/6
specs:
- openproject-translations (6.1.0)
+ openproject-translations (6.1.1)
crowdin-api (~> 0.4.1)
mixlib-shellout (~> 2.1.0)
rails (~> 5.0.0)
rubyzip
GIT
remote: https://github.com/opf/rails-angular-xss
- revision: 5f5622ec7b592e890e0d8ae8dbf786cf61ea2d24
- ref: 5f5622e
+ revision: a45267d53d32610bad01f903e9f1b49a81b7c37b
+ ref: a45267d5
specs:
- rails-angular-xss (0.2.0.pre.pre)
+ rails-angular-xss (0.3.0.pre.pre)
rails (>= 5.0.0, < 5.1)
GIT
@@ -132,67 +132,67 @@ GIT
PATH
remote: vendored-plugins/openproject-auth_plugins
specs:
- openproject-auth_plugins (6.1.0)
+ openproject-auth_plugins (6.1.1)
omniauth (~> 1.0)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-backlogs
specs:
- openproject-backlogs (6.1.0)
+ openproject-backlogs (6.1.1)
acts_as_silent_list (~> 3.0.0)
- openproject-pdf_export (= 6.1.0)
+ openproject-pdf_export (= 6.1.1)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-costs
specs:
- openproject-costs (6.1.0)
+ openproject-costs (6.1.1)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-documents
specs:
- openproject-documents (6.1.0)
+ openproject-documents (6.1.1)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-github_integration
specs:
- openproject-github_integration (6.1.0)
- openproject-webhooks (~> 6.1.0)
+ openproject-github_integration (6.1.1)
+ openproject-webhooks (~> 6.1.1)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-global_roles
specs:
- openproject-global_roles (6.1.0)
+ openproject-global_roles (6.1.1)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-local_avatars
specs:
- openproject-local_avatars (6.1.0)
+ openproject-local_avatars (6.1.1)
rails (~> 5.0)
rmagick (~> 2.15.4)
PATH
remote: vendored-plugins/openproject-meeting
specs:
- openproject-meeting (6.1.0)
+ openproject-meeting (6.1.1)
icalendar (~> 2.3.0)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-my_project_page
specs:
- openproject-my_project_page (6.1.0)
+ openproject-my_project_page (6.1.1)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-openid_connect
specs:
- openproject-openid_connect (6.1.0)
+ openproject-openid_connect (6.1.1)
lobby_boy (~> 0.1)
omniauth-openid_connect-providers (~> 0.1)
openproject-auth_plugins (~> 6.0)
@@ -201,42 +201,42 @@ PATH
PATH
remote: vendored-plugins/openproject-pdf_export
specs:
- openproject-pdf_export (6.1.0)
+ openproject-pdf_export (6.1.1)
prawn (~> 2.1.0)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-reporting
specs:
- openproject-reporting (6.1.0)
+ openproject-reporting (6.1.1)
jquery-tablesorter (~> 1.22.3)
- openproject-costs (= 6.1.0)
+ openproject-costs (= 6.1.1)
rails (~> 5.0.0)
reporting_engine (>= 1.1.0)
PATH
remote: vendored-plugins/openproject-themes-dark
specs:
- openproject-themes-dark (6.1.0)
+ openproject-themes-dark (6.1.1)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-webhooks
specs:
- openproject-webhooks (6.1.0)
+ openproject-webhooks (6.1.1)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-xls_export
specs:
- openproject-xls_export (6.1.0)
+ openproject-xls_export (6.1.1)
rails (~> 5.0.0)
spreadsheet (~> 0.8.9)
PATH
remote: vendored-plugins/reporting_engine
specs:
- reporting_engine (6.1.0)
+ reporting_engine (6.1.1)
json
rails (~> 5.0.0)
@@ -270,6 +270,7 @@ GEM
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
+ active_record_query_trace (1.5.4)
activejob (5.0.0.1)
activesupport (= 5.0.0.1)
globalid (>= 0.3.6)
@@ -400,7 +401,7 @@ GEM
representable (~> 2.0)
uber
docile (1.1.5)
- domain_name (0.5.20161021)
+ domain_name (0.5.20161129)
unf (>= 0.0.5, < 1.0.0)
enumerable-lazy (0.0.1)
equalizer (0.0.11)
@@ -807,6 +808,7 @@ PLATFORMS
DEPENDENCIES
actionpack-xml_parser (~> 2.0.0)
+ active_record_query_trace
activemodel-serializers-xml (~> 1.0.1)
activerecord-jdbcmysql-adapter
activerecord-jdbcpostgresql-adapter
View
@@ -1,3 +1,3 @@
web: bundle exec rails server -p ${PORT:="8080"} -b ${HOST:="127.0.0.1"} --env ${RAILS_ENV:="development"}
-assets: cd frontend && npm run webpack-watch
+assets: cd frontend && RAILS_ENV=${RAILS_ENV:="development"} npm run webpack-watch
worker: bundle exec rake jobs:work
@@ -39,11 +39,13 @@ function setExpandStatus(expanderObject) {
}
function initMainMenuExpandStatus() {
+ var wrapper = jQuery('#wrapper')
+
jQuery('#main-menu .toggler').each(function(index) {
var menu_expander = jQuery(this);
var menu_item = menu_expander.closest('li').find('a.selected');
- if (menu_item.length == 1) {
+ if (menu_item.length == 1 && !wrapper.hasClass('hidden-navigation')) {
menu_expander.trigger('click');
} else {
setExpandStatus(menu_expander);
@@ -584,25 +584,6 @@ a.impaired--empty-link,
.impaired--empty-link
color: inherit
-/* Align widget boxes with description above on project overview */
-.project-overview
- margin: 0 -10px
-
-/* Legacy styles for my project page plugin version (without widget-box styles) */
-#invisible-grid
- #list-left
- .mypage-box
- margin-right: 10px
-
- #list-right
- .mypage-box
- margin-left: 10px
-
- .mypage-box
- .box-actions
- margin-top: -60px
-
-
#members_add_form
margin-bottom: 1rem
.-flex
@@ -31,11 +31,6 @@ body.controller-work_packages.action-show {
#content {
padding-left: 15px;
-
- .work-packages--split-view {
- margin-left: -5px;
- width: calc(100% + 5px);
- }
}
}
@@ -31,7 +31,7 @@ $form--field-types: (text-field, text-area, select, check-box, radio-button, ran
%input-style
border: $content-form-input-border
border-radius: 2px
- font-size: 1rem
+ font-size: 0.9rem
&:hover, &:focus
border: $content-form-input-hover-border
@@ -304,6 +304,7 @@ fieldset.form--fieldset
@include grid-visible-overflow
align-items: center
margin-bottom: 0.825rem
+ line-height: 2
&.-vertical,
.form.-vertical &
@@ -513,6 +514,7 @@ fieldset.form--fieldset
select
line-height: 100%
margin-bottom: 0rem
+ font-size: 0.9rem
&:hover, &:focus, &:active
border-color: #999
@@ -19,3 +19,9 @@
a
color: $font-color-on-primary-dark
+
+.typeahead-autocomplete
+ // Error highlighting
+ &.-error, &.-error:hover, &.-error:focus
+ background: $nm-color-error-background
+ border-color: $nm-color-error-border
@@ -61,3 +61,6 @@ h1, h2, h3, h4, tr
display: block
font-style: italic
color: #777777
+
+.user-link
+ display: inline-block
@@ -48,3 +48,8 @@
// Fix margin for inplace-edit controls
.work-package--watchers-lookup .dropdown-wrapper
margin-bottom: 50px
+
+// Position avatar-minis correctly in listing and typeahead
+#detail-panel-watchers
+ img.avatar-mini
+ float: inherit
@@ -40,6 +40,11 @@
&:hover .wp-edit-field.-error:hover
border-color: $nm-color-error-border
+//
+.wp-table--faulty-query-icon
+ color: $nm-color-error-icon
+
+
// Show details view button when hovering
.wp-table--details-link
.issue:hover &,
@@ -75,6 +75,9 @@
word-wrap: break-word
margin-bottom: 0
+ .read-value--html p
+ margin-bottom: 1em
+
.inplace-edit--read-value
&:before
vertical-align: middle
@@ -54,8 +54,9 @@ a.inplace-editing--trigger-link,
display: inline-block
span
line-height: 2
- i
- vertical-align: middle
+
+ .inplace-editing--container
+ position: relative
.work-package--details--long-field
.inplace-edit--read .inplace-edit--read-value
@@ -70,15 +71,20 @@ a.inplace-editing--trigger-link,
float: inherit
.inplace-edit--icon-wrapper
- display: inline-block
+ position: absolute
+ height: 100%
+ right: 0
text-align: center
width: 32px
- line-height: 2.5
background: $gray-light
border-left: 1px solid $inplace-edit--border-color
color: $body-font-color
visibility: hidden
- float: right
+
+ .icon-context
+ position: relative
+ // Position the icon in the middle
+ top: calc(50% - 0.5rem)
.icon-context:before
// HACK: overriding default padding here
@@ -152,8 +152,3 @@
.icon-button
cursor: not-allowed
-
-// Error highlighting
-input.wp-relations--autocomplete.-error
- background: $nm-color-error-background
- border-color: $nm-color-error-border
@@ -86,7 +86,7 @@
@import content/tables
@import content/tabular
@import content/timelines
-@import content/user_avatars
+@import content/user
@import content/preview
@import content/modal
@import content/ng_dialog
@@ -226,7 +226,8 @@ $toggler-width: 40px
-ms-text-overflow: clip
.toggler
display: none
- #sidebar
+ #sidebar,
+ .menu-children
display: none
#sidebar
Oops, something went wrong.

0 comments on commit f1c0fea

Please sign in to comment.