Skip to content

Commit

Permalink
Merge updated master into this branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@lortza
lortza committed May 31, 2016
2 parents 7dfc7e5 + 2db8c15 commit 424aeb5
Show file tree
Hide file tree
Showing 21 changed files with 150 additions and 137 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Expand Up @@ -18,6 +18,8 @@ tester2.rb
tester.html.erb
tester2.html.erb
tester.js.erb
coverage/*
spec/vcr_cassettes/*

# Ignore application configuration
/config/application.yml
12 changes: 6 additions & 6 deletions app/assets/stylesheets/buttons.scss
View file
Expand Up @@ -8,7 +8,7 @@
padding: 0.2em 0.5em;
display: block;
float: left;
margin-right: 1px;
margin-right: 1px;
background-color: transparent;}
.pagination .disabled {
color: transparent;
Expand Down Expand Up @@ -50,11 +50,11 @@


button.close {
color: white;
color: white;
text-shadow: none;
border: none;
} /* button.close */

.button-main {
a {
color: $light-blue;
Expand All @@ -72,7 +72,7 @@ button.close {
text-decoration: none;
}
} /* a */

} /* .button-main */

.button-large {
Expand All @@ -94,14 +94,14 @@ button.close {
text-decoration: none;
}
} /* a */

} /* .button-large */



/* MODAL FOOTER BUTTONS */
.modal-footer {
.btn {
.btn {
a {
color: black;

Expand Down
34 changes: 22 additions & 12 deletions app/assets/stylesheets/lists.scss
View file
Expand Up @@ -12,17 +12,27 @@ article#list {
.list-image-stack-container {
float: left;
margin: 0px 15px 15px 15px;
min-width: 200px;
min-width: 200px;
height: 85px;
img {
width: 50px;
height: 75px;
float: left;
margin-right: -20px;
margin-right: -20px;
border-left: 1px solid $primary-background-color;
-webkit-box-shadow: 3px 3px 3px rgba(0,0,0,0.3);
-moz-box-shadow: 3px 3px 3px rgba(0,0,0,0.3);
box-shadow: 3px 3px 3px rgba(0,0,0,0.3);
} /* img */
.missing-poster {
width: 50px;
height: 75px;
float: left;
margin-right: -20px;
margin-top: 0px;
font-size: 5px;
} /* .missing-poster */

} /* .list-image-stack-container */
.list-details {
width: 45%;
Expand All @@ -35,24 +45,24 @@ article#list {
float: right;
margin-right: 15px;
} /* .list-mgt-links */

h2 {
margin: 0px;
margin: 0px;
} /* h2 */
ul {
list-style-type: none;
list-style-type: none;
padding: 0;
} /* ul */
} /* article#list */

.count {
font-size: 60%;
color: $light-blue;
color: $light-blue;
} /* .count */

@media screen and (max-width: 975px) {
article#list {

.list-details {
// clear: both;
margin-left: 15px;
Expand All @@ -64,21 +74,21 @@ article#list {
margin-left: 15px;
} /* .list-mgt-links */
} /* article#list */

} /* 975px */

@media screen and (max-width: 670px) {

article#list {
.list-details {
width: 95%;
width: 95%;
} /* .list-details */

.list-mgt-links {
// clear: both;
float: left;
float: left;
} /* .list-mgt-links */

} /* article#list */

} /* 670px */
79 changes: 39 additions & 40 deletions app/assets/stylesheets/movies.scss
View file
Expand Up @@ -61,20 +61,20 @@ article.tile-cover-pic {
.modal-content {
background-color: $primary-background-color;
} /* .modal-dialog */

.modal {
img {
border: 1px solid #000;
// width: 200px;
} /* img */
} /* img */
h1 {
line-height: 99%;
margin-bottom: 10px;
margin-bottom: 10px;
} /* h1 */
.partial-spacer {
margin-top: 5%;
margin-top: 5%;
} /* .partial-spacer */

/* modal button links */
.watch-info {
margin-top: 10px;
Expand Down Expand Up @@ -106,7 +106,7 @@ article.tile-cover-pic {
/* MOVIE SHOW PAGE */

.movie-show {

a {
color: $link-color;

Expand All @@ -119,7 +119,7 @@ article.tile-cover-pic {
background-color: transparent;
text-decoration: none;
}/* hover */
}/* a */
}/* a */

.button-main {
a {
Expand All @@ -136,7 +136,7 @@ article.tile-cover-pic {
} /* hover */
}/* a */
} /* .button-main */

.sidebar-button {
a {
width: 100%;
Expand Down Expand Up @@ -202,7 +202,6 @@ article.tile-cover-pic {
}
} /* a */
} /* .screening-link */

} /* .movie-show */


Expand All @@ -222,8 +221,7 @@ article.tile-cover-pic {
background: -o-linear-gradient(bottom, rgba(0,0,0,0), rgba(0,0,0,0.5)); /* For Opera 11.1 to 12.0 */
background: -moz-linear-gradient(bottom, rgba(0,0,0,0), rgba(0,0,0,0.5)); /* For Firefox 3.6 to 15 */
background: linear-gradient(to bottom, rgba(0,0,0,0), rgba(0,0,0,0.5)); /* Standard syntax (must be last) */

} /* gradient-box */
} /* gradient-box */

.backdrop-image {
width: 100%;
Expand All @@ -233,21 +231,21 @@ article.tile-cover-pic {
position: relative;
z-index: 1;
img {
width: 100%;
width: 100%;
} /* img */
} /* .backdrop-image */


} /* .movie-splash-container */

.movie-bottom-details {
clear: both;
clear: both;
position: relative;
.sidebar {
max-width: 185px;
max-width: 185px;
text-align: center;
img {
width: 100%;
width: 100%;
margin-bottom: 10%;
} /* img */
} /* .sidebar */
Expand All @@ -273,7 +271,7 @@ article.tile-cover-pic {
margin-bottom: 20px;
img {
float: left;
width: 45%;
width: 45%;
} /* img */
.watch-info {
width: 45%;
Expand All @@ -282,16 +280,16 @@ article.tile-cover-pic {
} /* .col-xs-3 */

.col-xs-9 {
clear: both;
clear: both;
width: 100%;
} /* .col-xs-9 */

} /* .modal */


article.movie-show {
#gradient-box {
height: 0px;
height: 0px;
width: 0px;
visibility: hidden;
} /* gradient-box */
Expand All @@ -306,7 +304,7 @@ article.tile-cover-pic {
margin-bottom: 5%;
width: 100%;
.form-control {
width: 75%;
width: 75%;
} /* .form-control */
} /* .col-xs-6 */
} /* article.movie-show */
Expand All @@ -321,7 +319,7 @@ article.tile-cover-pic {

article.movie-show {
.backdrop-image, #movie-splash-container, #gradient-box {
height: 0px;
height: 0px;
visibility: hidden;
float: left;
} /* .backdrop-image */
Expand All @@ -331,21 +329,21 @@ article.tile-cover-pic {
// height: 300px;
// float: right;
img {
height: 300px;
height: 300px;
} /* img */
} /* .backdrop-image */

.col-xs-3 {
clear: both;
width: 100%;
width: 100%;
.sidebar {
float: left;
max-width: 100%;
max-width: 100%;
img {
width: 45%;
width: 45%;
} /* img */
.mobile {
float: right;
float: right;
} /* .mobile */
} /* .sidebar */
} /* .col-xs-3 */
Expand All @@ -355,12 +353,12 @@ article.tile-cover-pic {
width: 100%;
.col-xs-6 {
.form-control {
width: 50%;
width: 50%;
} /* .form-control */
.form-control-submit {
width: 20%;
} /* .form-control-submit */
} /* .col-xs-6 */
} /* .form-control-submit */
} /* .col-xs-6 */
} /* .col-xs-9 */
}/* article.movie-show */
} /* 600px */
Expand All @@ -377,6 +375,7 @@ article.tile-cover-pic {
width: $mobile-modal-poster-width;
height: $mobile-modal-poster-height;
text-align: center;
width: 100%;
} /* img */
.missing-poster {
width: $mobile-modal-poster-width;
Expand All @@ -387,30 +386,30 @@ article.tile-cover-pic {
width: 100%;
clear: both;
p {
font-size: 20px;
font-size: 20px;
} /* p */
} /* .watch-info */
} /* .col-xs-3 */
.col-xs-9 {
clear: both;
clear: both;
width: 100%;
} /* .col-xs-9 */
} /* .modal */

article.movie-show {
.col-xs-3 {
clear: both;
width: 100%;
width: 100%;
.sidebar {
// float: left;
width: 100%;
width: 100%;
img {
width: 50%;
float: left;
float: left;
} /* img */
.mobile {
max-width: 45%;
float: right;
float: right;
} /* .mobile */
} /* .sidebar */
} /* .col-xs-3 */
Expand All @@ -420,12 +419,12 @@ article.tile-cover-pic {
.col-xs-6 {
width: 100%;
.form-control {
width: 180px;
width: 180px;
} /* .form-control */
.form-control-submit {
width: auto;
} /* .form-control-submit */
} /* .col-xs-6 */
} /* .form-control-submit */
} /* .col-xs-6 */
} /* .col-xs-9 */
}/* article.movie-show */

Expand Down

0 comments on commit 424aeb5

Please sign in to comment.