diff --git a/production/calendar.html b/production/calendar.html index 0caf55eb..82d2a201 100755 --- a/production/calendar.html +++ b/production/calendar.html @@ -369,98 +369,95 @@ - - - - - - - - - - - -
-
- - - + + + + + + + + +
+
+ + +
diff --git a/production/chartjs.html b/production/chartjs.html index bd7768d5..86f032ae 100755 --- a/production/chartjs.html +++ b/production/chartjs.html @@ -501,23 +501,20 @@
- - - - - - - + + + +
diff --git a/production/chartjs2.html b/production/chartjs2.html index 9458a614..ea7eea52 100755 --- a/production/chartjs2.html +++ b/production/chartjs2.html @@ -493,25 +493,22 @@
-

- - - - - - + + + +
diff --git a/production/contacts.html b/production/contacts.html index fa56bfea..b01911c4 100755 --- a/production/contacts.html +++ b/production/contacts.html @@ -360,7 +360,7 @@
-
+

Digital Strategist

@@ -391,14 +391,15 @@
- +
-
+

Digital Strategist

@@ -429,14 +430,15 @@
- +
-
+

Digital Strategist

@@ -467,14 +469,15 @@
- +
-
+

Digital Strategist

@@ -505,14 +508,15 @@
- +
-
+

Digital Strategist

@@ -543,14 +547,15 @@
- +
-
+

Digital Strategist

@@ -581,14 +586,15 @@
- +
-
+

Digital Strategist

@@ -619,14 +625,15 @@
- +
-
+

Digital Strategist

@@ -657,14 +664,15 @@
- +
-
+

Digital Strategist

@@ -695,33 +703,31 @@
- +
-
- - -
-
- Gentelella - Bootstrap Admin Template by Colorlib -
-
-
- -
-
+ +
+
+ Gentelella - Bootstrap Admin Template by Colorlib +
+
+
+ +
diff --git a/production/css/custom.css b/production/css/custom.css index 818f5360..75cc5992 100755 --- a/production/css/custom.css +++ b/production/css/custom.css @@ -1,7 +1,6 @@ body.nav-sm .container.body .left_col { width: 70px; padding: 0; - height: 100%; z-index: 200; position: absolute; } @@ -664,17 +663,19 @@ li.current-page a { display: block; padding: 4px 6px; } -.x_content canvas {} footer { background: #fff; padding: 15px 20px; - margin: 0 -10px; + display: block; } @media (min-width: 768px) { footer { - margin: 0 -20px; + margin-left: 230px; } } +.nav-sm footer { + margin-left: 70px ; +} .tile-stats.sparkline { padding: 10px; text-align: center; diff --git a/production/e_commerce.html b/production/e_commerce.html index 86498804..0bfe316a 100755 --- a/production/e_commerce.html +++ b/production/e_commerce.html @@ -494,20 +494,18 @@
- - - - - - + + + +
diff --git a/production/echarts.html b/production/echarts.html index 44537e17..276761cf 100755 --- a/production/echarts.html +++ b/production/echarts.html @@ -677,30 +677,24 @@
-
-
- - - - - - - - + + + +
diff --git a/production/empty.html b/production/empty.html index 06b052b3..a47aa1a3 100644 --- a/production/empty.html +++ b/production/empty.html @@ -134,7 +134,7 @@
-
+

Empty no content

@@ -152,20 +152,18 @@

- - -
-
- Gentelella - Bootstrap Admin Template by Colorlib -
-
-
-
+ +
+
+ Gentelella - Bootstrap Admin Template by Colorlib +
+
+
+
-
diff --git a/production/form.html b/production/form.html index 049cbf44..7856eb40 100755 --- a/production/form.html +++ b/production/form.html @@ -1373,22 +1373,20 @@
-
- - - - - + + + + diff --git a/production/form_advanced.html b/production/form_advanced.html index e4b719e8..c7bf14d0 100755 --- a/production/form_advanced.html +++ b/production/form_advanced.html @@ -1794,19 +1794,18 @@ - - - - - + + + +
diff --git a/production/form_buttons.html b/production/form_buttons.html index 22eea710..d18c24f4 100755 --- a/production/form_buttons.html +++ b/production/form_buttons.html @@ -773,24 +773,21 @@
- - - - - - - + + + +
diff --git a/production/form_upload.html b/production/form_upload.html index 1a0b1a94..8c5222e7 100755 --- a/production/form_upload.html +++ b/production/form_upload.html @@ -361,10 +361,8 @@
-

Drag multiple files to the box below for multi upload or click to select files. This is for demonstration purposes only, the files are not uploaded to any server.

-


@@ -374,20 +372,18 @@
- - - - - - + + + +
diff --git a/production/form_validation.html b/production/form_validation.html index 8cb65c33..7f1376cc 100755 --- a/production/form_validation.html +++ b/production/form_validation.html @@ -446,26 +446,23 @@
- - - - - - - + + + +
diff --git a/production/form_wizards.html b/production/form_wizards.html index 53d9bc29..8e6225d6 100755 --- a/production/form_wizards.html +++ b/production/form_wizards.html @@ -618,30 +618,24 @@

- - - - - - - - - - + + + +
diff --git a/production/general_elements.html b/production/general_elements.html index 6c72a3f7..c8cb562f 100755 --- a/production/general_elements.html +++ b/production/general_elements.html @@ -1587,80 +1587,77 @@
  • - img - + img + - John Smith - 3 mins ago + John Smith + 3 mins ago - Film festivals used to be do-or-die moments for movie makers. They were where you met the producers that - + Film festivals used to be do-or-die moments for movie makers. They were where you met the producers that +
  • - img - + img + - John Smith - 3 mins ago + John Smith + 3 mins ago - Film festivals used to be do-or-die moments for movie makers. They were where you met the producers that - + Film festivals used to be do-or-die moments for movie makers. They were where you met the producers that +
  • - img - + img + - John Smith - 3 mins ago + John Smith + 3 mins ago - Film festivals used to be do-or-die moments for movie makers. They were where you met the producers that - + Film festivals used to be do-or-die moments for movie makers. They were where you met the producers that +
  • - img - + img + - John Smith - 3 mins ago + John Smith + 3 mins ago - Film festivals used to be do-or-die moments for movie makers. They were where you met the producers that - + Film festivals used to be do-or-die moments for movie makers. They were where you met the producers that +
    • -
    - - - - - - + + + +
    diff --git a/production/glyphicons.html b/production/glyphicons.html index c13f274c..d406facb 100755 --- a/production/glyphicons.html +++ b/production/glyphicons.html @@ -1750,28 +1750,23 @@ </div>
    - - - - - - - - - + + + +
    diff --git a/production/icons.html b/production/icons.html index a38b832c..e00f3455 100755 --- a/production/icons.html +++ b/production/icons.html @@ -2358,31 +2358,25 @@
    fa-wheelchair
    -
    - - - - - - - - - + + + + diff --git a/production/inbox.html b/production/inbox.html index 814d1d7c..30426367 100755 --- a/production/inbox.html +++ b/production/inbox.html @@ -564,20 +564,18 @@ - - - - - - + + + +
    diff --git a/production/index.html b/production/index.html index af45bca7..a964cb21 100755 --- a/production/index.html +++ b/production/index.html @@ -921,8 +921,7 @@
    - - +
    @@ -950,25 +949,19 @@
    Monday, 07:30 AM F - C - + C
    - - - - +
    -

    Texas -
    Partly Cloudy Day -

    +

    Texas
    Partly Cloudy Day

    @@ -977,22 +970,16 @@

    23

    -
    +

    Mon

    25

    - - - - - -
    15 - km/h -
    + +
    15 km/h
    @@ -1000,9 +987,7 @@

    Tue

    25

    -
    12 - km/h -
    +
    12 km/h
    @@ -1010,9 +995,7 @@

    Wed

    27

    -
    14 - km/h -
    +
    14 km/h
    @@ -1020,9 +1003,7 @@

    Thu

    28

    -
    15 - km/h -
    +
    15 km/h
    @@ -1030,9 +1011,7 @@

    Fri

    28

    -
    11 - km/h -
    +
    11 km/h
    @@ -1040,9 +1019,7 @@

    Sat

    26

    -
    10 - km/h -
    +
    10 km/h
    @@ -1055,19 +1032,18 @@ - - - - - + + + +
    diff --git a/production/index2.html b/production/index2.html index 6d501dbe..6a517dff 100755 --- a/production/index2.html +++ b/production/index2.html @@ -785,21 +785,18 @@
    - - - - - + + + + - -
    diff --git a/production/index3.html b/production/index3.html index 4697c49b..7515412a 100755 --- a/production/index3.html +++ b/production/index3.html @@ -880,22 +880,18 @@
    - - - - - - + + + + - -
    diff --git a/production/invoice.html b/production/invoice.html index d6a0e265..2704ec39 100755 --- a/production/invoice.html +++ b/production/invoice.html @@ -521,20 +521,18 @@
    - - - - - - + + + +
    diff --git a/production/js/custom.js b/production/js/custom.js index a7487ff0..e7ddc450 100755 --- a/production/js/custom.js +++ b/production/js/custom.js @@ -30,20 +30,24 @@ $(function () { else { if ($(this).is('.active')) { $(this).removeClass('active'); - $('ul', this).slideUp(); + $('ul', this).slideUp(function() { + setContentHeight(); + }); } else { $SIDEBAR_MENU.find('li').removeClass('active'); $SIDEBAR_MENU.find('li ul').slideUp(); $(this).addClass('active'); - $('ul', this).slideDown(); + $('ul', this).slideDown(function() { + setContentHeight(); + }); } } }); $MENU_TOGGLE.on('click', function() { if ($BODY.hasClass('nav-md')) { - $BODY.removeClass('nav-md').addClass('nav-sm'); + $BODY.removeClass('nav-md').addClass('nav-sm', 1000); $LEFT_COL.removeClass('scroll-view').removeAttr('style'); $SIDEBAR_FOOTER.hide(); @@ -51,7 +55,7 @@ $(function () { $SIDEBAR_MENU.find('li.active').addClass('active-sm').removeClass('active'); } } else { - $BODY.removeClass('nav-sm').addClass('nav-md'); + $BODY.removeClass('nav-sm').addClass('nav-md', 1000); $SIDEBAR_FOOTER.show(); if ($SIDEBAR_MENU.find('li').hasClass('active-sm')) { @@ -65,7 +69,29 @@ $(function () { $SIDEBAR_MENU.find('a').filter(function () { return this.href == URL; - }).parent('li').addClass('current-page').parent('ul').slideDown().parent().addClass('active'); + }).parent('li').addClass('current-page').parent('ul').slideDown(function() { + setContentHeight(); + }).parent().addClass('active'); + + // recompute content when resizing + $(window).smartresize(function(){ + setContentHeight(); + }); + + // TODO: This is some kind of easy fix, maybe we can improve this + var setContentHeight = function () { + // reset height + $RIGHT_COL.css('min-height', $(window).height()); + + var bodyHeight = $BODY.height(), + leftColHeight = $LEFT_COL.height() + $SIDEBAR_FOOTER.height(), + contentHeight = bodyHeight < leftColHeight ? leftColHeight : bodyHeight; + + // normalize content + contentHeight -= $NAV_MENU.height() + $FOOTER.height(); + + $RIGHT_COL.css('min-height', contentHeight); + }; }); // Panel toolbox @@ -95,12 +121,6 @@ $(function () { }); }); -// Right column height -$(".right_col").css("min-height", $(window).height()); -$(window).resize(function () { - $(".right_col").css("min-height", $(window).height()); -}); - // Tooltip $(function () { $('[data-toggle="tooltip"]').tooltip(); @@ -324,4 +344,40 @@ if (typeof NProgress != 'undefined') { $(window).load(function () { NProgress.done(); }); -} \ No newline at end of file +} + +/** + * Resize function without multiple trigger + * + * Usage: + * $(window).smartresize(function(){ + * // code here + * }); + */ +(function($,sr){ + // debouncing function from John Hann + // http://unscriptable.com/index.php/2009/03/20/debouncing-javascript-methods/ + var debounce = function (func, threshold, execAsap) { + var timeout; + + return function debounced () { + var obj = this, args = arguments; + function delayed () { + if (!execAsap) + func.apply(obj, args); + timeout = null; + } + + if (timeout) + clearTimeout(timeout); + else if (execAsap) + func.apply(obj, args); + + timeout = setTimeout(delayed, threshold || 100); + }; + }; + + // smartresize + jQuery.fn[sr] = function(fn){ return fn ? this.bind('resize', debounce(fn)) : this.trigger(sr); }; + +})(jQuery,'smartresize'); \ No newline at end of file diff --git a/production/map.html b/production/map.html index 402aa131..8863b72d 100755 --- a/production/map.html +++ b/production/map.html @@ -1,3 +1,4 @@ + diff --git a/production/media_gallery.html b/production/media_gallery.html index 56919e0e..e2d52196 100755 --- a/production/media_gallery.html +++ b/production/media_gallery.html @@ -560,20 +560,18 @@
    - - - - - - + + + +
    diff --git a/production/morisjs.html b/production/morisjs.html index 8ef84ea2..85dad3c4 100755 --- a/production/morisjs.html +++ b/production/morisjs.html @@ -503,19 +503,18 @@
    - - - - - + + + +
    @@ -536,8 +535,6 @@ - - diff --git a/production/other_charts.html b/production/other_charts.html index fae96386..5516b1f9 100755 --- a/production/other_charts.html +++ b/production/other_charts.html @@ -468,19 +468,18 @@
    - - - - - + + + +
    diff --git a/production/page_404.html b/production/page_404.html index bc52d2f4..cf3aa632 100755 --- a/production/page_404.html +++ b/production/page_404.html @@ -38,11 +38,8 @@ -
    -
    -
    @@ -68,9 +65,7 @@
    -
    -
    diff --git a/production/page_500.html b/production/page_500.html index eefda673..4cf27976 100755 --- a/production/page_500.html +++ b/production/page_500.html @@ -38,11 +38,8 @@ -
    -
    -
    @@ -68,9 +65,7 @@
    -
    -
    diff --git a/production/plain_page.html b/production/plain_page.html index 131e855e..41f624d6 100755 --- a/production/plain_page.html +++ b/production/plain_page.html @@ -1,368 +1,367 @@ + + + + + + - - - - - - + Gentallela Alela! | - Gentallela Alela! | + - + - + + - - + + + - - - + + + + + + + - + - - - - - - +
    - +
    -
    +
    +
    - -
    - -
    -
    - -
    - Gentellela Alela! -
    -
    - - -
    -
    - ... +
    + Gentellela Alela!
    -
    - Welcome, -

    John Doe

    +
    + + +
    +
    + ... +
    +
    + Welcome, +

    John Doe

    +
    -
    - + -
    +
    - - -
    - - -
    - -
    -
    +
    +

    Live On

    +
    + +
    + + + +
    + + + + + + + + + + + + +
    + +
    +
    + + +
    + +
    +
    - - - - - - -
    - -
    - - - -
    -
    -
    -
    -

    Plain Page

    -
    - -
    -
    -
    - - - - -
    -
    -
    -
    -
    - -
    - -
    -
    -
    -

    Plain Page

    - -
    + + + + + + +
    + +
    + + + +
    +
    +
    +
    +

    Plain Page

    +
    + +
    +
    +
    + + + + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +

    Plain Page

    + +
    +
    +
    @@ -373,30 +372,24 @@
    -
    -
    +
    +
      +
      +
      +
      -
      -
        -
      -
      -
      -
      + - + + + + - - - - + - - - - - - - - + + + + \ No newline at end of file diff --git a/production/pricing_tables.html b/production/pricing_tables.html index d7a65c81..f1f29e05 100755 --- a/production/pricing_tables.html +++ b/production/pricing_tables.html @@ -501,27 +501,24 @@
      -
      -
      - - -
      -
      - Gentelella - Bootstrap Admin Template by Colorlib -
      -
      -
      -
      -
      + + + +
      diff --git a/production/profile.html b/production/profile.html index 4d1cd029..27e9138d 100755 --- a/production/profile.html +++ b/production/profile.html @@ -663,20 +663,18 @@
      - - - - - - + + + +
      diff --git a/production/project_detail.html b/production/project_detail.html index 97a0bebf..38ae2523 100755 --- a/production/project_detail.html +++ b/production/project_detail.html @@ -500,20 +500,18 @@
      - - - - - - + + + +
      diff --git a/production/projects.html b/production/projects.html index 20ca6fa2..ac225855 100755 --- a/production/projects.html +++ b/production/projects.html @@ -706,20 +706,18 @@
      - - - - - - + + + +
      diff --git a/production/sign_up.html b/production/sign_up.html index 07d01221..e926ebe8 100755 --- a/production/sign_up.html +++ b/production/sign_up.html @@ -1,3 +1,4 @@ + @@ -25,25 +26,19 @@ + + - + + + - -
      - -
      -
      @@ -269,17 +264,10 @@
      -
      - - - -
      - -
      diff --git a/production/tables.html b/production/tables.html index bc3509ee..909657e8 100755 --- a/production/tables.html +++ b/production/tables.html @@ -770,18 +770,17 @@
      - - - - - + + + + diff --git a/production/tables_dynamic.html b/production/tables_dynamic.html index f11d5a21..d5f516c9 100755 --- a/production/tables_dynamic.html +++ b/production/tables_dynamic.html @@ -3035,18 +3035,17 @@ - - - - - + + + + diff --git a/production/typography.html b/production/typography.html index bd2da1da..ee625b4b 100755 --- a/production/typography.html +++ b/production/typography.html @@ -393,29 +393,25 @@ Info Warning Danger - 42 - - - - - - - + + + +
      diff --git a/production/widgets.html b/production/widgets.html index 00694272..6b9d2436 100755 --- a/production/widgets.html +++ b/production/widgets.html @@ -923,21 +923,18 @@
      - - - - - + + + -