Merges branch 'release/0.6.0' into develop

dsawardekar · Aug 7, 2014 · bf28010 · bf28010
2 parents 9e3a2c1 + d90aab5
commit bf28010
Show file tree

Hide file tree

Showing 9 changed files with 434 additions and 78 deletions.
diff --git a/css/wp-imgur-app.css b/css/wp-imgur-app.css
@@ -17,6 +17,10 @@
   margin-top: 20px !important;
 }
 
+#message.error {
+  margin-top: 1em;
+}
+
 .wrap-wp-imgur {
   max-width: 1280px;
 }
@@ -190,3 +194,25 @@ fieldset legend {
 .wp-progress-button .button {
   vertical-align: middle;
 }
+
+.attribution {
+  font-size: 0.7em;
+}
+
+.attribution {
+  float: right;
+}
+
+.attribution a {
+  text-decoration: none;
+}
+
+.attribution a:hover {
+  text-decoration: underline;
+}
+
+@media screen and (max-width: 520px) {
+  .attribution .text {
+    display: none;
+  }
+}
diff --git a/css/wp-imgur-app.min.css b/css/wp-imgur-app.min.css