diff --git a/sites/all/modules/features/showroom/showroom.features.field_instance.inc b/sites/all/modules/features/showroom/showroom.features.field_instance.inc index c45e73ae..33606908 100644 --- a/sites/all/modules/features/showroom/showroom.features.field_instance.inc +++ b/sites/all/modules/features/showroom/showroom.features.field_instance.inc @@ -145,9 +145,10 @@ function showroom_field_default_field_instances() { ), 'print' => array( 'label' => 'above', + 'module' => 'materio_showroom', 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, + 'type' => 'materio_showroom_location_simple_text', + 'weight' => 7, ), 'teaser' => array( 'label' => 'above', diff --git a/sites/all/themes/gui/materiobasetheme/css/styles.css b/sites/all/themes/gui/materiobasetheme/css/styles.css index 6945cdc2..560c666b 100644 --- a/sites/all/themes/gui/materiobasetheme/css/styles.css +++ b/sites/all/themes/gui/materiobasetheme/css/styles.css @@ -5505,11 +5505,11 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull { background-color: #69CDCF; } /* - _ _ _ - ___ ___ ___ _| | ___ ___|_|___| |_ -| _| .'| _| . | | . | _| | | _| -|___|__,|_| |___| | _|_| |_|_|_|_| - |_| + __ ____ _ __ + _________ __________/ / / __ \_____(_)___ / /_ + / ___/ __ `/ ___/ __ / / /_/ / ___/ / __ \/ __/ +/ /__/ /_/ / / / /_/ / / ____/ / / / / / / /_ +\___/\__,_/_/ \__,_/ /_/ /_/ /_/_/ /_/\__/ */ .print-node-materiau { margin: 0 auto; } @@ -5721,6 +5721,8 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull { position: absolute; } .print-content .node-materiau.vm-print .side.group-side-left .field-name-field-description { font-size: 0.8em; } + .print-content .node-materiau.vm-print .side.group-side-left .field-name-field-location { + font-size: 0.7em; } .print-content .node-materiau.vm-print .side.group-side-left > .field-type-taxonomy-term-reference { display: inline-block; vertical-align: top; diff --git a/sites/all/themes/gui/materiobasetheme/scss/styles.scss b/sites/all/themes/gui/materiobasetheme/scss/styles.scss index b10754e6..bb717e34 100644 --- a/sites/all/themes/gui/materiobasetheme/scss/styles.scss +++ b/sites/all/themes/gui/materiobasetheme/scss/styles.scss @@ -1664,11 +1664,13 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull{ @include fs12; } + // side 3 : Sample .field-name-field-location{ @include fs12; padding:10px; @include fs300; .field-label{ @include fs10; text-transform: lowercase; float: none; } } - // side 4 + + // side 4 : companies .field-name-field-company-fab, .field-name-field-company-distrib{ @include fs12; padding:10px; @include fs300; @include inlineblock(); width:40%; @@ -1704,11 +1706,11 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull{ } /* - _ _ _ - ___ ___ ___ _| | ___ ___|_|___| |_ -| _| .'| _| . | | . | _| | | _| -|___|__,|_| |___| | _|_| |_|_|_|_| - |_| + __ ____ _ __ + _________ __________/ / / __ \_____(_)___ / /_ + / ___/ __ `/ ___/ __ / / /_/ / ___/ / __ \/ __/ +/ /__/ /_/ / / / /_/ / / ____/ / / / / / / /_ +\___/\__,_/_/ \__,_/ /_/ /_/ /_/_/ /_/\__/ */ body.print-body-materiau{ // >*{font-size:0.8em;} @@ -1747,6 +1749,11 @@ body.print-body-materiau{ width:45%; position:absolute; .field-name-field-description{font-size:0.8em;} + // samples + .field-name-field-location{ + font-size:0.7em; + } + // companies >.field-type-taxonomy-term-reference{ display:inline-block; vertical-align: top; width: 45%; margin:0.5em 1em 0 0;