Merge pull request #439 from sharetribe/remove-feed

Remove some event feed related (old and unused) code
sharetribe · Jun 5, 2014 · 33b8d76 · 33b8d76
2 parents b762e7a + 539e526
commit 33b8d76
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 227 deletions.
diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss
@@ -976,30 +976,6 @@ a.lightbox-x {
   }
 }
 
-.feed-image {
-  position: absolute;
-  right: lines(0.5); top: lines(0.5);
-  width: lines(3);
-  height: lines(3);
-
-  img {
-    @include border-radius(em(5));
-    width: lines(3);
-    height: lines(3);
-  }
-
-  @include media(tablet) {
-    right: 0; top: lines(1);
-    width: lines(5);
-    height: lines(5);
-    img {
-      width: lines(5);
-      height: lines(5);
-    }
-  }
-
-}
-
 .view-item {
 
   .item-description {
@@ -1428,172 +1404,6 @@ a.lightbox-x {
       }
     }
   }
-
-  .profile-listings, .profile-testimonials, .profile-organizations {
-
-    h2 {
-      margin-top: 0;
-      margin-bottom: lines(0.25);
-      .text-with-icon {
-        padding-top: em(2);
-      }
-      display: inline-block;
-    }
-
-    .show-closed-link {
-      display: inline-block;
-      @include small-type;
-      margin-left: lines(0.5);
-    }
-
-    .load-more-link {
-      border-top: 1px dotted $border;
-      text-align: center;
-      padding: lines(0.5);
-    }
-
-    @include media(tablet) {
-      margin-top: lines(2);
-      padding-right: lines(14);
-      h2 {
-        @include big-type;
-        .text-with-icon {
-          padding-top: 0;
-        }
-      }
-    }
-  }
-
-  .profile-listings, .profile-organizations {
-
-    .feed-item {
-      padding: lines(0.5) lines(0);
-
-      .feed-content {
-        margin: 0 lines(4.25) 0 0;
-        max-width: 100%;
-        // Share type label
-        .share-type-link {
-          font-size: em(12);
-        }
-        .feed-listing-icons {
-          display: inline-block;
-        }
-      }
-
-      h2 {
-        margin-bottom: 0;
-        @include normal-type;
-        font-weight: 600;
-      }
-
-      .edit-profile-listing-links {
-        display: inline-block;
-        padding-top: em(5);
-      }
-
-      @include media(tablet) {
-        padding: lines(0.5) lines(0);
-
-        .feed-content {
-          margin: 0 lines(5) 0 0;
-        }
-      }
-
-    }
-
-    .feed-image {
-      right: lines(0);
-
-      @include media(tablet) {
-        top: lines(0.75);
-        width: lines(4);
-        height: lines(4);
-        img {
-          width: lines(4);
-          height: lines(4);
-        }
-      }
-    }
-
-  }
-
-  .profile-testimonials {
-
-    h2 {
-      display: inline-block;
-    }
-
-    .small-text {
-      display: inline-block;
-      vertical-align: top;
-      @include normal-type;
-    }
-
-    .testimonial {
-      @include small-type;
-      position: relative;
-      border-top: 1px dotted $border;
-      padding: lines(0.25) 0 lines(0.25) lines(1.5);
-
-      .avatar {
-        position: absolute;
-        left: 0; top: lines(0.5);
-        img {
-          @include border-radius(em(5));
-        }
-      }
-
-      h3, small {
-        display: inline;
-      }
-
-      .testimonial-description {
-        position: relative;
-        min-height: lines(1.5);
-      }
-
-      .testimonial-text {
-        color: $aside;
-        font-style: italic;
-        padding-left: lines(1.5);
-        padding-bottom: lines(0.25);
-      }
-
-      .testimonial-icon {
-        position: absolute;
-        @include large-type;
-      }
-
-      .positive {
-        color: $green;
-      }
-
-      .negative {
-        color: $red;
-      }
-
-    }
-
-    @include media(tablet) {
-      padding-right: lines(14);
-
-      .testimonial {
-        @include normal-type;
-        padding: lines(0.5) 0 lines(0.25) lines(2.5);
-
-        .avatar {
-          width: lines(2);
-        }
-
-        h3 {
-          margin: 0;
-        }
-      }
-
-    }
-
-  }
 }
 
 /*

diff --git a/app/views/homepage/_recent_listing.haml b/app/views/homepage/_recent_listing.haml
diff --git a/app/views/listings/_additional_listings.haml b/app/views/listings/_additional_listings.haml
diff --git a/app/views/listings/_displayed_price.haml b/app/views/listings/_displayed_price.haml
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1411,8 +1411,6 @@ en:
       processing_uploaded_image: "(Processing uploaded image...)"
       price_excludes_vat: "(excludes VAT)"
       listing_created_at: "Listing created"
-    displayed_price:
-      price_excludes_vat: "(excludes VAT)"
     verification_required:
       verification_required: "Verification required"
   mapview: