From 5f69a2ff0201edf27f0d850f32231d91e723533c Mon Sep 17 00:00:00 2001 From: rvelices Date: Mon, 22 Nov 2010 20:13:09 +0000 Subject: simplification of CSS rules (trunk only) git-svn-id: http://piwigo.org/svn/trunk@7843 68402e56-0260-453c-a942-63ccdbb3a9ee --- themes/Sylvia/theme.css | 4 ++-- themes/clear/theme.css | 2 +- themes/default/fix-ie5-ie6.css | 8 +++++++ themes/default/theme.css | 51 +++++++++++++----------------------------- 4 files changed, 26 insertions(+), 39 deletions(-) diff --git a/themes/Sylvia/theme.css b/themes/Sylvia/theme.css index 4977c862f..3e2708c1d 100644 --- a/themes/Sylvia/theme.css +++ b/themes/Sylvia/theme.css @@ -307,12 +307,12 @@ input[type="radio"], input[type="checkbox"], input[type="button"].rateButtonStar clear:both; list-style-type:none; } -span.calItem { +.calItem { border:1px solid #666; margin:0 5px; padding:2px 5px 0 8px; } -span.calItemEmpty, td.calDayCellEmpty, td.calDayCellFull { +.calItemEmpty, td.calDayCellEmpty, td.calDayCellFull { border:1px solid #666; } A, INPUT.rateButton { diff --git a/themes/clear/theme.css b/themes/clear/theme.css index a39317853..c59fb9718 100644 --- a/themes/clear/theme.css +++ b/themes/clear/theme.css @@ -67,7 +67,7 @@ A.navThumb, A.navThumb:hover { } /*calendar elements*/ -SPAN.calItem, SPAN.calItemEmpty +.calItem, .calItemEmpty { border: 1px solid silver; } diff --git a/themes/default/fix-ie5-ie6.css b/themes/default/fix-ie5-ie6.css index 54018fea1..974b1e842 100644 --- a/themes/default/fix-ie5-ie6.css +++ b/themes/default/fix-ie5-ie6.css @@ -1,5 +1,13 @@ /* Issues in IE from 5 to 6 only not to be used with IE7 */ +#menubar LI.selected A { + font-weight: bold; +} + +#menubar LI.selected LI A { + font-weight: normal; +} + /* fix IE with another layout for thumbnails */ .content UL.thumbnails SPAN.wrap2 { display: block; diff --git a/themes/default/theme.css b/themes/default/theme.css index 53a3cddb6..5e5fe442f 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -6,6 +6,7 @@ margin: 0 0 10px 1em; padding: 0; display: inline; + width: 18em; } #menubar DL, #menubar DT, #menubar DD { @@ -47,14 +48,11 @@ margin-bottom: 0; } -#menubar LI.selected A { +/*IE6 needs override because of > selector*/ +#menubar LI.selected>A { font-weight: bold; } -#menubar LI.selected LI A { - font-weight: normal; -} - #menubar .menuInfoCatByChild { font-size: 80%; font-style: italic; @@ -94,26 +92,14 @@ FORM#quickconnect FIELDSET DIV { * Content */ .content { - margin-right: 1em; - margin-bottom: 1em; /* when it's longer than menu bar */ -} - -BODY#theCommentsPage .content, -BODY#theUploadPage .content, -BODY#theRegisterPage .content, -BODY#theIdentificationPage .content, -BODY#theProfilePage .content, -BODY#theSearchPage .content, -BODY#theAboutPage .content, -BODY#thePopuphelpPage .content, -BODY#thePasswordPage .content, -BODY#theNotificationPage .content, -BODY#theTagsPage .content, -BODY#theNBMPage .content -{ margin: 1em; } +BODY#theCategoryPage .content +{ + margin-left: 20em; /* = #menubar width + 2em */ +} + .content H2 { margin-bottom: 3px;} /*<- for IE otherwise calendar select is displaced to middle of page*/ .content .navigationBar, .content .additional_info, .content .calendarBar { @@ -155,32 +141,32 @@ UL.categoryActions LI { } /* begin chronology/calendar elements*/ -.content DIV.calendarViews { +.content .calendarViews { display: block; float: right; margin: 2px 0 0; } -SPAN.calItem, SPAN.calItemEmpty { +.calItem, .calItemEmpty { font-weight: bold; margin: 0 1px; border: 1px solid gray; } -SPAN.calItem A { border:0 } +.calItem A { border:0 } -.content DIV.calendarCalBar { +.content .calendarCalBar { margin: 10px; text-align: left; } -SPAN.calCalHead { +.calCalHead { font-weight: bold; font-size: 110%; margin: 0 2px; } -SPAN.calCal { margin: 0 2px; } +.calCal { margin: 0 2px; } /* nice looking month calendar*/ TABLE.calMonth { @@ -712,13 +698,6 @@ IMG.ui-datepicker-trigger { cursor : pointer; } -/* Set the width of the menubar for the galery */ -#menubar { - width: 18em; -} -.content { - margin-left: 20em; /* = #menubar width + 2em */ -} /* Set minimum width of the page before getting a scrollbar */ /* IE5 and IE6 don't get that */ BODY { @@ -760,7 +739,7 @@ BODY#thePopuphelpPage { } /* So that non-links are slightly greyed out */ -.content .navigationBar, SPAN.calItemEmpty, TD.calDayCellEmpty { +.content .navigationBar, .calItemEmpty, TD.calDayCellEmpty { color: #b0b0b0; } -- cgit v1.2.3