Skip to content

Commit

Permalink
Add icon for viewer toolbar
Browse files Browse the repository at this point in the history
  • Loading branch information
HDinger committed Dec 9, 2019
1 parent 3621ba3 commit d0dbfb3
Show file tree
Hide file tree
Showing 11 changed files with 632 additions and 578 deletions.
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.
770 changes: 388 additions & 382 deletions app/assets/stylesheets/fonts/_openproject_icon_definitions.scss

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions app/assets/stylesheets/fonts/_openproject_icon_font.lsg
Expand Up @@ -62,6 +62,7 @@
<li><span class="icon icon-copy"></span>copy</li>
<li><span class="icon icon-cost-reports"></span>cost-reports</li>
<li><span class="icon icon-cost-types"></span>cost-types</li>
<li><span class="icon icon-cursor"></span>cursor</li>
<li><span class="icon icon-custom-development"></span>custom-development</li>
<li><span class="icon icon-custom-fields"></span>custom-fields</li>
<li><span class="icon icon-cut"></span>cut</li>
Expand Down
17 changes: 17 additions & 0 deletions app/assets/stylesheets/openproject/_mixins.sass
Expand Up @@ -113,6 +113,23 @@ $scrollbar-size: 10px
&::-webkit-scrollbar-thumb
visibility: visible

@mixin no-visible-scroll-bar
// Firefox specific styles
scrollbar-color: transparent transparent
scrollbar-width: none

// Other browser styles
&::-webkit-scrollbar
height: 0
width: 0

&::-webkit-scrollbar-track
background: transparent

&::-webkit-scrollbar-thumb
background: transparent
visibility: hidden

@mixin two-column-layout
column-count: 2
column-gap: 3rem
Expand Down
22 changes: 17 additions & 5 deletions modules/ifc_models/app/assets/stylesheets/ifc_viewer/tabs.sass
Expand Up @@ -3,13 +3,11 @@
padding: 0 15px
@include varprop(color, main-menu-font-color)

label
@include varprop(color, main-menu-font-color)
@include text-shortener

// -------------------------- XEOKIT specific rules for TABS --------------------------
.xeokit-tabs
display: flex
overflow: auto
@include no-visible-scroll-bar

.xeokit-tab
flex: 1 1 auto
Expand All @@ -22,6 +20,10 @@
border-bottom: 2px solid
@include varprop(border-color, main-menu-font-color)

.xeokit-form-check
@include varprop(color, main-menu-font-color)
@include text-shortener

// As the button and the content are in the same container,
// we have to position the content absolutely.
// Otherwise we could not show the buttons next to each other.
Expand Down Expand Up @@ -63,7 +65,7 @@
.xeokit-objectsTab
ul
list-style: none
padding-left: 20px
padding-left: 30px
li
line-height: 30px
a
Expand Down Expand Up @@ -96,3 +98,13 @@

.tree-panel > ul
padding-left: 0

.xeokit-storeysTab
.xeokit-storeys > div
font-weight: bold
margin-bottom: 10px
border-bottom: 1px solid white
@include text-shortener

a
@include text-shortener
Expand Up @@ -23,6 +23,8 @@
@include icon-mixin-modules
.fa-eraser::before
@include icon-mixin-rubber
.fa-mouse-pointer::before
@include icon-mixin-cursor


// -------------------------- XEOKIT specific --------------------------
Expand Down
1 change: 1 addition & 0 deletions modules/ifc_models/lib/open_project/ifc_models/engine.rb
Expand Up @@ -62,6 +62,7 @@ class Engine < ::Rails::Engine
{ controller: '/ifc_models/ifc_models', action: 'show_defaults' },
caption: :'ifc_models.label_ifc_models',
param: :project_id,
after: :work_packages,
icon: 'icon2 icon-ifc')

menu.push :ifc_viewer_panels,
Expand Down
12 changes: 12 additions & 0 deletions vendor/openproject-icon-font/src/cursor.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d0dbfb3

Please sign in to comment.