treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

add keyboard shortcut to getting started, add missing list style

lolsob-rspec
cwm 2017-12-08 20:30:45 -06:00
parent 0fbf7f2838
commit 2668d56334
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/flavours/glitch/features/getting_started/index.js
View File

@ -30,6 +30,7 @@ const messages = defineMessages({
show_me_around: { id: 'getting_started.onboarding', defaultMessage: 'Show me around' }, show_me_around: { id: 'getting_started.onboarding', defaultMessage: 'Show me around' },
pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' }, pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' }, lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
keyboard_shortcuts: { id: 'navigation_bar.keyboard_shortcuts', defaultMessage: 'Keyboard shortcuts' },
}); });
const mapStateToProps = state => ({ const mapStateToProps = state => ({
@ -88,7 +89,7 @@ export default class GettingStarted extends ImmutablePureComponent {
navItems = navItems.concat([ navItems = navItems.concat([
<ColumnLink key='5' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />, <ColumnLink key='5' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
<ColumnLink key='6' icon='thumb-tack' text={intl.formatMessage(messages.pins)} to='/pinned' />, <ColumnLink key='6' icon='thumb-tack' text={intl.formatMessage(messages.pins)} to='/pinned' />,
<ColumnLink key='9' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />, <ColumnLink key='11' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />,
]); ]);
if (myAccount.get('locked')) { if (myAccount.get('locked')) {

12
app/javascript/flavours/glitch/styles/components/index.scss
View File

@ -2542,6 +2542,10 @@ button.icon-button.active i.fa-retweet {
margin-left: 0; margin-left: 0;
} }
.column-header__links .text-btn {
margin-right: 10px;
}
.column-header__button { .column-header__button {
background: lighten($ui-base-color, 4%); background: lighten($ui-base-color, 4%);
border: 0; border: 0;
@ -2664,6 +2668,14 @@ button.icon-button.active i.fa-retweet {
overflow-y: hidden; 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 // notif cleaning drawer
&.ncd { &.ncd {
transition: none; transition: none;