Merge branch 'master' into html5Validation

Conflicts:
	wcfsetup/install/files/acp/style/wcf.css

diff --cc wcfsetup/install/files/acp/style/wcf.css
index 035ae43f9015b3a74a902e5cb4068d75adbdbbfe,5a0f6f1c52be494286cc98af8912f4bca9515175..7a2076b3685fa46b94d42daefdee771d40731f68
--- 1/wcfsetup/install/files/acp/style/wcf.css
--- 2/wcfsetup/install/files/acp/style/wcf.css
+++ b/wcfsetup/install/files/acp/style/wcf.css
@@@ -1669,8 -1884,8 +1884,9 @@@ input[type='password'] 
  input[type='text'],
  input[type='search'],
  input[type='email'],
+ input[type='url'],
  input[type='password'],
 +input[type='url'],
  textarea {
        border-width: 1px;
        border-style: solid;
@@@ -1696,11 -1911,11 +1912,12 @@@
  input[type='text']:hover,
  input[type='search']:hover,
  input[type='email']:hover,
+ input[type='url']:hover,
  input[type='password']:hover,
 +input[type='url']:hover,
  textarea:hover {
-       border: 1px solid #fa2;
-       background-color: #fff9f4;
+       border: 1px solid rgba(255, 170, 34, 1);
+       background-color: rgba(255, 249, 244, 1);
  }
  
  /* Active & Focus State */
@@@ -1708,17 -1923,17 +1925,19 @@@
  input[type='text']:active,
  input[type='search']:active,
  input[type='email']:active,
+ input[type='url']:active,
  input[type='password']:active,
 +input[type='url']:active,
  textarea:active,
  input[type='text']:focus,
  input[type='search']:focus,
  input[type='email']:focus,
+ input[type='url']:focus,
  input[type='password']:focus,
 +input[type='url']:focus,
  textarea:focus {
-       border: 1px solid #fa2;
-       background-color: #fff9f4;
+       border: 1px solid rgba(255, 170, 34, 1);
+       background-color: rgba(255, 249, 244, 1);
        outline: none;
        
        -webkit-box-shadow: 0 0 5px rgba(255, 170, 34, .5), inset 0 1px 5px rgba(0, 0, 0, .2);
@@@ -1733,11 -1948,11 +1952,12 @@@
  input[type='text'][readonly='readonly'],
  input[type='search'][readonly='readonly'],
  input[type='email'][readonly='readonly'],
+ input[type='url'][readonly='readonly'],
  input[type='password'][readonly='readonly'],
 +input[type='url'][readonly='readonly'],
  textarea[readonly='readonly'] {
        border-style: solid;
-       border-color: #ccc #ddd #eee;
+       border-color: rgba(204, 204, 204, 1) rgba(221, 221, 221, 1) rgba(238, 238, 238, 1);
        background-color: transparent;
        
        -webkit-box-shadow: inset 0 1px 5px rgba(0, 0, 0, .05);
@@@ -1752,8 -1967,8 +1972,9 @@@
  input[type='text'][disabled='disabled'],
  input[type='search'][disabled='disabled'],
  input[type='email'][disabled='disabled'],
+ input[type='url'][disabled='disabled'],
  input[type='password'][disabled='disabled'],
 +input[type='url'][disabled='disabled'],
  textarea[disabled='disabled'] {
        border-style: solid;
        border-color: rgba(255, 255, 255, .5);
@@@ -1831,11 -2057,11 +2063,12 @@@ input[type=search] 
  .formError input[type='text'],
  .formError input[type='search'],
  .formError input[type='email'],
+ .formError input[type='url'],
  .formError input[type='password'],
 +.formError input[type='url'],
  .formError textarea {
-       border-color: #f00;
-       background-color: #fff6f6;
+       border-color: rgba(255, 0, 0, 1);
+       background-color: rgba(255, 246, 246, 1);
  }