diff --git a/client/modules/IDE/components/Preferences.jsx b/client/modules/IDE/components/Preferences.jsx index 6723c038..c98067c4 100644 --- a/client/modules/IDE/components/Preferences.jsx +++ b/client/modules/IDE/components/Preferences.jsx @@ -59,9 +59,9 @@ class Preferences extends React.Component { -
-

General Settings

-

Accessibility

+
+

General Settings

+

Accessibility

diff --git a/client/modules/User/pages/AccountView.jsx b/client/modules/User/pages/AccountView.jsx index c767064a..dbd6073c 100644 --- a/client/modules/User/pages/AccountView.jsx +++ b/client/modules/User/pages/AccountView.jsx @@ -53,9 +53,9 @@ class AccountView extends React.Component {

My Account

-
-

Account

-

Access Tokens

+
+

Account

+

Access Tokens

diff --git a/client/styles/components/_account.scss b/client/styles/components/_account.scss index a03b140f..44d8939d 100644 --- a/client/styles/components/_account.scss +++ b/client/styles/components/_account.scss @@ -1,5 +1,4 @@ .account__tabs { - width: 500px; padding-top: #{20 / $base-font-size}rem; } diff --git a/client/styles/components/_preferences.scss b/client/styles/components/_preferences.scss index 3f77e40a..26d213fd 100644 --- a/client/styles/components/_preferences.scss +++ b/client/styles/components/_preferences.scss @@ -60,15 +60,6 @@ text-align: left; } -.preference__subheadings { - display: flex; - flex-wrap: wrap; - padding-bottom: #{0.1 / $base-font-size}rem; - @include themify() { - border-bottom: 1px solid getThemifyVariable('button-border-color'); - } -} - .preference { display: flex; flex-wrap: wrap; @@ -129,48 +120,6 @@ width: #{44 / $base-font-size}rem; } -.react-tabs__tab--selected { - @include themify() { - border-bottom: #{4 / $base-font-size}rem solid getThemifyVariable('button-background-hover-color'); - } -} - -.react-tabs__tab--selected .preference__subheading { - @include themify() { - color: getThemifyVariable('primary-text-color'); - } -} - -.react-tabs__tab { - text-align: center; - color: black; - display: flex; - align-items: center; - border-bottom: #{4 / $base-font-size}rem solid transparent; - & + & { - margin-left: #{45 / $base-font-size}rem; - } -} - -.preference__subheading { - @include themify() { - color: getThemifyVariable('inactive-text-color'); - &:hover, &:focus{ - color: getThemifyVariable('primary-text-color'); - cursor: pointer; - } - &:focus { - color: getThemifyVariable('primary-text-color'); - cursor: pointer; - } - } - font-size: #{12 / $base-font-size}rem; - height: #{20 / $base-font-size}rem; - width: 100%; - margin: 0; - padding: 0 #{5 /$base-font-size}rem; -} - .preference__vertical-list { display: flex; flex-direction: column; diff --git a/client/styles/components/_tabs.scss b/client/styles/components/_tabs.scss new file mode 100644 index 00000000..444b7186 --- /dev/null +++ b/client/styles/components/_tabs.scss @@ -0,0 +1,69 @@ +.tabs__titles { + display: flex; + flex-wrap: wrap; + padding-bottom: #{0.1 / $base-font-size}rem; + @include themify() { + border-bottom: 1px solid getThemifyVariable('button-border-color'); + } +} + +.tabs__title { + @include themify() { + color: getThemifyVariable('inactive-text-color'); + &:hover, &:focus{ + color: getThemifyVariable('primary-text-color'); + cursor: pointer; + } + &:focus { + color: getThemifyVariable('primary-text-color'); + cursor: pointer; + } + } + font-size: #{12 / $base-font-size}rem; + height: #{20 / $base-font-size}rem; + width: 100%; + margin: 0; + padding: 0 #{5 /$base-font-size}rem; +} + +.react-tabs__tab--selected { + @include themify() { + border-bottom: #{4 / $base-font-size}rem solid getThemifyVariable('button-background-hover-color'); + } +} + +.react-tabs__tab--selected .tabs__title { + @include themify() { + color: getThemifyVariable('primary-text-color'); + } +} + +.react-tabs__tab { + text-align: center; + color: black; + display: flex; + align-items: center; + border-bottom: #{4 / $base-font-size}rem solid transparent; + & + & { + margin-left: #{45 / $base-font-size}rem; + } +} + +.tabs__title { + @include themify() { + color: getThemifyVariable('inactive-text-color'); + &:hover, &:focus{ + color: getThemifyVariable('primary-text-color'); + cursor: pointer; + } + &:focus { + color: getThemifyVariable('primary-text-color'); + cursor: pointer; + } + } + font-size: #{12 / $base-font-size}rem; + height: #{20 / $base-font-size}rem; + width: 100%; + margin: 0; + padding: 0 #{5 /$base-font-size}rem; +} diff --git a/client/styles/main.scss b/client/styles/main.scss index 10e4a38e..62b8d4cc 100644 --- a/client/styles/main.scss +++ b/client/styles/main.scss @@ -45,6 +45,7 @@ @import 'components/feedback'; @import 'components/loader'; @import 'components/uploader'; +@import 'components/tabs'; @import 'layout/ide'; @import 'layout/fullscreen';