nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move doodle-relevant css into doodle css

This commit is contained in:
Andrew 2017-12-18 19:39:53 -08:00
parent 001b4eacd4
commit 4fbc1be3c4
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/mastodon/reducers/compose.js
View File

@ -320,7 +320,6 @@ export default function compose(state = initialState, action) {
return item; return item;
})); }));
<<<<<<< HEAD
case REDRAFT: case REDRAFT:
return state.withMutations(map => { return state.withMutations(map => {
map.set('text', unescapeHTML(expandMentions(action.status))); map.set('text', unescapeHTML(expandMentions(action.status)));
@ -339,10 +338,8 @@ export default function compose(state = initialState, action) {
map.set('spoiler_text', ''); map.set('spoiler_text', '');
} }
}); });
=======
case COMPOSE_DOODLE_SET: case COMPOSE_DOODLE_SET:
return state.mergeIn(['doodle'], action.options); return state.mergeIn(['doodle'], action.options);
>>>>>>> Doodle palette, options, fill tool (#172)
default: default:
return state; return state;
} }

10
app/javascript/styles/doodle.scss
View File

@ -84,3 +84,13 @@ $doodleBg: #d9e1e8;
} }
} }
} }
.compose-form__buttons-separator {
border-left: 1px solid #c3c3c3;
margin: 0 3px;
}
.compose-form__upload-button-icon {
line-height: 27px;
}

12
app/javascript/styles/mastodon/components.scss
View File

@ -383,15 +383,6 @@
padding: 10px; padding: 10px;
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 4px;
.compose-form__buttons-separator {
border-left: 1px solid #c3c3c3;
margin: 0 3px;
}
.compose-form__upload-button-icon {
line-height: 27px;
}
&:hover, &:hover,
&:focus, &:focus,
&:active, &:active,
@ -5470,7 +5461,6 @@ noscript {
} }
} }
<<<<<<< HEAD
.trends { .trends {
&__header { &__header {
color: $dark-text-color; color: $dark-text-color;
@ -5548,6 +5538,4 @@ noscript {
} }
} }
} }
=======
@import 'doodle'; @import 'doodle';
>>>>>>> Doodle palette, options, fill tool (#172)