Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2066 from riking/red-popup 

Style 'urgent' composer popups differently
This commit is contained in:
Sam 2014-03-10 10:46:15 +11:00
parent b0bbb1ce82 e0063920b7
commit bf23c7a0c4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/stylesheets/desktop/compose.scss
View File

@ -18,6 +18,12 @@
@include box-shadow(3px 3px 3px rgba($primary_shadow_color, 0.14)); @include box-shadow(3px 3px 3px rgba($primary_shadow_color, 0.14));
background: lighten($highlight, 15%); background: lighten($highlight, 15%);
border: 1px solid $highlight_border_color;
&.urgent {
background: lighten($warning_border_color, 15%);
border: 1px solid $warning_border_color;
}
h3 { h3 {
margin-bottom: 10px; margin-bottom: 10px;
@ -38,7 +44,6 @@
opacity: 1.0; opacity: 1.0;
} }
border: 1px solid $highlight_border_color;
padding: 10px; padding: 10px;
width: 600px; width: 600px;
position: absolute; position: absolute;

2
lib/composer_messages_finder.rb
View File

@ -88,6 +88,7 @@ class ComposerMessagesFinder
{templateName: 'composer/education', {templateName: 'composer/education',
wait_for_typing: true, wait_for_typing: true,
extraClass: 'urgent',
body: PrettyText.cook(I18n.t('education.sequential_replies')) } body: PrettyText.cook(I18n.t('education.sequential_replies')) }
end end
@ -118,6 +119,7 @@ class ComposerMessagesFinder
{templateName: 'composer/education', {templateName: 'composer/education',
wait_for_typing: true, wait_for_typing: true,
extraClass: 'urgent',
body: PrettyText.cook(I18n.t('education.dominating_topic', percent: (ratio * 100).round)) } body: PrettyText.cook(I18n.t('education.dominating_topic', percent: (ratio * 100).round)) }
end end