Commit b6936183 authored by Steffen van Bergerem's avatar Steffen van Bergerem
Browse files

Merge pull request #6621 from Fensterbank/6610-improved-gallery 

add a card footer in gallery containing meta data and link to single post view
parents 091c4260 e8bddcc7

app/assets/stylesheets/_application.scss

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
@import 'vendor/autoSuggest';

@import 'typeahead';

@import 'colors';

@import 'card-footer';



/* font overrides */

@import 'typography';

app/assets/stylesheets/card-footer.scss

0 → 100644
+29 −0
Original line number Diff line number Diff line 
.card-footer {

  background-color: $background-grey;

  border-top: 1px solid $border-medium-grey;

  bottom: 0;

  font-size: $font-size-small;

  left: 0;

  line-height: $line-height-computed;

  margin-left: 0;

  min-height: $line-height-computed + 1;

  position: absolute;

  width: 100%;



  .footer-container {

    padding: 1px 5px;



    a {

      color: $text-grey;

      font-weight: normal;

      margin-right: 4px;

    }

  }

}



// gallery-picture specific styles for card-footer

.media {

  .gallery-picture img { margin-bottom: $line-height-computed + 2; }



  .card-footer .footer-container {  font-size: $font-size-base; }

}

app/assets/stylesheets/color-variables.scss

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ $light-grey: #ddd; 
$border-grey: $light-grey;

$border-medium-grey: $medium-gray;

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

$border-medium-grey: #ccc;



$link-grey: #777;

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

app/assets/stylesheets/hovercard.scss

+5 −28
Original line number Diff line number Diff line
@@ -26,11 +26,14 @@ 


  $image_width: 80px; /* including margin */



  & > h4, & > div {

  > h4,

  > div:not(.card-footer) {

    margin-left: $image_width;

  }



  & > h4, & > div, .hashtags {

  > h4,

  > div,

  .hashtags {

    overflow: hidden;

    white-space: nowrap;

    text-overflow: ellipsis;
@@ -64,32 +67,6 @@ 
  }



  .btn-group.aspect_membership_dropdown { margin: 0 !important; }



  .hovercard_footer {

    position: absolute;

    bottom: 0;

    left: 0;

    background-color: $background-grey;

    margin-left: 0;



    width: 100%;

    min-height: 19px;



    font-size: 10px;

    line-height: 18px;



    border-top: 1px solid #cccccc;



    .footer_container {

      padding: 1px 5px;



      a {

        color: $text-grey;

        margin-right: 4px;

        font-weight: normal;

      }

    }

  }

}



#hovercard_container {

app/assets/stylesheets/media-box.scss

+6 −3
Original line number Diff line number Diff line 
.media { margin: 10px; }

.media {

  margin: 10px;

  position: relative;

}



.media,

.bd {
@@ -10,8 +13,8 @@ 
.media .img {

  float: left;

  margin-right: 10px;



  img { display: block; }

}



.media .img img { display: block }

.media .imgEt { float: right; margin-left: 10px; }