Skip to content

Commit 067f481

Browse files
committed
Font-awesome 5 icons not always visible in submenu (fixes swisnl#659)
1 parent e16cd11 commit 067f481

8 files changed

+19
-12
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
## Changelog ##
22

3+
### 2.7.1
4+
5+
#### Fixed
6+
7+
* A context menu appears outside the screen Under certain conditions (thanks @so-susa)
8+
* No font-awesome icons visible in submenu ([Issue #659](https://github.com/swisnl/jQuery-contextMenu/issues/659)) thanks @betafritz and @klues
9+
310
### 2.7.0
411

512
#### Documentation

dist/jquery.contextMenu.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Licensed under
1313
* MIT License http://www.opensource.org/licenses/mit-license
1414
*
15-
* Date: 2018-07-12T09:06:55.859Z
15+
* Date: 2018-10-02T14:29:27.829Z
1616
*/
1717
@-webkit-keyframes cm-spin {
1818
0% {
@@ -54,8 +54,8 @@
5454
font-style: normal;
5555
font-weight: normal;
5656

57-
src: url("font/context-menu-icons.eot?36hmp");
58-
src: url("font/context-menu-icons.eot?36hmp#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?36hmp") format("woff2"), url("font/context-menu-icons.woff?36hmp") format("woff"), url("font/context-menu-icons.ttf?36hmp") format("truetype");
57+
src: url("font/context-menu-icons.eot?2gb3e");
58+
src: url("font/context-menu-icons.eot?2gb3e#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?2gb3e") format("woff2"), url("font/context-menu-icons.woff?2gb3e") format("woff"), url("font/context-menu-icons.ttf?2gb3e") format("truetype");
5959
}
6060

6161
.context-menu-icon-add:before {
@@ -168,7 +168,7 @@
168168
left: .5em;
169169
color: #2980b9;
170170
}
171-
.context-menu-icon.context-menu-icon--fa5.context-menu-hover i, .context-menu-icon.context-menu-icon--fa5.context-menu-hover svg {
171+
.context-menu-icon.context-menu-icon--fa5.context-menu-hover > i, .context-menu-icon.context-menu-icon--fa5.context-menu-hover > svg {
172172
color: #fff;
173173
}
174174
.context-menu-icon.context-menu-icon--fa5.context-menu-disabled i, .context-menu-icon.context-menu-icon--fa5.context-menu-disabled svg {

dist/jquery.contextMenu.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Licensed under
1212
* MIT License http://www.opensource.org/licenses/mit-license
1313
*
14-
* Date: 2018-07-12T09:06:55.786Z
14+
* Date: 2018-10-02T14:29:27.777Z
1515
*/
1616

1717
// jscs:disable
@@ -1578,7 +1578,7 @@
15781578
});
15791579
} else if(($menuOffset.top < winScrollTop) || ($menuOffset.top + menuHeight > winScrollTop + winHeight)){
15801580
$menu.css({
1581-
'top': '0px'
1581+
'top': winScrollTop + 'px'
15821582
});
15831583
}
15841584
}

dist/jquery.contextMenu.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)