Merge 0e3e52a into 4a88ac6

app/assets/stylesheets/application.scss

@@ -15,14 +15,17 @@
 
 @import 'components/accordion';
 @import 'components/admin';
-@import 'components/admin-subnav';
 @import 'components/admin-auctions-index';
+@import 'components/admin-subnav';
 @import 'components/alerts';
+@import 'components/auction-details';
 @import 'components/auction-form';
+@import 'components/auction-header';
+@import 'components/auction-list-item';
 @import 'components/auction-show';
-@import 'components/auctions-index';
 @import 'components/auction-sidebar';
-@import 'components/auction-header';
+@import 'components/auctions-index';
+@import 'components/bidding-status-label';
 @import 'components/bids';
 @import 'components/disclaimer';
 @import 'components/docs';
@@ -32,12 +35,11 @@
 @import 'components/header';
 @import 'components/insights';
 @import 'components/intro';
-@import 'components/ribbon';
+@import 'components/pagination';
+@import 'components/profile';
 @import 'components/secondary_nav';
+@import 'components/sign-up';
 @import 'components/slabs';
 @import 'components/striped-table';
-@import 'components/sign-up';
-@import 'components/pagination';
-@import 'components/profile';
 
 @import 'junk_drawer';

app/assets/stylesheets/components/_auction-details.scss

@@ -0,0 +1,12 @@
+.details-label {
+  font-size: $h6-font-size;
+  font-weight: $font-light;
+}
+
+.details-title {
+  margin: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-weight: 400;
+}

app/assets/stylesheets/components/_auction-list-item.scss

@@ -0,0 +1,76 @@
+.auction-list-item {
+  background-color: $color-white;
+  border: 1px solid $color-gray-neutral;
+  border-radius: $border-radius;
+  -ms-flex-direction: column;
+  -webkit-flex-direction: column;
+  flex-direction: column;
+  font-weight: $font-light;
+  margin-bottom: $site-margins;
+  position: relative;
+
+  .auction-content-wrapper {
+    flex: 1 0 auto;
+    padding: $site-margins / 2;
+  }
+
+  .auction-title {
+    font-size: 2.5rem;
+    margin-top: 1rem;
+  }
+
+  .bidding-details {
+    background-color: $color-gray-lightest;
+    border-bottom-left-radius: $border-radius;
+    border-bottom-right-radius: $border-radius;
+    padding-left: $site-margins;
+    padding-right: $site-margins;
+    width: 100%;
+  }
+
+  .status-label {
+    margin-right: .5em;
+  }
+
+  .details-list-item {
+    @include span-columns(6);
+
+    margin-bottom: 0;
+    margin-top: 0;
+    padding-bottom: $base-padding-lite;
+
+    &:nth-child(2n) {
+      @include omega();
+    }
+
+    &:last-child,
+    &:nth-last-child(2):nth-child(odd) {
+      padding-bottom: 0;
+
+      &::after {
+        margin: 0;
+      }
+    }
+  }
+
+  .details-list {
+    margin: 0;
+    margin-bottom: $base-padding;
+    margin-top: $base-padding;
+    width: 100%;
+    padding-left: 0;
+    display: table;
+  }
+
+  .bidding-deadline {
+    display: inline-block;
+    margin: 0;
+    margin-bottom: $base-padding-lite;
+  }
+
+  @include media($medium-screen) {
+    .winning-bid-detail {
+      float: right;
+    }
+  }
+}

app/assets/stylesheets/components/_auction-show.scss

@@ -1,4 +1,5 @@
 .auction-show {
+  border: 1px solid $color-gray-neutral;
   margin-top: $site-margins;
 
   .usa-alert {
@@ -18,8 +19,8 @@
   h1 {
     display: inline-block;
     float: left;
-    margin-bottom: 0;
-    margin-top: 0;
+    margin-bottom: .5rem;
+    margin-top: 2rem;
   }
 
   .usa-button-outline {
@@ -33,148 +34,35 @@
   .auction-subtitle {
     float: left;
     font-size: $base-font-size;
-    margin: 2rem 0;
-
-    &:nth-child(1) {
-      margin-right: $site-margins;
-    }
+    margin-right: 1rem;
+    margin-bottom: 1rem;
+    margin-top: 1rem;
   }
 }
 
-.auction-body {
-  table {
-    margin: 0;
-  }
-}
-
-.issue-list-item {
-  background-color: $color-white;
-  border: 1px solid $color-gray-neutral;
-  border-radius: $border-radius;
-  -ms-flex-direction: column;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-  font-weight: $font-light;
-  margin-bottom: $site-margins;
-  position: relative;
-
-  .issue-content-wrapper {
-    flex: 1 0 auto;
-  }
-
-  .issue-label {
-    margin-top: .75rem;
-  }
-
-  .issue-bid-details {
-    background-color: $color-gray-lightest;
-    border-bottom-left-radius: $border-radius;
-    border-bottom-right-radius: $border-radius;
-    padding-left: $site-margins;
-    padding-right: $site-margins;
-    width: 100%;
-
-    .current-bid-box {
-      position: relative;
-
-      .current-bid-box-children {
-        position: relative;
-        top: 50%;
-
-        .current-bid-header {
-          font-weight: 400;
-        }
-
-        .current-bid {
-          font-size: 1.3rem;
-          font-weight: 700;
-        }
-
-        .current-bid-link {
-          white-space: nowrap;
-        }
-      }
-    }
-
-    p {
-      display: inline;
-      margin-right: 40px;
-    }
-  }
-}
-
-.issue-title {
-  font-size: 2.5rem;
-}
-
-.issue-list-item-details,
-.issue-bids-info {
-  font-weight: $font-normal;
-}
-
-.issue-bids-info-item {
+.admin-edit {
   display: inline-block;
-  margin-bottom: $base-padding;
-  margin-right: $site-margins;
 
-  &:last-of-type {
-    margin-right: 0;
-  }
-
-  span {
-    font-weight: $font-normal;
+  @include media($medium-screen) {
+    margin-top: 3rem;
+    float: right;
   }
 }
 
-.issue-icon {
-  max-width: none;
-  width: 25px;
+.auction-body {
+  table {
+    margin: 0;
+  }
 }
 
-.issue-details-label {
+.details-label {
   font-size: $h6-font-size;
   font-weight: $font-light;
 }
 
-.issue-details-title {
+.details-title {
   margin: 0;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-
-.issue-details-list-item {
-  @include span-columns(6);
-
-  margin-bottom: 0;
-  margin-top: 0;
-  padding-bottom: $base-padding-lite;
-
-  &:nth-child(2n) {
-    @include omega();
-  }
-
-  &:last-child,
-  &:nth-last-child(2):nth-child(odd) {
-    padding-bottom: 0;
-
-    &::after {
-      margin: 0;
-    }
-  }
-}
-
-.issue-details-list {
-  margin: 0;
-  margin-bottom: $base-padding;
-  margin-top: $base-padding;
-  width: 100%;
-  padding-left: 0;
-  display: table;
-}
-
-.issue-bid-deadline {
-  display: inline-block;
-  margin: 0;
-  margin-bottom: $base-padding-lite;
-}

app/assets/stylesheets/components/_auction-sidebar.scss

@@ -67,6 +67,11 @@
   }
 }
 
+.auction-label-info {
+  font-size: $h4-font-size;
+  padding-bottom: $site-margins;
+}
+
 .auction-detail-bid {
   padding-bottom: $base-padding;
 }

app/assets/stylesheets/components/_auctions-index.scss

@@ -6,61 +6,17 @@
   -ms-justify-content: space-between;
   -webkit-justify-content: space-between;
   justify-content: space-between;
-}
 
-.auction-wrapper .issue-list-item {
-  display: flex;
+  .auction-list-item {
+    display: flex;
 
-  &:nth-child(2n) {
-    @include omega();
+    &:nth-child(2n) {
+      @include omega();
+    }
   }
 }
 
-.auction-wrapper .issue-label {
-  padding: $site-margins / 2;
-}
-
 .pagination-details {
   margin-top: $site-margins;
 }
 
-.index-issue-title {
-  font-size: 2.5rem;
-  margin-top: 1rem;
-}
-
-.issue-vitals {
-  font-size: $h5-font-size;
-  font-style: oblique;
-  font-weight: $font-normal;
-
-  .status-label {
-    padding: .25em .5em;
-    margin-right: .5em;
-    font-weight: $font-bold;
-  }
-
-  .auction-label-expiring {
-    background-color: $color-gold;
-  }
-
-  .auction-label-over {
-    background-color: $color-gray-light;
-  }
-
-  .auction-label-future {
-    background-color: $color-cool-blue;
-    color: $color-white;
-  }
-
-  .auction-label-open {
-    background-color: $color-green;
-    color: $color-white;
-  }
-}
-
-@include media($medium-screen) {
-  .winning-bid-detail {
-    float: right;
-  }
-}