From 2c1c4d3475f9748c0f43848714ad834977ea9665 Mon Sep 17 00:00:00 2001 From: jhilden Date: Sat, 30 May 2009 12:09:56 -0400 Subject: small UI/CSS facelift for user admin + git test --- themes/admin_default/css/screen.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css index 82cc90eb..2d5f086c 100644 --- a/themes/admin_default/css/screen.css +++ b/themes/admin_default/css/screen.css @@ -214,7 +214,8 @@ li.gGroup { height: 200px; border: 1px solid gray; padding: .5em; - margin-right: 1em; + margin-right: 0 1em 1em 0; + overflow: auto; } #gAdminAdvancedSettings tr.setting:hover { -- cgit v1.2.3 From ef14f0faf56738139d034136aa7ab47588581c2c Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sat, 30 May 2009 15:25:24 -0600 Subject: White space fixes --- modules/gallery/js/quick.js | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/modules/gallery/js/quick.js b/modules/gallery/js/quick.js index e7f35cea..8a87ed07 100644 --- a/modules/gallery/js/quick.js +++ b/modules/gallery/js/quick.js @@ -67,22 +67,22 @@ var quick_do = function(cont, pane, img) { url: pane.attr("href"), dataType: "json", success: function(data) { - img.css("opacity", "1"); - cont.removeClass("gLoadingLarge"); - if (data.src) { - img.attr("width", data.width); - img.attr("height", data.height); - img.attr("src", data.src); - if (data.height > data.width) { - img.css("margin-top", -32); - } else { - img.css("margin-top", 0); - } + img.css("opacity", "1"); + cont.removeClass("gLoadingLarge"); + if (data.src) { + img.attr("width", data.width); + img.attr("height", data.height); + img.attr("src", data.src); + if (data.height > data.width) { + img.css("margin-top", -32); + } else { + img.css("margin-top", 0); + } } else if (data.location) { window.location = data.location; - } else if (data.reload) { + } else if (data.reload) { window.location.reload(); - } + } } }); } @@ -92,4 +92,3 @@ var quick_do = function(cont, pane, img) { var hide_quick = function() { $("#gQuickPane").remove(); }; - -- cgit v1.2.3 From dcc67ad2976ed17c7a4eccd56d6aee77b72c084f Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sat, 30 May 2009 16:02:27 -0600 Subject: Refine link colors a bit. Drop orange for hover. Remove underlines for sf-menu hovers. --- themes/default/css/screen.css | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 007f30ed..004edfe7 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -64,21 +64,27 @@ h3 { /* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ a, +.gMenu a, #gDialog a, .gButtonLink, .gButtonLink:hover { - color: #6b8cb7; + color: #5382BF !important; text-decoration: none; -moz-outline-style: none; } a:hover, #gDialog a:hover { - color: #f30; + color: #00377F !important; text-decoration: underline; } +.gMenu a:hover { + text-decoration: none; +} + #gDialog .gCancel { + clear: none; float: left; margin: .3em 1em; } @@ -198,7 +204,8 @@ textarea { input[type="submit"], input[type="reset"] { - clear: none !important; + display: inline; + clear: none; float: left; } -- cgit v1.2.3 From cf00314c6af23715cbb3a451883f55c6d75540bf Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sat, 30 May 2009 16:13:16 -0600 Subject: Use short hex for colors, #cccccc > #ccc --- themes/default/css/screen.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 004edfe7..c6f4e202 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -911,7 +911,7 @@ form .gError, } #gServerAdd #gServerAddTree { - border: 1px solid #CCCCCC; + border: 1px solid #ccc; height: 25em; overflow: auto; margin-bottom: .5em; @@ -1006,8 +1006,8 @@ form .gError, vertical-align: middle; } #gPermissions .gDenied { - background-color: #FFCCCC; + background-color: #fcc; } #gPermissions .gAllowed { - background-color: #CCFFCC; + background-color: #cfc; } -- cgit v1.2.3 From b4b6a0b8d407301d2c36042e3f0cdf167a11d9b9 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sat, 30 May 2009 21:49:55 -0600 Subject: Focus IE fixes on versions less than 8 --- themes/default/views/page.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php index fc61f52d..e2c03664 100644 --- a/themes/default/views/page.html.php +++ b/themes/default/views/page.html.php @@ -24,7 +24,7 @@ media="screen,print,projection" /> " media="screen,print,projection" /> - -- cgit v1.2.3 From 8482f51e1546f9131835bed5cd52bba1f2895e20 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sat, 30 May 2009 23:01:48 -0600 Subject: Add transparency for overlay in IE 7 and 8 --- modules/gallery/js/fullsize.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gallery/js/fullsize.js b/modules/gallery/js/fullsize.js index 7428adb5..f95dc428 100644 --- a/modules/gallery/js/fullsize.js +++ b/modules/gallery/js/fullsize.js @@ -7,9 +7,9 @@ $(document).ready(function() { var height = $(document).height(); $("body").append('
'); -- cgit v1.2.3 From f95b51e2197aa42286b15a6759a91404503371ac Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sat, 30 May 2009 23:04:55 -0600 Subject: Fix IE issues with gPager, switch gPager from id to class, it's possible that we might want it to appear more than once in views. --- themes/default/css/fix-ie.css | 22 +++++++++++++--------- themes/default/css/screen.css | 13 +++++-------- themes/default/views/pager.html.php | 2 +- themes/default/views/photo.html.php | 2 +- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/themes/default/css/fix-ie.css b/themes/default/css/fix-ie.css index adf8c6d8..1e466450 100644 --- a/themes/default/css/fix-ie.css +++ b/themes/default/css/fix-ie.css @@ -1,5 +1,5 @@ /** - * Fix display in IE + * Fix display in IE 6, 7 */ #gHeader, #gSiteMenu, @@ -23,16 +23,20 @@ margin-bottom: 0; } -#gViewMenu a { - width: 52px !important; +input.submit { + clear: none !important; + display: inline !important; } -#gPager li.gInfo { - width: 39%; +#gDialog a.gCancel { + display: inline-block !important; + float: none !important; } -#gPager .txtright a.gButtonLink { - clear: none !important; - float: right !important; - width: 45% !important; +.gPager .txtright { + width: 29%; +} + +.gPager .ui-icon-right { + width: 60px; } diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index c6f4e202..33476a72 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -75,7 +75,6 @@ a, a:hover, #gDialog a:hover { - color: #00377F !important; text-decoration: underline; } @@ -347,7 +346,7 @@ form p.gError { } form .gError, -#gPager .gInfo { +.gPager .gInfo { background-color: #fff; } @@ -737,20 +736,20 @@ form .gError, /* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gPager { +.gPager { clear: both; margin: 0; padding: 5px 0 !important; width: 100%; } -#gPager li { +.gPager li { float: left; margin: 0; width: 30%; } -#gPager .gInfo { +.gPager .gInfo { text-align: center; width: 40%; } @@ -763,7 +762,7 @@ form .gError, #gHeader:after, .gBreadcrumbs:after, #gAlbumGrid:after, -#gPager:after, +.gPager:after, #gViewMenu:after { clear: both; content: "."; @@ -843,9 +842,7 @@ form .gError, display: inline-block; margin: 0 4px 0 0; padding: .2em .4em; - position: relative; outline: 0; - zoom: 1; } .gButtonSet { diff --git a/themes/default/views/pager.html.php b/themes/default/views/pager.html.php index de865090..f8517f78 100644 --- a/themes/default/views/pager.html.php +++ b/themes/default/views/pager.html.php @@ -1,6 +1,6 @@ -