about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-05-15 01:23:58 +0200
committerGitHub <noreply@github.com>2017-05-15 01:23:58 +0200
commita588358f41f36b2df1dcc4bb2c3df6c54ed52f88 (patch)
tree34eb884cf57cbfda3d5f7598fec12e6156614c7b /app/javascript/styles
parent0a110d07b68b68fbb4b15f1e99b62d6fc696c4a7 (diff)
Fix style regressions (#3062)
From #2327 - Elephant friend was overlapping with text, oversized in
single column layout

From #2021 - Centered layout goes against design principles, changes
UX for everybody who's already used to the current one

From #2271 - CPU/RAM overusage from keeping columns in DOM (fix #2648,
possibly also #2101)
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/components.scss19
-rw-r--r--app/javascript/styles/containers.scss10
2 files changed, 1 insertions, 28 deletions
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 773ef0a5b..4de8b7969 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1312,23 +1312,6 @@
   }
 }
 
-@media screen and (min-width: 1397px) { /* Width of 4 columns with margins */
-  .columns-area {
-    margin-left: auto;
-    margin-right: auto;
-  }
-}
-
-@media screen and (min-width: 1900px) {
-  .column,
-  .drawer {
-    width: 400px;
-    border-radius: 4px;
-    height: 96vh;
-    margin-top: 2vh;
-  }
-}
-
 .drawer__pager {
   box-sizing: border-box;
   padding: 0;
@@ -1772,7 +1755,7 @@
 .getting-started {
   box-sizing: border-box;
   padding-bottom: 235px;
-  background: url('../images/mastodon-getting-started.png') no-repeat 0 100% / contain local;
+  background: url('../images/mastodon-getting-started.png') no-repeat 0 100%;
   flex: 1 0 auto;
 
   p {
diff --git a/app/javascript/styles/containers.scss b/app/javascript/styles/containers.scss
index 390b9596c..68f73e0c0 100644
--- a/app/javascript/styles/containers.scss
+++ b/app/javascript/styles/containers.scss
@@ -9,16 +9,6 @@
   }
 }
 
-.mastodon-column-container {
-  display: flex;
-  height: 100%;
-  width: 100%;
-
-  // 707568 - height 100% doesn't work on child of a flex item - chromium - Monorail
-  // https://bugs.chromium.org/p/chromium/issues/detail?id=707568
-  flex: 1 1 auto;
-}
-
 .logo-container {
   max-width: 400px;
   margin: 100px auto;