gistfile1.diff

// import the CSS framework
$btn-default-bg: #4c77a0;
$btn-default-color: #fff;
$btn-font-weight: bold;
$btn-default-border: #608cb6;

$border-color: #66afe9;
$link-color: #005288;

@mixin focused() {
  border-color: darken($border-color, 10%);
      $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($border-color, 20%);
      @include box-shadow($shadow);
}

@import "bootstrap-sprockets";
@import "bootstrap";

<<<<<<< HEAD
body {
  .form-control {
    &[type=radio] {
      width: auto;
      height: auto;
    }
  }
  .icon-stack {
    position: relative;
  }
  .icon-stack .glyphicon {
    position: absolute; 
  }
}
=======
header {
  .header-signedin.pull-right {
    margin: 0 auto;
    float: none;
    a {
      margin: 0 8px;
      float: none;
      display: inline-block;
    }
  }
  .logo a img { margin: 20px 0 10px 0; }
}

>>>>>>> [Issue #303] Consolidates admin functionality
.modal {
  &:focus {
    .modal-content {
      @include focused;
    }
  }
}
.btn.btn-default,
a button.btn {
  background: rgb(254,199,83); /* Old browsers */
  background: -moz-linear-gradient(top,  rgba(254,199,83,1) 0%, rgba(255,207,107,1) 50%, rgba(255,189,61,1) 51%, rgba(255,186,46,1) 100%); /* FF3.6+ */
  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(254,199,83,1)), color-stop(50%,rgba(255,207,107,1)), color-stop(51%,rgba(255,189,61,1)), color-stop(100%,rgba(255,186,46,1))); /* Chrome,Safari4+ */
  background: -webkit-linear-gradient(top,  rgba(254,199,83,1) 0%,rgba(255,207,107,1) 50%,rgba(255,189,61,1) 51%,rgba(255,186,46,1) 100%); /* Chrome10+,Safari5.1+ */
  background: -o-linear-gradient(top,  rgba(254,199,83,1) 0%,rgba(255,207,107,1) 50%,rgba(255,189,61,1) 51%,rgba(255,186,46,1) 100%); /* Opera 11.10+ */
  background: -ms-linear-gradient(top,  rgba(254,199,83,1) 0%,rgba(255,207,107,1) 50%,rgba(255,189,61,1) 51%,rgba(255,186,46,1) 100%); /* IE10+ */
  background: linear-gradient(to bottom,  rgba(254,199,83,1) 0%,rgba(255,207,107,1) 50%,rgba(255,189,61,1) 51%,rgba(255,186,46,1) 100%); /* W3C */
  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fec753', endColorstr='#ffba2e',GradientType=0 ); /* IE6-9 */
  color: #000;
  border: 0 none;
  box-shadow: 0 1px 2px #CCC;
  &:hover {
    box-shadow: 0 1px 3px #000;
    color: #000;
  }
}
.btn.btn-default:hover {
  // background: lighten($btn-default-bg, 5%);
}

/* columns of same height styles */
.container-xs-height {
    display:table;
    padding-left:0px;
    padding-right:0px;
}
.row-xs-height {
    display:table-row;
}
.col-xs-height {
    display:table-cell;
    float:none;
}
@media (min-width: 768px) {
  .container-sm-height {
      display:table;
      padding-left:0px;
      padding-right:0px;
  }
  .row-sm-height {
      display:table-row;
  }
  .col-sm-height {
      display:table-cell;
      float:none;
  }
}
@media (min-width: 992px) {
  .container-md-height {
      display:table;
      padding-left:0px;
      padding-right:0px;
  }
  .row-md-height {
      display:table-row;
  }
  .col-md-height {
      display:table-cell;
      float:none;
  }
}
@media (min-width: 1200px) {
  .container-lg-height {
      display:table;
      padding-left:0px;
      padding-right:0px;
  }
  .row-lg-height {
      display:table-row;
  }
  .col-lg-height {
      display:table-cell;
      float:none;
  }
}