Merge commit 'd5120c9' into pita

This commit is contained in:
Egil Moeller 2012-04-17 22:34:45 +02:00
commit f80f9fc59f
2 changed files with 304 additions and 293 deletions

View file

@ -11,77 +11,92 @@ body {
border-top: 8px solid rgba(51,51,51,.8);
}
#wrapper {
border-top: 1px solid #999;
margin-top: 160px;
padding: 15px;
background: #fff;
background: #eee;
background: -webkit-linear-gradient(#fff,#ccc);
background: -moz-linear-gradient(#fff,#ccc);
background: -ms-linear-gradient(#fff,#ccc);
background: -o-linear-gradient(#fff,#ccc);
opacity: .9;
box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
max-width: 700px;
max-width: 1200px;
margin: auto;
border-radius: 0 0 7px 7px;
}
h1 {
font-size: 29px;
}
h2 {
font-size: 24px;
}
.seperator {
margin: 10px 0;
height: 1px;
background: #aaa;
background: -webkit-linear-gradient(left, #fff, #aaa 20%, #aaa 80%, #fff);
background: -moz-linear-gradient(left, #fff, #aaa 20%, #aaa 80%, #fff);
background: -ms-linear-gradient(left, #fff, #aaa 20%, #aaa 80%, #fff);
background: -o-linear-gradient(left, #fff, #aaa 20%, #aaa 80%, #fff);
}
form {
margin-bottom: 0;
}
#inner {
width: 300px;
margin: 0 auto;
}
#button:hover {
cursor: pointer;
background: #666;
background: -webkit-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
background: -moz-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
background: -ms-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
background: -o-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747);
}
#button:active {
box-shadow: inset 0 1px 12px rgba(0,0,0,0.9);
background: #444;
}
#label {
text-align: left;
text-shadow: 0 1px 1px #fff;
margin: 16px auto 0;
}
form {
border: 1px solid #bbb;
border-radius: 3px;
position: relative;
}
button, input {
font-weight: bold;
font-size: 15px;
}
input[type="button"] {
height:30px;
margin: 0;
display: block;
}
input[value="Uninstall"], input[value="Install"] {
float: right;
width: 100px;
}
input[type="text"] {
border-radius: 3px;
box-sizing: border-box;
-moz-box-sizing: border-box;
padding: 10px;
padding: 10px 45px 10px 10px;
*padding: 0; /* IE7 hack */
width: 100%;
outline: none;
border: 1px solid #ddd;
margin: 0 0 5px 1px;
max-width: 500px;
border: none;
}
button{
display:block;
}
table {
border: 1px solid #ddd;
border-radius: 3px;
border-spacing: 0;
width: 100%;
margin: 20px 0;
@media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
body {
background: #bbb;
background: -webkit-linear-gradient(#aaa,#eee 60%) center fixed;
background: -moz-linear-gradient(#aaa,#eee 60%) center fixed;
background: -ms-linear-gradient(#aaa,#eee 60%) center fixed;
}
table thead tr {
background: #eee;
#wrapper {
margin-top: 0;
}
#inner {
width: 95%;
}
#label {
text-align: center;
}
}
table {
border-collapse: collapse;
}
td, th {
padding: 5px;
border: 1px solid black;
padding-left: 10px;
padding-right: 10px;
padding-top: 2px;
padding-bottom: 2px;
}
.template {
display: none;

View file

@ -97,10 +97,6 @@
<body>
<div id="wrapper">
<h1>Etherpad Lite</h1>
<div class="seperator"></div>
<% if (errors.length) { %>
<div class="errors">
<% errors.forEach(function (item) { %>
@ -110,7 +106,7 @@
<% } %>
<h2>Installed plugins</h2>
<h1>Installed plugins</h1>
<table>
<thead>
<tr>
@ -131,10 +127,10 @@
<tbody id="installed-plugins">
</tbody>
</table>
<div class="seperator"></div>
<h2>Search for plugins to install</h2>
<h1>Search for plugins to install</h1>
<form>
<input type="text" name="search" placeholder="Search term" id="search-query">
<input type="text" name="search" value="" id="search-query">
<input type="button" value="Search" id="do-search">
</form>
<table>