Skip to content

Commit 542b9a1

Browse files
committed
fixed fullscreen
1 parent 98d6e3f commit 542b9a1

File tree

7 files changed

+27
-29
lines changed

7 files changed

+27
-29
lines changed

dist/assets/css/main.css

+4-3
Original file line numberDiff line numberDiff line change
@@ -847,6 +847,10 @@ body.padTop53 {
847847
height: 6px;
848848
margin: 16px 4px;
849849
}
850+
.full-screen-box {
851+
height: 100% !important;
852+
width: 100% !important;
853+
}
850854
.box.danger .dropdown-menu > li > a:hover,
851855
.box.danger .dropdown-menu > li > a:focus {
852856
background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
@@ -893,9 +897,6 @@ body.padTop53 {
893897
margin-left: -10px;
894898
margin-right: -10px;
895899
}
896-
.box .body.full-screen-box {
897-
height: 100% !important;
898-
}
899900
.body.collapse:not(.in) {
900901
padding: 0;
901902
}

dist/assets/css/main.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/js/main.js

+5-8
Original file line numberDiff line numberDiff line change
@@ -776,15 +776,12 @@ toggleFullScreen.init();
776776
var boxFullScreen = {
777777
init: function() {
778778
if ((window.screenfull !== undefined) && screenfull.enabled) {
779-
var $toggleButton = $('.full-box'),
780-
$toggledPanel = $toggleButton.parents('.box')[0],
781-
$toggledPanelBody = $toggleButton.parents('.box').children('.body'),
782-
$toggleButtonImage = $toggleButton.children('i');
783-
784-
$toggleButton.on('click', function(e) {
779+
$('.full-box').on('click', function(e) {
780+
var $toggledPanel = $(this).parents('.box')[0];
785781
screenfull.toggle($toggledPanel);
786-
$toggledPanelBody.toggleClass('full-screen-box');
787-
$toggleButtonImage.toggleClass('fa-compress');
782+
$(this).parents('.box').toggleClass('full-screen-box');
783+
$(this).parents('.box').children('.body').toggleClass('full-screen-box');
784+
$(this).children('i').toggleClass('fa-compress');
788785
e.preventDefault();
789786
});
790787
} else {

dist/assets/js/main.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.html

+6-4
Original file line numberDiff line numberDiff line change
@@ -369,11 +369,11 @@ <h3 id="download">Download</h3>
369369
<p>Bootstrap 2.3.2
370370
<a href="https://github.com/onokumus/Bootstrap-Admin-Template/archive/v1.2.zip">V.1.2</a>
371371
ready for use</p>
372-
<p>Bootstrap 3.0.3
373-
<a href="https://github.com/onokumus/Bootstrap-Admin-Template/archive/master.zip">V2.1.3</a>
372+
<p>Bootstrap 3.1.1
373+
<a href="https://github.com/onokumus/Bootstrap-Admin-Template/archive/master.zip">V2.1.4</a>
374374
ready <code>dist</code> folder your use</p>
375375
<h3 id="building">Building</h3>
376-
<h4 id="2-1-3-version">2.1.3 Version</h4>
376+
<h4 id="2-1-4-version">2.1.4 Version</h4>
377377
<p>required
378378
<a href="http://nodejs.org/">node.js</a> &amp;
379379
<a href="http://bower.io/">bower</a> &amp;
@@ -395,7 +395,7 @@ <h4 id="1-2-version">1.2 Version</h4>
395395
$ git submodule update
396396
$ open index.html</code></pre>
397397
<h3 id="demo">Demo</h3>
398-
<h4 id="for-2-1-3-version">For 2.1.3 version</h4>
398+
<h4 id="for-2-1-4-version">For 2.1.4 version</h4>
399399
<p>
400400
<a href="http://demo.onokumus.com/metis/">http://demo.onokumus.com/metis/</a>
401401
</p>
@@ -405,6 +405,7 @@ <h4 id="for-1-2-version">For 1.2 version</h4>
405405
</p>
406406
<h3 id="release-history">Release History</h3>
407407
<ul>
408+
<li>2014-02-16 v2.1.4 update bootsrap 3.1.1 &amp;&amp; add screenfull.js &amp;&amp; fixed #menu</li>
408409
<li>2014-01-19 v2.1.3 add suitcss &#39;s flex-embed component</li>
409410
<li>2013-11-30 v2.1.2 create menu plugin, rewrite menu.less</li>
410411
<li>2013-10-28 v2.1.1 add bower</li>
@@ -459,6 +460,7 @@ <h3 id="credits">Credits</h3>
459460
<li> <a href="http://validval.frebsite.nl/">jquery.validVal</a> </li>
460461
<li> <a href="http://jhollingworth.github.io/bootstrap-wysihtml5/">bootstrap-wysihtml5</a> </li>
461462
<li> <a href="https://github.com/suitcss/flex-embed">Suitcss Flex-Embed</a> </li>
463+
<li> <a href="https://github.com/sindresorhus/screenfull.js">screenfull.js</a> </li>
462464
</ul>
463465
<h3 id="licensing">Licensing</h3>
464466
<p>Bootstrap Admin template is open-sourced software licensed under the

src/assets/js/app/fullscreen.js

+5-8
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@ toggleFullScreen.init();
1818
var boxFullScreen = {
1919
init: function() {
2020
if ((window.screenfull !== undefined) && screenfull.enabled) {
21-
var $toggleButton = $('.full-box'),
22-
$toggledPanel = $toggleButton.parents('.box')[0],
23-
$toggledPanelBody = $toggleButton.parents('.box').children('.body'),
24-
$toggleButtonImage = $toggleButton.children('i');
25-
26-
$toggleButton.on('click', function(e) {
21+
$('.full-box').on('click', function(e) {
22+
var $toggledPanel = $(this).parents('.box')[0];
2723
screenfull.toggle($toggledPanel);
28-
$toggledPanelBody.toggleClass('full-screen-box');
29-
$toggleButtonImage.toggleClass('fa-compress');
24+
$(this).parents('.box').toggleClass('full-screen-box');
25+
$(this).parents('.box').children('.body').toggleClass('full-screen-box');
26+
$(this).children('i').toggleClass('fa-compress');
3027
e.preventDefault();
3128
});
3229
} else {

src/assets/less/main/components/box.less

+5-4
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,10 @@
130130
}
131131
}
132132

133-
133+
.full-screen-box {
134+
height: 100% !important;
135+
width: 100% !important;
136+
}
134137

135138
.box {
136139
&.danger {
@@ -174,9 +177,7 @@
174177
margin-left: -10px;
175178
margin-right: -10px;
176179
}
177-
&.full-screen-box {
178-
height: 100% !important;
179-
}
180+
180181
}
181182
.body.collapse:not(.in) {
182183
padding: 0;

0 commit comments

Comments
 (0)