Commit 8b719dae authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Merge branch 'master' into macclane

parents 07acdae9 69d1e90e

module/Oscar/view/layout/layout.phtml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ $this->headScript(); 
        <link rel="stylesheet" href="<?= $this->basePath() . '/css/fontello/css/animation.css' ?>">



        <link rel="stylesheet" href="<?= $this->basePath() . '/css/'. $this->options()->theme() .'.css' ?>">

        <?php if( file_exists(__DIR__.'/../../../public/css/custom/custom.css')): ?>

        <?php if( file_exists(__DIR__.'/../../../../public/custom/custom.css')): ?>

        <link rel="stylesheet" href="<?= $this->basePath() . '/custom/custom.css' ?>">

        <?php endif; ?>

        <?php /* echo $this->headLink(array(

public/css/_common.scss

+2 −2
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ 
}



html body {

  background-image: url($bg-image) !important;;

  background-image: url($bg-image);

  background-size: cover;

  background-attachment: fixed;

  background-position: bottom center;
@@ -2103,7 +2103,7 @@ $colorSelected: #0088cc; 
    position: absolute;

    background: white;

    z-index: 2;

    box-shadow: 0 .5em .3em rgba(0,0,0,.3em);

    box-shadow: 0 .5em .3em rgba(0,0,0,.3);

  }

   .item {

    transition: all .25s;

public/css/adaj.css

+5315 −3096

File changed.

Preview size limit exceeded, changes collapsed.

public/css/adaj.css.map

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.

public/css/app-beta.css

+5313 −3095

File changed.

Preview size limit exceeded, changes collapsed.