Adding zeroClipboard support

This commit is contained in:
Tom Slominski
2013-08-30 22:49:35 +01:00
parent 337f158812
commit a97007a8c9
5 changed files with 300 additions and 2 deletions

View File

@@ -122,6 +122,7 @@ h1 a:hover {
/* Main style */
.paragraph {
padding: 0 2.5% 0 2.5%;
<<<<<<< HEAD:public/style.css
}
h2 {
@@ -129,6 +130,15 @@ h2 {
margin-bottom: -8px;
}
=======
}
h2 {
color: black;
margin-bottom: -8px;
}
>>>>>>> 656a0c985880d87881d8ab157da0e848527f4c49:public/style.css
.right {
width: 60%;
float: right;
@@ -169,6 +179,15 @@ a.bookmarklet {
/* Output */
.output label {
width: 30%;
<<<<<<< HEAD:public/style.css
float:left;
}
.output input {
width: 70%
}
=======
float: left;
}
@@ -176,6 +195,7 @@ a.bookmarklet {
width: 70%
}
>>>>>>> 656a0c985880d87881d8ab157da0e848527f4c49:public/style.css
.error {
color: red;
}