Merge branch 'mobile_3' into mobile

This commit is contained in:
Shivam Dave 2015-07-30 14:11:08 -07:00
commit 2983ebb2c6
2 changed files with 7 additions and 7 deletions

View File

@ -376,11 +376,12 @@
font-size: 30px;
top: 0px;
left: 0px;
text-align: left; }
/* line 47, ../sass/mobile/_item.scss */
text-align: left;
height: auto; }
/* line 48, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .item-main .item-open {
display: none; }
/* line 51, ../sass/mobile/_item.scss */
/* line 52, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .title, .items-holder .item.grid-item .details {
margin-left: 30px; } }
@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) {
@ -388,10 +389,9 @@
.items-holder .item.grid-item {
width: 100%;
height: 50px; }
/* line 61, ../sass/mobile/_item.scss */
/* line 62, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .item-main .item-type {
line-height: 40px;
height: auto; }
line-height: 40px; }
/* line 66, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .title {
margin-right: 10px;

View File

@ -43,6 +43,7 @@
top: 0px;
left: 0px;
text-align: left;
height: auto
}
.item-open {
display: none;
@ -60,7 +61,6 @@
.item-main {
.item-type {
line-height: $phone-itemHeight * .8;
height: auto;
}
}
.title {