Merge pull request #2885 from awesomerobot/master

a handful of minor style updates/fixes
This commit is contained in:
Jeff Atwood 2014-10-18 21:14:07 -07:00
commit bb8d9807aa
6 changed files with 10 additions and 13 deletions

View File

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

View File

@ -1,6 +1,4 @@
section.about {
margin-top: 20px;
padding-left: 20px;
h3 {
margin-bottom: 10px;
@ -15,9 +13,7 @@ section.about {
padding-right: 4px;
}
}
padding-bottom: 10px;
p {
margin: 10px 0;
}

View File

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

View File

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

View File

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

View File

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