Skip to content

Commit 52be955

Browse files
committed
update bootstrap switch
1 parent af660b2 commit 52be955

300 files changed

Lines changed: 62730 additions & 1700 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules/
2-
nbproject/
2+
nbproject/
3+
.idea/

dist/assets/css/main.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,6 +824,10 @@ body.padTop53 {
824824
box-shadow: 1px 0px 0px #85d0e7;
825825
}
826826

827+
.box:not(.dark) header .toolbar .nav > li > a {
828+
color: #fff;
829+
}
830+
827831
.box header .toolbar {
828832
display: inline-table;
829833
float: right;
@@ -849,7 +853,6 @@ body.padTop53 {
849853

850854
.box header .toolbar .nav > li > a {
851855
padding-top: 9px;
852-
color: #fff;
853856
}
854857

855858
.box header .toolbar .nav > li > a:hover,

dist/assets/css/main.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/js/main.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,14 @@ function formGeneral() {
505505
/*----------- END timepicker CODE -------------------------*/
506506

507507
/*----------- BEGIN toggleButtons CODE -------------------------*/
508-
$('.make-switch').bootstrapSwitch();
508+
// Resets to the regular style
509+
$('#dimension-switch').bootstrapSwitch('setSizeClass', '');
510+
// Sets a mini switch
511+
$('#dimension-switch').bootstrapSwitch('setSizeClass', 'switch-mini');
512+
// Sets a small switch
513+
$('#dimension-switch').bootstrapSwitch('setSizeClass', 'switch-small');
514+
// Sets a large switch
515+
$('#dimension-switch').bootstrapSwitch('setSizeClass', 'switch-large');
509516
/*----------- END toggleButtons CODE -------------------------*/
510517

511518
/*----------- BEGIN dualListBox CODE -------------------------*/

dist/assets/js/main.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/lib/cssbeautify/cssbeautify.js

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
return (ch >= 'a' && ch <= 'z') ||
6464
(ch >= 'A' && ch <= 'Z') ||
6565
(ch >= '0' && ch <= '9') ||
66-
'-_*.:#'.indexOf(c) >= 0;
66+
'-_*.:#[]'.indexOf(c) >= 0;
6767
}
6868

6969
function appendIndent() {
@@ -89,13 +89,13 @@
8989
}
9090

9191
function closeBlock() {
92-
var ch;
92+
var last;
9393
depth -= 1;
9494
formatted = trimRight(formatted);
9595

96-
if (autosemicolon) {
97-
ch = formatted.charAt(formatted.length - 1);
98-
if (ch !== ';' && ch !== '{') {
96+
if (formatted.length > 0 && autosemicolon) {
97+
last = formatted.charAt(formatted.length - 1);
98+
if (last !== ';' && last !== '{') {
9999
formatted += ';';
100100
}
101101
}
@@ -173,14 +173,13 @@
173173
index += 1;
174174
}
175175
continue;
176-
} else {
177-
if (ch === '/' && ch2 === '*') {
178-
comment = true;
179-
formatted += ch;
180-
formatted += ch2;
181-
index += 1;
182-
continue;
183-
}
176+
}
177+
if (ch === '/' && ch2 === '*') {
178+
comment = true;
179+
formatted += ch;
180+
formatted += ch2;
181+
index += 1;
182+
continue;
184183
}
185184

186185
if (state === State.Start) {
@@ -199,7 +198,7 @@
199198
}
200199

201200
// Selector or at-rule
202-
if (isName(ch) || (ch === '[') || (ch === '@')) {
201+
if (isName(ch) || (ch === '@')) {
203202

204203
// Clear trailing whitespaces and linefeeds.
205204
str = trimRight(formatted);

dist/assets/lib/cssbeautify/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ <h3>Options:</h3>
5252
<br clear="all"/>
5353
<div class="footer"><strong>CSS Beautify</strong> is an open-source project from <a href="http://senchalabs.org">Sencha Labs</a>.<br>Check the repository at <a href="http://github.com/senchalabs/cssbeautify">github.com/senchalabs/cssbeautify</a>.</div>
5454

55-
</div>
5655
<p><a href="http://github.com/senchalabs/cssbeautify"><img style="position: absolute; top: 0; right: 0; border: 0;" src="images/ribbon.png" alt="Fork me on GitHub"></a></p>
5756
</div>
5857

dist/assets/lib/cssbeautify/test/test.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,24 @@ var tests = {
311311
]
312312
},
313313

314+
'@media directive (auto-semicolon)': {
315+
input: [
316+
'@media screen {',
317+
' menu { color: navy }',
318+
'}'
319+
],
320+
options: {
321+
autosemicolon: true
322+
},
323+
expected: [
324+
'@media screen {',
325+
' menu {',
326+
' color: navy;',
327+
' }',
328+
'}'
329+
]
330+
},
331+
314332
'URL': {
315333
input: [
316334
'menu { background-image: url(data:image/png;base64,AAAAAAA); }'

dist/assets/lib/daterangepicker/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Date Range Picker for Twitter Bootstrap
1+
# Date Range Picker for Bootstrap
22

33
![Improvely.com](http://i.imgur.com/LbAMf3D.png)
44

5-
This date range picker component for Twitter Bootstrap creates a dropdown menu from which a user can
5+
This date range picker component for Bootstrap creates a dropdown menu from which a user can
66
select a range of dates. I created it while building the UI for [Improvely](http://www.improvely.com),
77
which needed a way to select date ranges for reports.
88

@@ -15,7 +15,7 @@ into the text box. Otherwise, you can provide a custom callback function to rece
1515

1616
## Usage
1717

18-
This component relies on [Twitter Bootstrap](http://twitter.github.com/bootstrap/),
18+
This component relies on [Bootstrap](http://getbootstrap.com),
1919
[Moment.js](http://momentjs.com/) and [jQuery](http://jquery.com/).
2020

2121
Separate stylesheets are included for use with Bootstrap 2 or Bootstrap 3.
@@ -93,7 +93,7 @@ $('input[name="daterange"]').daterangepicker(
9393

9494
## License
9595

96-
This code is made available under the same license as Twitter Bootstrap. Moment.js is included in this repository
96+
This code is made available under the same license as Bootstrap. Moment.js is included in this repository
9797
for convenience. It is available under the [MIT license](http://www.opensource.org/licenses/mit-license.php).
9898

9999
--

dist/assets/lib/daterangepicker/daterangepicker-bs2.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
.daterangepicker.dropdown-menu {
1212
max-width: none;
13+
z-index: 3000;
1314
}
1415

1516
.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
@@ -231,4 +232,4 @@
231232
.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.ampmselect {
232233
width: 60px;
233234
margin-bottom: 0;
234-
}
235+
}

0 commit comments

Comments
 (0)