Commit ebe27541 authored by Jonne Haß's avatar Jonne Haß
Browse files

Merge pull request #6457 from svbergerem/permalink-v1 

Add permalink for stream elements
parents 7b4d7dc7 b2e3c4f9

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure. 
* Allow users to view a posts locations on an OpenStreetMap [#6256](https://github.com/diaspora/diaspora/pull/6256)

* Redesign and unify error pages [#6428](https://github.com/diaspora/diaspora/pull/6428)

* Redesign and refactor report admin interface [#6378](https://github.com/diaspora/diaspora/pull/6378)

* Add permalink icon to stream elements [#6457](https://github.com/diaspora/diaspora/pull/6457)



# 0.5.4.0

app/assets/javascripts/app/views/stream_post_views.js

+8 −1
Original line number Diff line number Diff line
@@ -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;

app/assets/stylesheets/_application.scss

+2 −1
Original line number Diff line number Diff line 
@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';

app/assets/stylesheets/admin.scss

+1 −1
Original line number Diff line number Diff line 
@import 'colors';

@import 'color-variables';

@import 'animations';



/** ADMIN STYlES **/

app/assets/stylesheets/color-variables.scss

0 → 100644
+30 −0
Original line number Diff line number Diff line 
$white: #fff;

$black: #000;



$text-grey: #999;

$text-dark-grey: #666;

$text: #333;



$background-white: $white;

$background-grey: #eee;

$background-blue: #e7f2f7;



$grey: #2b2b2b;

$light-grey: #ddd;



$border-grey: $light-grey;

$border-dark-grey: $text-grey;



$link-grey: #777;

$link-disabled-grey: $text-grey;



$green: #8ede3d;

$light-green: lighten($green, 20%);

$red: #a80000;

$blue: #3f8fba;



$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, .16), 0 2px 10px 0 rgba(0, 0, 0, .12);