Merge remote-tracking branch 'upstream/master'

2017-08-07 22:43:52 +02:00
parent b8791ae79b a3e53bd442
commit 7a1ca8b0df
82 changed files with 419 additions and 260 deletions
--- a/app/javascript/styles/accounts.scss
+++ b/app/javascript/styles/accounts.scss
@@ -7,7 +7,7 @@
  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
  overflow: hidden;

-  @media screen and (max-width: 700px) {
+  @media screen and (max-width: 740px) {
    border-radius: 0;
    box-shadow: none;
  }
@@ -298,7 +298,7 @@
  display: flex;
  flex-wrap: wrap;

-  @media screen and (max-width: 700px) {
+  @media screen and (max-width: 740px) {
    border-radius: 0;
    box-shadow: none;
  }