From 54625aa79cab3327da81a0f4b7264464c1ec4fd8 Mon Sep 17 00:00:00 2001 From: albert Date: Sun, 17 Feb 2013 22:10:53 -0500 Subject: [PATCH] added resizing of content window --- app/assets/javascripts/common.js | 2 +- app/assets/javascripts/layout.js | 29 +++++++++++++++++++ .../stylesheets/common/main_layout.css.scss | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/layout.js diff --git a/app/assets/javascripts/common.js b/app/assets/javascripts/common.js index a2ae4d886..8904f70e0 100644 --- a/app/assets/javascripts/common.js +++ b/app/assets/javascripts/common.js @@ -2,7 +2,7 @@ $(function() { // Table striping $(".striped tbody tr:even").addClass("even"); $(".striped tbody tr:odd").addClass("odd"); - + // More link if ($("#site-map-link").length > 0) { $("#site-map-link").click(function(e) { diff --git a/app/assets/javascripts/layout.js b/app/assets/javascripts/layout.js new file mode 100644 index 000000000..d6522fb1a --- /dev/null +++ b/app/assets/javascripts/layout.js @@ -0,0 +1,29 @@ +(function() { + Danbooru.Layout = {}; + + Danbooru.Layout.initialize = function() { + $(window).resize(Danbooru.Layout.restyle_content); + } + + Danbooru.Layout.restyle_content = function() { + if ($(window).width() > 1100) { + $("#content").css("max-width", "50em"); + } + + if ($(window).width() > 1300) { + $("#content").css("max-width", "60em"); + } + + if ($(window).width() > 1500) { + $("#content").css("max-width", "70em"); + } + + if ($(window).width() < 1000) { + $("#content").css("max-width", "40em"); + } + } +})(); + +$(document).ready(function() { + Danbooru.Layout.initialize(); +}); diff --git a/app/assets/stylesheets/common/main_layout.css.scss b/app/assets/stylesheets/common/main_layout.css.scss index dd177f805..1af95a08b 100644 --- a/app/assets/stylesheets/common/main_layout.css.scss +++ b/app/assets/stylesheets/common/main_layout.css.scss @@ -46,7 +46,7 @@ div#page { } section#content { - width: 80%; + max-width: 50em; float: left; padding-left: 2em; overflow: visible;