Adding zeroClipboard support

public/config.php

@@ -4,7 +4,12 @@
 ISQ::$general = array(
 	'name' => 'kwl.me', // The name of your URL shortener
 	'qr' => 1, // Do you want to display a QR code?
+<<<<<<< HEAD
+	'mobile' => 0, // Do you want to enable the mobile version?
+	'clipboard' => 1 // Do you want to enable zeroClipboard? (uses flash)
+=======
 	'mobile' => 0 // Do you want to enable the mobile version?
+>>>>>>> 656a0c985880d87881d8ab157da0e848527f4c49
 );
 
 // Menu- The width of ∞² menu allows you to have about 10 links

public/style.css

@@ -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;
 }