4 Commits

Author SHA1 Message Date
Almira
6a9211f84a Merge branch 'fix-image-style' into 'development'
Fix banner image style (Remove Co-Market from customer interface)

See merge request saburly/wiaas/new-wiaas!87

(cherry picked from commit 392b113427)

3ce531ca Fix banner image style
d15cb6a2 fix image size
2018-12-05 18:24:14 +00:00
Bilal Catic
b7a5f075b1 Merge branch 'cherry-pick-f33c6aa6' into 'master'
Remove Co-Market from customer interface

See merge request saburly/wiaas/new-wiaas!86
2018-12-05 13:28:06 +00:00
Bilal Catic
2cdef7c31e Merge branch 'remove-co-market' into 'development'
Remove Co-Market from customer interface

See merge request saburly/wiaas/new-wiaas!85

(cherry picked from commit f33c6aa6e2)

1726c3d7 Remove Co-Market from customer interface
2018-12-05 13:20:43 +00:00
Bilal Catic
f51d9f5512 Merge branch 'development' into 'master'
Bugfixes

See merge request saburly/wiaas/new-wiaas!73
2018-11-19 15:42:25 +00:00
5 changed files with 16 additions and 6 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 842 KiB

View File

@@ -1,4 +1,4 @@
const APPLICATION_NAME = 'Co-Market';
const APPLICATION_NAME = 'WIAAS Market';
const API_VERSION = 'v2';
const API_SERVER_BASE = process.env.REACT_APP_API_URL;

View File

@@ -28,12 +28,12 @@ class CoMarketPackagesContainer extends Component {
<Row>
<Col xl="8" lg="8" md="8" sm="12" xs="12">
<WiaasBox id="co-market-big-commercial">
<img className="description-photo" src="https://res.cloudinary.com/co-market/image/upload/v1524472688/Co-Market/CoMarketStartsida_MAIN.jpg" alt="big-commercial"/>
<img className="description-photo" src="/static/img/WIAAS_Market_banner.jpg" alt="big-commercial"/>
</WiaasBox>
</Col>
<Col xl="4" lg="4" md="4" sm="12" xs="12">
<WiaasBox id="co-market-commercials">
<img alt="wiaas commercial" src="https://res.cloudinary.com/co-market/image/upload/v1524472688/Co-Market/CoMarketStartsida_OFFERCoor.jpg" className="commercial-photo"/>
<img alt="wiaas commercial" src="/static/img/WIAAS_Market_SMO_infobox.jpg" className="commercial-photo"/>
</WiaasBox>
</Col>
</Row>

View File

@@ -131,7 +131,6 @@
}
#co-market-big-commercial{
background: $whiteColor;
text-align: center;
.ricoh-text {
@@ -144,13 +143,24 @@
}
#co-market-commercials {
background: $whiteColor;
.commercial-photo {
width: 100%;
}
}
@media (min-width: 768px) {
#co-market-commercials {
position: relative;
.commercial-photo {
position: absolute;
width: 100%;
height: 100%;
}
}
}
#co-market-catalog {
.filter-name {
margin-top: 0.4rem;