Skip to content

Commit

Permalink
Merge fa56d0f into 0a99807
Browse files Browse the repository at this point in the history
  • Loading branch information
lqez committed Nov 19, 2018
2 parents 0a99807 + fa56d0f commit b124acd
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 3 deletions.
39 changes: 39 additions & 0 deletions examples/bs2.html
@@ -0,0 +1,39 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>Summernote Lite - Bootstrap 2</title>

<!-- include jquery -->
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js"></script>

<!-- include libs stylesheets -->
<link rel="stylesheet" href="//stackpath.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css">
<script src="//stackpath.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>

<!-- include summernote -->
<link rel="stylesheet" href="../dist/summernote-lite.css">
<script type="text/javascript" src="../dist/summernote-lite.js"></script>

<link rel="stylesheet" href="example.css">
<script type="text/javascript">
$(document).ready(function() {
$('.summernote').summernote({
height: 300,
tabsize: 2
});
});
</script>
</head>
<body>
<div class="container">
<h1>Summernote Lite with Bootstrap 2</h1>
<p>
<span class="label label-primary">jQuery v3.3.1</span>
<span class="label label-info">Bootstrap v2.3.2</span>
</p>
<div class="summernote"></div>
</div>
</body>
</html>
5 changes: 4 additions & 1 deletion src/js/lite/ui/DropdownUI.js
Expand Up @@ -8,7 +8,10 @@ class DropdownUI {
}

setEvent() {
this.$button.on('click', this.toggle.bind(this));
this.$button.on('click', (e) => {
this.toggle();
e.stopImmediatePropagation();
});
}

clear() {
Expand Down
4 changes: 2 additions & 2 deletions src/less/summernote-lite.less
Expand Up @@ -338,7 +338,7 @@
}

.note-color-all {
.dropdown-menu {
.note-dropdown-menu {
min-width: 346px;
}
}
Expand Down Expand Up @@ -400,7 +400,7 @@
}
}

.note-para {
.note-style {
.note-dropdown-menu {
min-width: 216px;
padding: 5px;
Expand Down

0 comments on commit b124acd

Please sign in to comment.