Skip to content

Commit

Permalink
Merge pull request #7876 from opf/bim/ifc-models-module
Browse files Browse the repository at this point in the history
Bim: IFC Models module
  • Loading branch information
ulferts committed Jan 24, 2020
2 parents 20f3e75 + cb1693e commit 2528cf4
Show file tree
Hide file tree
Showing 91 changed files with 9,748 additions and 607 deletions.
8 changes: 8 additions & 0 deletions Gemfile.lock
Expand Up @@ -151,6 +151,13 @@ PATH
specs:
grids (1.0.0)

PATH
remote: modules/ifc_models
specs:
openproject-ifc_models (1.0.0)
activerecord-import
rubyzip (~> 1.2)

PATH
remote: modules/ldap_groups
specs:
Expand Down Expand Up @@ -1036,6 +1043,7 @@ DEPENDENCIES
openproject-documents!
openproject-github_integration!
openproject-global_roles!
openproject-ifc_models!
openproject-ldap_groups!
openproject-meeting!
openproject-openid_connect!
Expand Down
1 change: 1 addition & 0 deletions Gemfile.modules
Expand Up @@ -47,4 +47,5 @@ group :opf_plugins do

gem 'openproject-bim_seeder', path: 'modules/bim_seeder', require: !!(ENV['OPENPROJECT_EDITION'] == 'bim')
gem 'openproject-bcf', path: 'modules/bcf', require: !!(ENV['OPENPROJECT_EDITION'] == 'bim')
gem 'openproject-ifc_models', path: 'modules/ifc_models', require: !!(ENV['OPENPROJECT_EDITION'] == 'bim')
end
385 changes: 194 additions & 191 deletions app/assets/fonts/openproject_icon/openproject-icon-font.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/fonts/openproject_icon/openproject-icon-font.ttf
Binary file not shown.
Binary file modified app/assets/fonts/openproject_icon/openproject-icon-font.woff
Binary file not shown.
Binary file modified app/assets/fonts/openproject_icon/openproject-icon-font.woff2
Binary file not shown.
6 changes: 3 additions & 3 deletions app/assets/stylesheets/content/_table.lsg
Expand Up @@ -356,7 +356,7 @@ Use `-no-ellipse` class to a TD element to disable the text-overflow applied usu
<td>Member</td>
<td>active</td>
<td class="buttons">
<a href="#" class="icon icon-edit" title="Edit"></i></a>
<a href="#" class="icon icon-edit" title="Edit"></a>
<a href="#" class="icon icon-delete" title="Remove"></a>
</td>
</tr>
Expand All @@ -367,7 +367,7 @@ Use `-no-ellipse` class to a TD element to disable the text-overflow applied usu
<td>Member</td>
<td>active</td>
<td class="buttons">
<a href="#" class="icon icon-edit" title="Edit"></i></a>
<a href="#" class="icon icon-edit" title="Edit"></a>
<a href="#" class="icon icon-delete" title="Remove"></a>
</td>
</tr>
Expand All @@ -378,7 +378,7 @@ Use `-no-ellipse` class to a TD element to disable the text-overflow applied usu
<td>Admin</td>
<td>active</td>
<td class="buttons">
<a href="#" class="icon icon-edit" title="Edit"></i></a>
<a href="#" class="icon icon-edit" title="Edit"></a>
<a href="#" class="icon icon-delete" title="Remove"></a>
</td>
</tr>
Expand Down
Expand Up @@ -17,7 +17,8 @@
// Substract header height and the project menu item ("view all")
max-height: calc(100vh - #{$header-height} - 42px)

.project-search-results
.project-search-results,
.project-search-results.dropdown
position: relative
overflow: hidden
max-height: inherit
Expand Down

0 comments on commit 2528cf4

Please sign in to comment.