Skip to content

Commit 88b73b6

Browse files
author
pipeline
committed
feature(EJ2-4392): provided support for bootstrap theme to master branch
1 parent 8a684f0 commit 88b73b6

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<ul id="themelist" class="options">
4141
<li class="e-list" id="material"><span class='switch-text'>Material</span><span class='switch-icon material'></span></a></li>
4242
<li class="e-list" id="fabric"><span class='switch-text'>Fabric</span><span class='switch-icon fabric'></span></a></li>
43+
<li class="e-list" id="bootstrap"><span class='switch-text'>Bootstrap</span><span class='switch-icon bootstrap'></span></a></li>
4344
</ul>
4445
</div>
4546
</div>

src/common/sb.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const idRegex: RegExp = /\{0\}/g;
2222
const sourceHeader: string = '<li class="nav-item {2}" role="presentation"><a class="nav-link" target-content="{0}" role="tab" {1}>{0}</a></li>';
2323
const sourcecontent: string = '<div class="tab-pane {2}" id="{0}" role="tabpanel" {4}><pre><code class="{3}">{1}</code></pre></div>';
2424
const plnk: string = '<li class="plnk" style="float:right"><a id="plnkr">Open in Plunker</a></li>';
25-
const themes: string[] = ['material', 'fabric'];
25+
const themes: string[] = ['material', 'fabric', 'bootstrap'];
2626
let selectedTheme: string;
2727
let themeFlag: boolean = true;
2828
declare let hljs: any;

src/datepicker/special-plnkr.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.
17.7 KB
Loading

styles/images/SB_icon/bootstrap.png

662 Bytes
Loading

styles/index.css

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ body {
99
font-family: "Roboto","Segoe UI","GeezaPro","DejaVu Serif";
1010
}
1111

12-
body * {
13-
user-select: none;
14-
}
15-
1612
.h-scroll {
1713
overflow-x: auto;
1814
-webkit-overflow-scrolling: touch;
@@ -67,6 +63,9 @@ control-content {
6763
.switch-icon.fabric {
6864
background: url(images/SB_icon/fabric.png) no-repeat 100% 100%;
6965
}
66+
.switch-icon.bootstrap {
67+
background: url(images/SB_icon/bootstrap.png) no-repeat 100% 100%;
68+
}
7069
.switch-icon {
7170
display: block;
7271
float: right;

0 commit comments

Comments
 (0)