From 3ad18648ddc12f1bfa153713a13e8b42442dcc88 Mon Sep 17 00:00:00 2001 From: Brian Warner <warner@lothar.com> Date: Tue, 20 Jan 2015 17:24:27 -0800 Subject: [PATCH] welcome.xhtml: improve layout by floating the icons to the left. This uses less vertical space. --- src/allmydata/web/static/css/new-tahoe.css | 22 ++-------------------- src/allmydata/web/welcome.xhtml | 6 +++--- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/src/allmydata/web/static/css/new-tahoe.css b/src/allmydata/web/static/css/new-tahoe.css index fa1269a1..175c3e33 100644 --- a/src/allmydata/web/static/css/new-tahoe.css +++ b/src/allmydata/web/static/css/new-tahoe.css @@ -46,7 +46,7 @@ body { margin-bottom: 20px; } -.grid-status .status-indicator { +.grid-status { margin-top: 5px; } @@ -75,23 +75,5 @@ body { .status-indicator { float: left; - width: 16px; - height: 16px; - border-radius: 50%; - display: inline-block; - vertical-align: middle; - margin-right: 4px; - margin-top: 2px; -} - -.connected-yes { - background: #468847; -} - -.connected-no { - background: #B94A48; -} - -.connected-not-configured { - background: #444444; + margin: 5px; } diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml index c4774c81..3e23fc73 100644 --- a/src/allmydata/web/welcome.xhtml +++ b/src/allmydata/web/welcome.xhtml @@ -137,14 +137,14 @@ <div class="span6"> <div> <h3> - <img><n:attr name="src">img/connected-<n:invisible n:render="string" n:data="connected_to_introducer" />.png</n:attr><n:attr name="alt"><n:invisible n:render="string" n:data="connected_to_introducer_alt" /></n:attr></img> + <div class="status-indicator"><img><n:attr name="src">img/connected-<n:invisible n:render="string" n:data="connected_to_introducer" />.png</n:attr><n:attr name="alt"><n:invisible n:render="string" n:data="connected_to_introducer_alt" /></n:attr></img></div> <div n:render="string" n:data="introducer_description" /> </h3> <div class="furl" n:render="string" n:data="introducer_furl_prefix" /> </div> <div> <h3> - <img><n:attr name="src">img/connected-<n:invisible n:render="string" n:data="connected_to_helper" />.png</n:attr><n:attr name="alt"><n:invisible n:render="string" n:data="connected_to_helper_alt" /></n:attr></img> + <div class="status-indicator"><img><n:attr name="src">img/connected-<n:invisible n:render="string" n:data="connected_to_helper" />.png</n:attr><n:attr name="alt"><n:invisible n:render="string" n:data="connected_to_helper_alt" /></n:attr></img></div> <div n:render="string" n:data="helper_description" /> </h3> <div class="furl" n:render="string" n:data="helper_furl_prefix" /> @@ -178,7 +178,7 @@ </thead> <tr n:pattern="item" n:render="service_row"> <td class="nickname-and-peerid"> - <img><n:attr name="src">img/connected-<n:slot name="connected" />.png</n:attr><n:attr name="alt"><n:slot name="connected_alt" /></n:attr></img> + <div class="status-indicator"><img><n:attr name="src">img/connected-<n:slot name="connected" />.png</n:attr><n:attr name="alt"><n:slot name="connected_alt" /></n:attr></img></div> <div class="nickname"><n:slot name="nickname"/></div> <div class="nodeid"><n:slot name="peerid"/></div> </td> -- 2.45.2