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

a handful of minor style updates/fixes

This commit is contained in:
Kris Aubuchon 2014-10-18 23:07:55 -04:00
parent c59e56ec63
commit d132b35426
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/models/share_link.js
View File

@ -48,7 +48,7 @@ Discourse.ShareLink.reopenClass({
(function() { (function() {
Discourse.ShareLink.addTarget('twitter', { Discourse.ShareLink.addTarget('twitter', {
iconClass: 'fa-twitter', iconClass: 'fa-twitter-square',
generateUrl: function(link, title) { generateUrl: function(link, title) {
return ("http://twitter.com/intent/tweet?url=" + encodeURIComponent(link) + "&text=" + encodeURIComponent(title) ); return ("http://twitter.com/intent/tweet?url=" + encodeURIComponent(link) + "&text=" + encodeURIComponent(title) );
}, },
@ -66,7 +66,7 @@ Discourse.ShareLink.reopenClass({
}); });
Discourse.ShareLink.addTarget('google+', { Discourse.ShareLink.addTarget('google+', {
iconClass: 'fa-google-plus', iconClass: 'fa-google-plus-square',
generateUrl: function(link) { generateUrl: function(link) {
return ("https://plus.google.com/share?url=" + encodeURIComponent(link)); return ("https://plus.google.com/share?url=" + encodeURIComponent(link));
}, },
@ -75,7 +75,7 @@ Discourse.ShareLink.reopenClass({
}); });
Discourse.ShareLink.addTarget('email', { Discourse.ShareLink.addTarget('email', {
iconClass: 'fa-envelope', iconClass: 'fa-envelope-square',
generateUrl: function(link, title) { generateUrl: function(link, title) {
return ("mailto:?to=&subject=" + encodeURIComponent('[' + Discourse.SiteSettings.title + '] ' + title) + "&body=" + encodeURIComponent(link)); return ("mailto:?to=&subject=" + encodeURIComponent('[' + Discourse.SiteSettings.title + '] ' + title) + "&body=" + encodeURIComponent(link));
}, },

4
app/assets/stylesheets/common/base/about.scss
View File

@ -1,6 +1,4 @@
section.about { section.about {
margin-top: 20px;
padding-left: 20px;
h3 { h3 {
margin-bottom: 10px; margin-bottom: 10px;
@ -16,8 +14,6 @@ section.about {
} }
} }
padding-bottom: 10px;
p { p {
margin: 10px 0; margin: 10px 0;
} }

7
app/assets/stylesheets/common/base/header.scss
View File

@ -168,6 +168,7 @@
a { a {
display: block; display: block;
padding: 5px; padding: 5px;
transition: all linear .15s;
} }
&:hover a:not(.badge-notification) { &:hover a:not(.badge-notification) {
@ -256,7 +257,7 @@
} }
input[type='text'] { input[type='text'] {
width: 93%; width: 518px;
height: 22px; height: 22px;
margin: 5px; margin: 5px;
padding: 5px; padding: 5px;
@ -283,11 +284,9 @@
// I am ghetto using this to display "Show More".. be warned // I am ghetto using this to display "Show More".. be warned
.no-results { .no-results {
padding: 5px; padding: 5px;
height: 12px; text-align: center;
width:60%;
} }
.filter { .filter {
float: right;
padding: 0; padding: 0;
&:hover {background: transparent;} &:hover {background: transparent;}
} }

1
app/assets/stylesheets/common/base/rtl.scss
View File

@ -242,6 +242,7 @@
text-align: center; text-align: center;
margin: 0px 0px 0px 5px; margin: 0px 0px 0px 5px;
list-style: none outside none; list-style: none outside none;
transition: all linear 0.15s;
} }
.nav-pills > li { .nav-pills > li {

2
app/assets/stylesheets/common/base/share_link.scss
View File

@ -5,7 +5,7 @@
left: 20px; left: 20px;
z-index: 990; z-index: 990;
box-shadow: 0 1px 5px rgba(0,0,0, .4); box-shadow: 0 1px 5px rgba(0,0,0, .4);
background-color: scale-color-diff(); background-color: $secondary;
padding: 6px 10px 10px 10px; padding: 6px 10px 10px 10px;
width: 300px; width: 300px;
display: none; display: none;

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

@ -830,6 +830,7 @@ $topic-avatar-width: 45px;
font-weight: normal; font-weight: normal;
line-height: 18px; line-height: 18px;
color: $primary; color: $primary;
transition: all linear .15s;
& > div { & > div {
margin-left: 26px; margin-left: 26px;