Software / code / prosody-modules
Changeset
575:565d5409c6ca
Adapt to bootstrap
| author | Florian Zeitz <florob@babelmonkeys.de> |
|---|---|
| date | Thu, 19 Jan 2012 22:14:19 +0100 |
| parents | 574:950e23318bbc |
| children | 576:44b69c3d5351 |
| files | mod_admin_web/admin_web/get_deps.sh mod_admin_web/admin_web/www_files/css/style.css mod_admin_web/admin_web/www_files/index.html |
| diffstat | 3 files changed, 34 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/mod_admin_web/admin_web/get_deps.sh Wed Jan 18 15:51:38 2012 +0100 +++ b/mod_admin_web/admin_web/get_deps.sh Thu Jan 19 22:14:19 2012 +0100 @@ -4,7 +4,7 @@ BOOTSTRAP_VERSION="1.4.0" cd www_files/js test -e jquery-$JQUERY_VERSION.min.js || wget http://code.jquery.com/jquery-$JQUERY_VERSION.min.js -test -e adhoc.js || wget -O adhoc.js "http://cgit.babelmonkeys.de/cgit.cgi/adhocweb/plain/js/adhoc.js?id=5a45869a032410c17d02374b8de20e496c114de3" +test -e adhoc.js || wget -O adhoc.js "http://cgit.babelmonkeys.de/cgit.cgi/adhocweb/plain/js/adhoc.js?id=a4c0f5025877f4858576dba28bbb461f0581a5d1" test -e strophe.min.js || (wget https://github.com/downloads/metajack/strophejs/strophejs-$STROPHE_VERSION.tar.gz && tar xzf strophejs-$STROPHE_VERSION.tar.gz strophejs-$STROPHE_VERSION/strophe.min.js --strip-components=1 && rm strophejs-$STROPHE_VERSION.tar.gz) cd ../css test -e bootstrap-$BOOTSTRAP_VERSION.min.css || wget http://twitter.github.com/bootstrap/$BOOTSTRAP_VERSION/bootstrap.min.css -O bootstrap-$BOOTSTRAP_VERSION.min.css
--- a/mod_admin_web/admin_web/www_files/css/style.css Wed Jan 18 15:51:38 2012 +0100 +++ b/mod_admin_web/admin_web/www_files/css/style.css Thu Jan 19 22:14:19 2012 +0100 @@ -1,12 +1,3 @@ -label { - margin-right: 0.5em -} - -input, textarea, select { - margin: 0.25em; - margin-left: 1em -} - body { margin: 0 } @@ -19,6 +10,14 @@ margin: 0 } +.btn { + margin-left: 0.3em +} + +.btn:last { + margin-left: 0 +} + #log_container { clear: both; display: none @@ -34,10 +33,8 @@ #login { float: left; - margin-left: 1em; - margin-right: 2em; - margin-top: 1em; - padding: 1em; + margin: 1em 2em 0 1em; + padding-right: 1em; border: solid 1px; background: #eef0f2; color: #000000 @@ -52,19 +49,6 @@ margin: 0 } -#cred input[type="submit"] { - margin-left: 0em -} - -#cred input[type="submit"]:hover { - color: #6197DF; - text-decoration: underline; -} - -#cred fieldset { - border: 0px -} - #top { clear: both; width: 100%; @@ -110,3 +94,7 @@ color: #4b8ade; margin: 0 } + +#host { + margin: 0.25em; +}
--- a/mod_admin_web/admin_web/www_files/index.html Wed Jan 18 15:51:38 2012 +0100 +++ b/mod_admin_web/admin_web/www_files/index.html Thu Jan 19 22:14:19 2012 +0100 @@ -23,22 +23,32 @@ <li><a id='adhocMenu' href="#adhoc">General</a></li> <li><a id='serverMenu' href="#s2sList">Servers</a></li> <li><a id='clientMenu' href="#c2sList">Clients</a></li> - <li><span id="selector">Host:<select id="host"></select></span></li> + <li><span id="selector">Host: <select id="host"></select></span></li> <li><a href="#" id='logout'>Logout</a></li> </ul> </div> </div> <div id='login'> - <form id='cred' name='cred'> + <form id='cred' name='cred' class='form-stacked'> <fieldset> - <label for='jid'>JID:</label><br/> - <input type='text' id='jid' /> - <br /> - <label for='pass'>Password:</label><br/> - <input type='password' id='pass' /> - <br /> - <input type='submit' id='connect' value='Login' /> + <div class='clearfix'> + <label for='jid'>JID:</label> + <div class='input'> + <input type='text' id='jid' /> + </div> + </div> + <div class='clearfix'> + <label for='pass'>Password:</label> + <div class='input'> + <input type='password' id='pass' /> + </div> + </div> + <div class='clearfix'> + <div class='input'> + <input type='submit' id='connect' value='Login' class='btn' /> + </div> + </div> </fieldset> </form> </div>
