diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-07 19:48:33 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-07 19:48:33 +0000 |
| commit | c3024df49ee1f054f2018c2cd87eba3e0da1a59d (patch) | |
| tree | 52968db1dfb7411f3fa35ccc1a4c96a4b63ac0d0 /remoting | |
| parent | f1b0d2d27563bc84c7c3ab913c4365623a6f9f40 (diff) | |
| download | chromium_src-c3024df49ee1f054f2018c2cd87eba3e0da1a59d.zip chromium_src-c3024df49ee1f054f2018c2cd87eba3e0da1a59d.tar.gz chromium_src-c3024df49ee1f054f2018c2cd87eba3e0da1a59d.tar.bz2 | |
Replace <form> tags used for centering buttons with <div> tags. Also fix enter key for connect.
BUG=85105
TEST=clicking through the UI, and hitting enter.
Review URL: http://codereview.chromium.org/7120001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/webapp/me2mom/choice.css | 15 | ||||
| -rw-r--r-- | remoting/webapp/me2mom/choice.html | 36 |
2 files changed, 26 insertions, 25 deletions
diff --git a/remoting/webapp/me2mom/choice.css b/remoting/webapp/me2mom/choice.css index 82e4bab..72b07e0 100644 --- a/remoting/webapp/me2mom/choice.css +++ b/remoting/webapp/me2mom/choice.css @@ -75,17 +75,18 @@ section { .auth-status-control { /* Class used to denote controls that affect authorization status. */ + margin: 10px auto auto 0px; } -.centered-form { +.centered-button { /* - Used to force buttons to center correctly on Chrome due to bug laying out - buttons. http://crbug.com/84654 - When 84654 is fixed we can remove the forms that have this class that - are wrapping our buttons. + Used to force buttons to center correctly on Chrome due to a quirk + with laying out buttons. http://crbug.com/84654 + + TODO(ajwong): Either fix Chrome layout behavior, or if Chrome is actually + conforming correctly to the standard, remove this comment. */ - margin: 25px auto; - display: table; + text-align: center; } .client-element { diff --git a/remoting/webapp/me2mom/choice.html b/remoting/webapp/me2mom/choice.html index e53b8f2..546a3c9 100644 --- a/remoting/webapp/me2mom/choice.html +++ b/remoting/webapp/me2mom/choice.html @@ -67,12 +67,12 @@ found in the LICENSE file. With Chromoting you can easily let another Chrome user see and control your computer. </div> - <form class="centered-form"> + <div class="centered-button"> <button id="share-button" class="auth-status-control" type="button" onclick="tryShare(); return false;"> Share this computer </button> - </form> + </div> </div> <!-- unshared --> <div id="preparing-to-share" class="mode"> @@ -92,22 +92,22 @@ found in the LICENSE file. <div class="message"> Waiting for connection... </div> - <form class="centered-form"> + <div class="centered-button"> <button type="button" onclick="cancelShare(); return false;"> Cancel </button> - </form> + </div> </div> <!-- ready-to-share --> <div id="shared" class="mode"> <div class="message"> Your desktop is currently being shared. </div> - <form class="centered-form"> + <div class="centered-button"> <button type="button" onclick="cancelShare(); return false;"> Stop sharing </button> - </form> + </div> </div> <!-- shared --> </section> <!-- host-section --> @@ -119,18 +119,18 @@ found in the LICENSE file. their access code to you. </div> <div id="access-code-entry-row"> - <form action=""> + <form action="" onsubmit="tryConnect(); return false;"> <label class="auth-status-control" for="access-code-entry"> Access code: </label> <input id="access-code-entry" class="auth-status-control" type="text"/> - </form> - <form class="centered-form"> - <button id="connect-button" class="auth-status-control" - type="button" onclick="tryConnect(); return false;"> - Connect - </button> + <div class="centered-button"> + <button id="connect-button" class="auth-status-control" + type="submit"> + Connect + </button> + </div> </form> </div> <!-- code-entry-row --> </div> <!-- unconnected --> @@ -141,11 +141,11 @@ found in the LICENSE file. <!-- TODO(jamiewalch): Implement Cancel, being careful when ignoring the eventual server response not to ignore responses for any subsequent requests. - <form class="centered-form"> + <div class="centered-button"> <button onclick="cancelConnect(); return false;"> Cancel </button> - </form> + </div> --> </div> </div> <!-- connecting --> @@ -158,12 +158,12 @@ found in the LICENSE file. An error occurred. The server response was <div id="server-response"></div>. </div> - <form class="centered-form"> - <button type="button" + <div class="centered-button"> + <button type="button" class="auth-status-control" onclick="setClientMode('unconnected'); return false;"> OK </button> - </form> + </div> </div> <!-- connect-failed --> </section> <!-- client-section --> |