From 47157e07b25f80aa9d2f90591bb59cf32cf593be Mon Sep 17 00:00:00 2001 From: cwm Date: Fri, 8 Dec 2017 20:13:08 -0600 Subject: merged tootsuite pr #5811 into glitch flavour --- .../flavours/glitch/styles/components/index.scss | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) (limited to 'app/javascript/flavours/glitch/styles/components/index.scss') diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index 7aeab0a6a..147690562 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -4827,6 +4827,90 @@ noscript { } } + +.column-inline-form { + padding: 7px 15px; + padding-right: 5px; + display: flex; + justify-content: flex-start; + align-items: center; + background: lighten($ui-base-color, 4%); + + label { + flex: 1 1 auto; + + input { + width: 100%; + margin-bottom: 6px; + } + } + + .icon-button { + flex: 0 0 auto; + margin-left: 5px; + } +} + +.drawer__backdrop { + cursor: pointer; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: rgba($base-overlay-background, 0.5); +} + +.list-editor { + background: $ui-base-color; + flex-direction: column; + border-radius: 8px; + box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4); + width: 40vh; + overflow: hidden; + + h4 { + padding: 15px 0; + background: lighten($ui-base-color, 13%); + font-weight: 500; + font-size: 16px; + text-align: center; + border-radius: 8px 8px 0 0; + } + + .drawer__pager { + height: 50vh; + } + + .drawer__inner { + border-radius: 0 0 8px 8px; + + &.backdrop { + width: calc(100% - 60px); + box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4); + border-radius: 0 0 0 8px; + } + } + + &__accounts { + overflow-y: auto; + } + + .account__display-name { + &:hover strong { + text-decoration: none; + } + } + + .account__avatar { + cursor: default; + } + + .search { + margin-bottom: 0; + } +} + @import 'doodle'; @import 'emoji_picker'; @import 'local_settings'; -- cgit From b165950ca76f45bc04a730d61853063c0100914c Mon Sep 17 00:00:00 2001 From: cwm Date: Fri, 8 Dec 2017 20:30:45 -0600 Subject: add keyboard shortcut to getting started, add missing list style --- .../flavours/glitch/features/getting_started/index.js | 3 ++- app/javascript/flavours/glitch/styles/components/index.scss | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'app/javascript/flavours/glitch/styles/components/index.scss') diff --git a/app/javascript/flavours/glitch/features/getting_started/index.js b/app/javascript/flavours/glitch/features/getting_started/index.js index 469fc2aa7..5307e583f 100644 --- a/app/javascript/flavours/glitch/features/getting_started/index.js +++ b/app/javascript/flavours/glitch/features/getting_started/index.js @@ -30,6 +30,7 @@ const messages = defineMessages({ show_me_around: { id: 'getting_started.onboarding', defaultMessage: 'Show me around' }, pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' }, lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' }, + keyboard_shortcuts: { id: 'navigation_bar.keyboard_shortcuts', defaultMessage: 'Keyboard shortcuts' }, }); const mapStateToProps = state => ({ @@ -88,7 +89,7 @@ export default class GettingStarted extends ImmutablePureComponent { navItems = navItems.concat([ , , - , + , ]); if (myAccount.get('locked')) { diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index 147690562..db51b164d 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -2542,6 +2542,10 @@ button.icon-button.active i.fa-retweet { margin-left: 0; } +.column-header__links .text-btn { + margin-right: 10px; +} + .column-header__button { background: lighten($ui-base-color, 4%); border: 0; @@ -2664,6 +2668,14 @@ button.icon-button.active i.fa-retweet { overflow-y: hidden; } + hr { + height: 0; + background: transparent; + border: 0; + border-top: 1px solid lighten($ui-base-color, 12%); + margin: 10px 0; + } + // notif cleaning drawer &.ncd { transition: none; -- cgit From 28423dd0465cd88f274556023d6c6536199a1a53 Mon Sep 17 00:00:00 2001 From: cwm Date: Fri, 8 Dec 2017 20:45:18 -0600 Subject: merge tootsuite pr #5904 into glitch flavour --- app/javascript/flavours/glitch/styles/components/index.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/javascript/flavours/glitch/styles/components/index.scss') diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index db51b164d..03874845e 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -4878,9 +4878,13 @@ noscript { flex-direction: column; border-radius: 8px; box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4); - width: 40vh; + width: 380px; overflow: hidden; + @media screen and (max-width: 420px) { + width: 90%; + } + h4 { padding: 15px 0; background: lighten($ui-base-color, 13%); -- cgit From 4a5401a58e2c91ad8b7aab85aaff18c991317382 Mon Sep 17 00:00:00 2001 From: cwm Date: Fri, 8 Dec 2017 20:50:39 -0600 Subject: merge tootsuite prs #5895 and #5889 into glitch flavour --- app/javascript/flavours/glitch/components/autosuggest_textarea.js | 1 + app/javascript/flavours/glitch/styles/components/index.scss | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'app/javascript/flavours/glitch/styles/components/index.scss') diff --git a/app/javascript/flavours/glitch/components/autosuggest_textarea.js b/app/javascript/flavours/glitch/components/autosuggest_textarea.js index 551528e5a..d067b252f 100644 --- a/app/javascript/flavours/glitch/components/autosuggest_textarea.js +++ b/app/javascript/flavours/glitch/components/autosuggest_textarea.js @@ -209,6 +209,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent { onBlur={this.onBlur} onPaste={this.onPaste} style={style} + aria-autocomplete='list' /> diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index 03874845e..e171b72c1 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -4854,6 +4854,10 @@ noscript { input { width: 100%; margin-bottom: 6px; + + &:focus { + outline: 0; + } } } -- cgit