From f6b6534ad43326b6da2cc210aeeb8e25997995e7 Mon Sep 17 00:00:00 2001 From: Scott Jehl Date: Wed, 21 Jan 2009 18:12:13 +0000 Subject: [PATCH] prefixed all interior selectors with .ui-pluginname --- themes/base/ui.accordion.css | 14 +++++++------- themes/base/ui.all.css | 3 +-- themes/base/ui.datepicker.css | 26 +++++++++++++------------- themes/base/ui.dialog.css | 16 ++++++++-------- themes/base/ui.progressbar.css | 2 +- themes/base/ui.slider.css | 4 ++-- themes/base/ui.tabs.css | 12 ++++++------ 7 files changed, 38 insertions(+), 39 deletions(-) diff --git a/themes/base/ui.accordion.css b/themes/base/ui.accordion.css index b23937dc1..f37a97f90 100644 --- a/themes/base/ui.accordion.css +++ b/themes/base/ui.accordion.css @@ -1,10 +1,10 @@ /* Accordion ----------------------------------*/ -.ui-accordion-group {margin-bottom: 1px;} -.ui-accordion-header { cursor: pointer; position: relative; } -* html .ui-accordion-header { height: 1%; } -.ui-accordion-selected .ui-accordion-header { border-bottom: 0; } +.ui-accordion .ui-accordion-group {margin-bottom: 1px;} +.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; } +* html .ui-accordion .ui-accordion-header { height: 1%; } +.ui-accordion .ui-accordion-selected .ui-accordion-header { border-bottom: 0; } .ui-accordion .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } -.ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; } -.ui-accordion-content-wrap { border-top: 0; margin-top: -1px; position: relative; top: 1px; } -.ui-accordion-content { padding: 1em 2.2em; } +.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; } +.ui-accordion .ui-accordion-content-wrap { border-top: 0; margin-top: -1px; position: relative; top: 1px; } +.ui-accordion .ui-accordion-content { padding: 1em 2.2em; } diff --git a/themes/base/ui.all.css b/themes/base/ui.all.css index 08ee3cd0c..26894081d 100644 --- a/themes/base/ui.all.css +++ b/themes/base/ui.all.css @@ -1,4 +1,3 @@ @import "ui.core.css"; -@import "ui.theme.css"; @import "ui.allplugins.css"; - +@import "ui.theme.css"; diff --git a/themes/base/ui.datepicker.css b/themes/base/ui.datepicker.css index 457a9c957..4ef681088 100644 --- a/themes/base/ui.datepicker.css +++ b/themes/base/ui.datepicker.css @@ -1,26 +1,26 @@ /* Datepicker ----------------------------------*/ .ui-datepicker { width: 17em; padding: .2em .2em 0; } -.ui-datepicker-header { position:relative; padding:.2em 0; } -.ui-datepicker-prev, .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } -.ui-datepicker-prev-hover, .ui-datepicker-next-hover { top: 1px; } -.ui-datepicker-prev { left:2px; } -.ui-datepicker-next { right:2px; } -.ui-datepicker-prev-hover { left:1px; } -.ui-datepicker-next-hover { right:1px; } +.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } +.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } +.ui-datepicker .ui-datepicker-prev { left:2px; } +.ui-datepicker .ui-datepicker-next { right:2px; } +.ui-datepicker .ui-datepicker-prev-hover { left:1px; } +.ui-datepicker .ui-datepicker-next-hover { right:1px; } .ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } -.ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } -.ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; } +.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } +.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; } .ui-datepicker select.ui-datepicker-month-year {width: 100%;} .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year { width: 49%;} -.ui-datepicker-title select.ui-datepicker-year { float: right; } +.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; } .ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } .ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; } .ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } -.ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } -.ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } -.ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } +.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } +.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } /* with multiple calendars */ .ui-datepicker.ui-datepicker-multi { width:auto; } diff --git a/themes/base/ui.dialog.css b/themes/base/ui.dialog.css index 76806b369..f10f4090a 100644 --- a/themes/base/ui.dialog.css +++ b/themes/base/ui.dialog.css @@ -1,13 +1,13 @@ /* Dialog ----------------------------------*/ .ui-dialog { position: relative; padding: .2em; width: 300px; } -.ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative; } -.ui-dialog-title { float: left; margin: .1em 0 .2em; } -.ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } -.ui-dialog-titlebar-close span { display: block; margin: 1px; } -.ui-dialog-titlebar-close:hover, .ui-dialog-titlebar-close:focus { padding: 0; } -.ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; } -.ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } -.ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; } +.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative; } +.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } +.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } +.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } +.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } +.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; } +.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } +.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; } .ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } .ui-draggable .ui-dialog-titlebar { cursor: move; } \ No newline at end of file diff --git a/themes/base/ui.progressbar.css b/themes/base/ui.progressbar.css index 55d477ec0..bc0939ecf 100644 --- a/themes/base/ui.progressbar.css +++ b/themes/base/ui.progressbar.css @@ -1,4 +1,4 @@ /* Progressbar ----------------------------------*/ .ui-progressbar { height:2em; text-align: left; } -.ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file diff --git a/themes/base/ui.slider.css b/themes/base/ui.slider.css index 2478da188..4223580c5 100644 --- a/themes/base/ui.slider.css +++ b/themes/base/ui.slider.css @@ -1,8 +1,8 @@ /* Slider ----------------------------------*/ .ui-slider { position: relative; text-align: left; } -.ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } -.ui-slider-range { position: absolute; z-index: 1; font-size: 1%; display: block; border: 0; } +.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } +.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: 1%; display: block; border: 0; } .ui-slider-horizontal { height: .8em; } .ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } diff --git a/themes/base/ui.tabs.css b/themes/base/ui.tabs.css index 7099d666c..96baf38f8 100644 --- a/themes/base/ui.tabs.css +++ b/themes/base/ui.tabs.css @@ -1,9 +1,9 @@ /* Tabs ----------------------------------*/ .ui-tabs {padding: .2em;} -.ui-tabs-nav { padding: .2em .2em 0 .2em; position: relative; } -.ui-tabs-nav li { float: left; border-bottom: 0 !important; margin: 0 .2em -1px 0; padding: 0; } -.ui-tabs-nav li a { display:block; text-decoration: none; padding: .5em 1em; } -.ui-tabs-nav li.ui-tabs-selected { padding-bottom: .1em; border-bottom: 0; } -.ui-tabs-panel { padding: 1em 1.4em; display: block; border: 0; background: none; } -.ui-tabs-hide { display: none !important; } \ No newline at end of file +.ui-tabs .ui-tabs-nav { padding: .2em .2em 0 .2em; position: relative; } +.ui-tabs .ui-tabs-nav li { float: left; border-bottom: 0 !important; margin: 0 .2em -1px 0; padding: 0; } +.ui-tabs .ui-tabs-nav li a { display:block; text-decoration: none; padding: .5em 1em; } +.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: .1em; border-bottom: 0; } +.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border: 0; background: none; } +.ui-tabs .ui-tabs-hide { display: none !important; } \ No newline at end of file