diff --git a/app/assets/javascripts/discourse/models/share_link.js b/app/assets/javascripts/discourse/models/share_link.js index ddd70cbe559..ff9ee3dc457 100644 --- a/app/assets/javascripts/discourse/models/share_link.js +++ b/app/assets/javascripts/discourse/models/share_link.js @@ -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)); }, diff --git a/app/assets/stylesheets/common/base/about.scss b/app/assets/stylesheets/common/base/about.scss index 88660eb8afe..a25f7f3a2f6 100644 --- a/app/assets/stylesheets/common/base/about.scss +++ b/app/assets/stylesheets/common/base/about.scss @@ -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; } diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss index 6f52784f523..dfcebab1b34 100644 --- a/app/assets/stylesheets/common/base/header.scss +++ b/app/assets/stylesheets/common/base/header.scss @@ -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;} } diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss index ce0e6de5373..2f12c9316b4 100644 --- a/app/assets/stylesheets/common/base/rtl.scss +++ b/app/assets/stylesheets/common/base/rtl.scss @@ -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 { diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss index 777e8393563..c7535fcb2e5 100644 --- a/app/assets/stylesheets/common/base/share_link.scss +++ b/app/assets/stylesheets/common/base/share_link.scss @@ -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; diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 70da05a8351..bb0adc072f1 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -830,6 +830,7 @@ $topic-avatar-width: 45px; font-weight: normal; line-height: 18px; color: $primary; + transition: all linear .15s; & > div { margin-left: 26px;