From 08792f00bd94e8da4a3d40f3b23b278765501ec7 Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Thu, 7 Apr 2016 14:14:12 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84(prefs):=20Shrink=20top=20tabs=20be?= =?UTF-8?q?tter,=20add=20min-widths?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preferences/lib/preferences-tabs-bar.jsx | 2 ++ .../stylesheets/preferences-accounts.less | 1 + .../preferences/stylesheets/preferences.less | 28 ++++++++++++++++--- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/internal_packages/preferences/lib/preferences-tabs-bar.jsx b/internal_packages/preferences/lib/preferences-tabs-bar.jsx index 0dd5299c0..ca54c58d7 100644 --- a/internal_packages/preferences/lib/preferences-tabs-bar.jsx +++ b/internal_packages/preferences/lib/preferences-tabs-bar.jsx @@ -83,7 +83,9 @@ class PreferencesTabsBar extends React.Component { return (
+
{this.renderTabs()} +
); diff --git a/internal_packages/preferences/stylesheets/preferences-accounts.less b/internal_packages/preferences/stylesheets/preferences-accounts.less index 13055ed8a..49a589e8a 100644 --- a/internal_packages/preferences/stylesheets/preferences-accounts.less +++ b/internal_packages/preferences/stylesheets/preferences-accounts.less @@ -4,6 +4,7 @@ .preferences-wrap { .container-accounts { width: 70%; + min-width: 360px; margin: 0 auto; .accounts-content { display: flex; diff --git a/internal_packages/preferences/stylesheets/preferences.less b/internal_packages/preferences/stylesheets/preferences.less index 9904edf22..19b2d5a69 100644 --- a/internal_packages/preferences/stylesheets/preferences.less +++ b/internal_packages/preferences/stylesheets/preferences.less @@ -37,19 +37,20 @@ .container-preference-tabs { width: 100%; - height: 90px; background-color: @source-list-bg; border-bottom: 1px solid @border-color-divider; .preferences-tabs { padding-top: 10px; background-color: @source-list-bg; - width: 70%; - margin: 0 auto; .item { cursor: default; margin: 0 auto; + flex: 1.3; + min-width: 54px; + max-width: 120px; + text-align: center; &:active { img { @@ -65,12 +66,19 @@ .tab-icon { padding-top: 8px; + padding-bottom: 8px; display: block; margin: auto; } .name { - padding: @padding-base-vertical @padding-large-horizontal; + padding: 0 @padding-base-horizontal * 0.3; + padding-bottom: @padding-large-vertical; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + font-size: @font-size-small; + line-height: @font-size-small; } } } @@ -92,6 +100,7 @@ .container-general { width: 40%; + min-width: 400px; margin: 0 auto; } @@ -137,6 +146,7 @@ .container-keymaps { width: 40%; + min-width: 400px; margin: 0 auto; .col-left { @@ -219,3 +229,13 @@ body.platform-linux { } } } + +@media (max-width: 600px) { + .preferences-tabs .item .name { + display:none; + } + .preferences-wrap .preferences-content > .scroll-region-content { + padding-left: @padding-large-horizontal * 1; + padding-right: @padding-large-horizontal * 1; + } +}