diff --git a/app/assets/javascripts/app/views/stream_post_views.js b/app/assets/javascripts/app/views/stream_post_views.js index cd4012050..81a495411 100644 --- a/app/assets/javascripts/app/views/stream_post_views.js +++ b/app/assets/javascripts/app/views/stream_post_views.js @@ -29,7 +29,14 @@ app.views.StreamPost = app.views.Post.extend({ "click .destroy_participation": "destroyParticipation" }, - tooltipSelector : ".timeago, .post_scope, .post_report, .block_user, .delete, .create_participation, .destroy_participation", + tooltipSelector : [".timeago", + ".post_scope", + ".post_report", + ".block_user", + ".delete", + ".create_participation", + ".destroy_participation", + ".permalink"].join(", "), initialize : function(){ var personId = this.model.get('author').id; diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index aba3ee972..27c4fddaa 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -1,6 +1,6 @@ @import 'perfect-scrollbar'; -@import "colors"; +@import 'color-variables'; @import "bootstrap-complete.scss"; @import 'mixins'; @@ -21,6 +21,7 @@ @import 'vendor/fileuploader'; @import 'vendor/autoSuggest'; @import 'typeahead'; +@import 'colors'; /* font overrides */ @import 'typography'; diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 866bba6b3..eb28611bf 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -1,4 +1,4 @@ -@import 'colors'; +@import 'color-variables'; @import 'animations'; /** ADMIN STYlES **/ diff --git a/app/assets/stylesheets/color-variables.scss b/app/assets/stylesheets/color-variables.scss new file mode 100644 index 000000000..b9ad9323b --- /dev/null +++ b/app/assets/stylesheets/color-variables.scss @@ -0,0 +1,30 @@ +$background-white: #FFFFFF; +$background-grey: #EEEEEE; +$background-blue: #E7F2F7; + +$grey: #2B2B2B; +$light-grey: #DDDDDD; + +$border-grey: #DDDDDD; +$border-dark-grey: #999999; + +$link-grey: #777777; +$link-disabled-grey: #999999; + +$text-grey: #999999; +$text-dark-grey: #666666; +$text: #333333; + +$white: white; +$black: black; +$green: #8EDE3D; +$light-green: lighten($green,20%); +$red: #A80000; +$blue: #3F8FBA; +$dark-blue: darken(#0984C8,10%); + +$sidebars-background: #f0f0f0; +$sidebars-sub-background: darken($sidebars-background, 12%); +$left-navbar-drawer-background: darken($sidebars-background, 6%); + +$card-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); diff --git a/app/assets/stylesheets/colors.scss b/app/assets/stylesheets/colors.scss index b9ad9323b..389c64123 100644 --- a/app/assets/stylesheets/colors.scss +++ b/app/assets/stylesheets/colors.scss @@ -1,30 +1,8 @@ -$background-white: #FFFFFF; -$background-grey: #EEEEEE; -$background-blue: #E7F2F7; +.gray { + color: $text-grey; -$grey: #2B2B2B; -$light-grey: #DDDDDD; - -$border-grey: #DDDDDD; -$border-dark-grey: #999999; - -$link-grey: #777777; -$link-disabled-grey: #999999; - -$text-grey: #999999; -$text-dark-grey: #666666; -$text: #333333; - -$white: white; -$black: black; -$green: #8EDE3D; -$light-green: lighten($green,20%); -$red: #A80000; -$blue: #3F8FBA; -$dark-blue: darken(#0984C8,10%); - -$sidebars-background: #f0f0f0; -$sidebars-sub-background: darken($sidebars-background, 12%); -$left-navbar-drawer-background: darken($sidebars-background, 6%); - -$card-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); + [class^="entypo-"], + [class*="entypo-"] { + color: $text-grey; + } +} diff --git a/app/assets/stylesheets/error_pages.scss b/app/assets/stylesheets/error_pages.scss index b6d6f2a18..a15f9fa0c 100644 --- a/app/assets/stylesheets/error_pages.scss +++ b/app/assets/stylesheets/error_pages.scss @@ -1,4 +1,4 @@ -@import 'colors'; +@import 'color-variables'; @import 'mixins'; html { min-height: 100%; } diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 505447a0e..3704de0d9 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -1,5 +1,5 @@ -@import "colors"; -@import "bootstrap-variables"; +@import 'color-variables'; +@import 'bootstrap-variables'; body { margin-top: $navbar-height; diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss index c3639ee68..e5da0ea71 100644 --- a/app/assets/stylesheets/mobile/mobile.scss +++ b/app/assets/stylesheets/mobile/mobile.scss @@ -1,4 +1,4 @@ -@import "colors"; +@import 'color-variables'; @import "bootstrap-complete"; @import "_mixins"; @import "vendor/autoSuggest"; diff --git a/app/assets/stylesheets/stream_element.scss b/app/assets/stylesheets/stream_element.scss index 2449a3c47..4f1312088 100644 --- a/app/assets/stylesheets/stream_element.scss +++ b/app/assets/stylesheets/stream_element.scss @@ -90,7 +90,6 @@ .leaflet-control-zoom { display: block; } - .grey { color: $text-grey; } .post-content p:last-of-type { margin-bottom: 0; } .nsfw-shield { color: $text-grey; @@ -101,6 +100,16 @@ } } + .permalink { + @include transition(opacity); + opacity: 0; + } + + &:hover .permalink { + opacity: .8; + &:hover { opacity: 1; } + } + div.reshare { border-left: 2px solid $border-grey; margin-top: 3px; diff --git a/app/assets/templates/feedback_tpl.jst.hbs b/app/assets/templates/feedback_tpl.jst.hbs index e41c1459c..5a7f40aff 100644 --- a/app/assets/templates/feedback_tpl.jst.hbs +++ b/app/assets/templates/feedback_tpl.jst.hbs @@ -1,4 +1,4 @@ - + {{#if public}} {{t "stream.public"}} {{else}} diff --git a/app/assets/templates/likes-info_tpl.jst.hbs b/app/assets/templates/likes-info_tpl.jst.hbs index e58e484ee..7affc3b9e 100644 --- a/app/assets/templates/likes-info_tpl.jst.hbs +++ b/app/assets/templates/likes-info_tpl.jst.hbs @@ -5,7 +5,7 @@
{{#unless likes_fetched}} - + {{t "stream.likes" count=likesCount}} diff --git a/app/assets/templates/reshare_tpl.jst.hbs b/app/assets/templates/reshare_tpl.jst.hbs index b1334fa0a..06a133bce 100644 --- a/app/assets/templates/reshare_tpl.jst.hbs +++ b/app/assets/templates/reshare_tpl.jst.hbs @@ -12,7 +12,7 @@ {{name}} {{/linkToAuthor}} - + - + + {{#if interactions.reshares_count}} - {{t "stream.reshares" count=interactions.reshares_count}} diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml index 33a625d02..f1c5b5765 100644 --- a/config/locales/javascript/javascript.en.yml +++ b/config/locales/javascript/javascript.en.yml @@ -228,6 +228,7 @@ en: unfollow: "Unfollow" enable_post_notifications: "Enable notifications for this post" disable_post_notifications: "Disable notifications for this post" + permalink: "Permalink" via: "via <%= provider %>" likes: diff --git a/features/desktop/comments.feature b/features/desktop/comments.feature index c30e7f144..32846d31b 100644 --- a/features/desktop/comments.feature +++ b/features/desktop/comments.feature @@ -79,7 +79,7 @@ Feature: commenting And I fill in the following: | text | I think thats a cat | And I press "Comment" - When I follow "less than a minute ago" within "span.details.grey" + When I follow "less than a minute ago" within "span.details.gray" Then I should see "I think thats a cat" within ".comments .comment:last-child" When I follow "less than a minute ago" within ".comments .comment:last-child" Then I should see "I think thats a cat" within ".comments .comment .highlighted"