Author: justi9 Date: 2008-04-17 16:32:38 -0400 (Thu, 17 Apr 2008) New Revision: 1938 Modified: mgmt/cumin/python/cumin/broker.strings mgmt/cumin/python/cumin/page.strings mgmt/cumin/python/cumin/stat.strings mgmt/cumin/python/wooly/widgets.strings mgmt/notes/justin-todo.txt Log: Reorganize and simplify css rules Modified: mgmt/cumin/python/cumin/broker.strings =================================================================== --- mgmt/cumin/python/cumin/broker.strings 2008-04-17 19:01:18 UTC (rev 1937) +++ mgmt/cumin/python/cumin/broker.strings 2008-04-17 20:32:38 UTC (rev 1938) @@ -120,8 +120,31 @@ </tr> </table> +[BrokerBrowser.css] +table.BrokerBrowser { + width: 100%; +} + +table.BrokerBrowser td.nav { + width: 20%; + vertical-align: top; +} + +table.BrokerBrowser td.nav h2 { + font-weight: normal; + font-size: 0.9em; +} + +table.BrokerBrowser td.nav ul { + margin: 0 0 1em 0; +} + +table.BrokerBrowser td.view { + width: 80%; +} + [BrokerBrowser.html] -<table class="browser"> +<table class="BrokerBrowser"> <tr> <td class="nav"> <ul class="actions"> Modified: mgmt/cumin/python/cumin/page.strings =================================================================== --- mgmt/cumin/python/cumin/page.strings 2008-04-17 19:01:18 UTC (rev 1937) +++ mgmt/cumin/python/cumin/page.strings 2008-04-17 20:32:38 UTC (rev 1938) @@ -35,25 +35,21 @@ padding: 1em; } -tr { - vertical-align: top; - text-align: left; -} - -span.none { - font-style: italic; - color: #999; -} - -h1, h2 { +h1 { + font-size: 1.1em; margin: 0; } h2 { font-size: 1em; - margin: 0 0 0.5em 0; + margin: 0; } +span.none { + font-style: italic; + color: #999; +} + .oblock { padding: 0; background-color: white; @@ -112,44 +108,7 @@ margin: 0 0.5em 0 0; } -table.props { - margin: 0 0 1.5em 0; - width: 32em; - border-collapse: collapse; -} - -table.props tr { - border-top: 1px dotted #ccc; - vertical-align: top; -} - -table.props th, table.props td { - text-align: left; - padding: 0.25em 0.5em; -} - -table.props th { - background-color: #f7f7f7; - font-weight: normal; -} - -table.props td { - width: 60%; -} - -table.props th.actions { - padding: 0.5em; - background-color: #e7e7f7; -} - -table.props th.actions h2 { - display: inline; - font-weight: normal; - font-size: 0.9em; - margin: 0 0.5em 0 0; -} - -button, table.props th.actions a, ul.actions a, a.action { +button, ul.actions a, a.action { margin: 0; border: 1px solid #ddd; padding: 0.25em 0.5em 0.15em 0.5em; @@ -158,7 +117,7 @@ font-size: 0.9em; } -button:hover, table.props th.actions a:hover, ul.actions a:hover, a.action:hover { +button:hover, ul.actions a:hover, a.action:hover { background-color: white; } @@ -394,51 +353,13 @@ content: url(resource?name=radio-button-checked.png); } -.browser { - width: 100%; -} - -.browser .nav { - width: 20%; -} - -.browser .nav h2 { - font-weight: normal; - font-size: 0.9em; -} - -.browser .nav ul { - margin: 0 0 1em 0; -} - -.BrokerClusterBrowser.groups h2 { - color: #685b8a; - /* color: #564979; */ - font-size: 0.9em; - border-bottom: 1px dotted #ddd; - width: 80%; - margin: 0 0 0.5em 0; -} - -.browser .view { - width: 80%; -} - -td.twocol { - width: 50%; - padding: 0 1em 0 0; -} - -table.layout { - width: 100%; -} - table.twocol { width: 100%; } table.twocol > tbody > tr > td { width: 50%; + vertical-align: top; } table.twocol > tbody > tr > td:first-child { Modified: mgmt/cumin/python/cumin/stat.strings =================================================================== --- mgmt/cumin/python/cumin/stat.strings 2008-04-17 19:01:18 UTC (rev 1937) +++ mgmt/cumin/python/cumin/stat.strings 2008-04-17 20:32:38 UTC (rev 1938) @@ -67,6 +67,10 @@ text-align: right; } +table.StatSet tbody th { + text-align: left; +} + table.StatSet td { text-align: right; } @@ -131,10 +135,6 @@ width: 30em; } -div.StatValueChart h2 { - margin: 0; -} - div.StatValueChart div.duration { margin: 1em 0 0.5em 1em; } Modified: mgmt/cumin/python/wooly/widgets.strings =================================================================== --- mgmt/cumin/python/wooly/widgets.strings 2008-04-17 19:01:18 UTC (rev 1937) +++ mgmt/cumin/python/wooly/widgets.strings 2008-04-17 20:32:38 UTC (rev 1938) @@ -2,17 +2,17 @@ {mode} [TabbedModeSet.css] -.TabbedModeSet.tabs { +ul.TabbedModeSet.tabs { padding: 0; margin: 0; list-style: none; } -.TabbedModeSet.tabs li { +ul.TabbedModeSet.tabs li { display: inline; } -.TabbedModeSet.tabs li a { +ul.TabbedModeSet.tabs li a { padding: 0.275em 0.5em; border-top: 1px solid #ccc; border-right: 1px solid #ccc; @@ -21,17 +21,17 @@ line-height: 1.5em; } -.TabbedModeSet.tabs li:first-child a { +ul.TabbedModeSet.tabs li:first-child a { border-left: 1px solid #ccc; } -.TabbedModeSet.tabs li a.selected { +ul.TabbedModeSet.tabs li a.selected { background-color: #fff; position: relative; z-index: 2; } -.TabbedModeSet.mode { +div.TabbedModeSet.mode { background-color: white; padding: 1em; border: 1px solid #ccc; @@ -59,7 +59,7 @@ <a class="{class}" href="{href}">{content}</a> [Toggle.css] -.Toggle.on { +a.Toggle.on { font-weight: bold; } @@ -134,11 +134,13 @@ [PropertySet.css] table.PropertySet th, table.PropertySet td { padding: 0 0.5em 0 0; + vertical-align: top; } table.PropertySet th { color: #444; font-weight: normal; + text-align: left; } [PropertySet.html] Modified: mgmt/notes/justin-todo.txt =================================================================== --- mgmt/notes/justin-todo.txt 2008-04-17 19:01:18 UTC (rev 1937) +++ mgmt/notes/justin-todo.txt 2008-04-17 20:32:38 UTC (rev 1938) @@ -36,6 +36,8 @@ * Fix the chart left side "pinch" problem + * Move to just a single category for stats + Deferred * En dashes don't disappear on stat update