github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 00:51:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: move wiki/via-email glyphs + add green background on wiki posts

Browse Source
This commit is contained in:
Régis Hanol 2014-09-10 15:25:31 +02:00
parent af75360942
commit dbcaf1276a
5 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/templates/post.js.handlebars
View File

@ -25,12 +25,6 @@
<i class="fa fa-trash-o deleted-user-avatar"></i>
{{/unless}}
</div>
{{#if wiki}}
<div {{action editPost this}} class="wiki" title="{{i18n post.wiki.about}}"><i class="fa fa-pencil-square-o fa-3x"></i></div>
{{/if}}
{{#if via_email}}
<div title="{{i18n post.via_email}}" class="via-email"><i class="fa fa-envelope-o fa-2x"></i></div>
{{/if}}
</div>
<div class='topic-body'>
@ -54,6 +48,12 @@
{{/if}}
</div>
{{/if}}
{{#if wiki}}
<div class="post-info wiki" title="{{i18n post.wiki.about}}" {{action editPost this}}><i class="fa fa-pencil-square-o"></i></div>
{{/if}}
{{#if via_email}}
<div class="post-info via-email" title="{{i18n post.via_email}}"><i class="fa fa-envelope-o"></i></div>
{{/if}}
<div {{bind-attr class=":read-state read"}} title="{{i18n post.unread}}"><i class='fa fa-circle'></i></div>
</div>

3
app/assets/javascripts/discourse/views/post_view.js
View File

@ -8,7 +8,8 @@ Discourse.PostView = Discourse.GroupedView.extend(Ember.Evented, {
'post.hidden:post-hidden',
'post.deleted',
'byTopicCreator:topic-creator',
'groupNameClass'],
'groupNameClass',
'post.wiki:wiki'],
postBinding: 'content',
historyHeat: function() {

22
app/assets/stylesheets/common/base/topic-post.scss
View File

@ -99,4 +99,24 @@ aside.quote {
background-color: scale-color($primary, $lightness: 40%);
cursor: pointer;
}
}
}
.wiki .topic-body {
background-color: rgba(64, 128, 64, .05);
}
.post-info {
&.wiki, &.via-email {
margin-right: 5px;
i.fa {
font-size: 14px;
}
}
&.wiki {
cursor: pointer;
color: rgb(64, 128, 64);
}
&.via-email {
color: scale-color($primary, $lightness: 70%);
}
}

24
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -759,24 +759,12 @@ $topic-avatar-width: 45px;
}
}
.topic-avatar {
border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
padding-top: 16px;
width: $topic-avatar-width;
float: left;
position: relative;
z-index: 2;
.wiki {
margin-top: 14px;
color: scale-color($primary, $lightness: 80%);
margin-left: 5px;
cursor: pointer;
}
.via-email {
margin: 14px 0 0 8px;
color: scale-color($primary, $lightness: 80%);
}
border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
padding-top: 16px;
width: $topic-avatar-width;
float: left;
position: relative;
z-index: 2;
}
.gap {

14
app/assets/stylesheets/mobile/topic-post.scss
View File

@ -373,19 +373,6 @@ iframe {
position: relative;
}
.wiki {
float: left;
padding: 10px;
color: #408040;
i {
float: left;
}
h3 {
float: left;
margin-left: 10px;
}
}
.modal-body {
input[type=text] {
font-size: 16px;
@ -394,7 +381,6 @@ iframe {
}
}
#share-link {
width: 290px;
}