bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed showroom field form bug, removed ordering, fixed card js in node page

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2016-12-11 19:50:48 +01:00
parent 8b5d721bfd
commit c56a523286
11 changed files with 126 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
sites/all/themes/gui/materiobasetheme/css/styles.css
View File

@@ -4176,16 +4176,16 @@ article.node-materiau.vm-bookmark, article.node-breve.vm-bookmark {
height: 17px; }
article.node-materiau.vm-bookmark div.workflow, article.node-breve.vm-bookmark div.workflow {
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
z-index: 11;
padding: 5px;
border-radius: 5px 0 3px 0;
border-radius: 3px 0 5px 0;
background-clip: padding-box;
font-size: 10px;
vertical-align: top;
background-color: rgba(255, 255, 255, 0.9);
color: #000; }
background-color: rgba(20, 20, 20, 0.9);
color: #fff; }
article.node-materiau.vm-bookmark div.workflow span, article.node-breve.vm-bookmark div.workflow span {
padding: 3px 0 0 4px;
display: moz-inline-stack;
@@ -4378,16 +4378,16 @@ article.node-materiau.vm-cardsmall, article.node-breve.vm-cardsmall {
height: 17px; }
article.node-materiau.vm-cardsmall div.workflow, article.node-breve.vm-cardsmall div.workflow {
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
z-index: 11;
padding: 5px;
border-radius: 5px 0 3px 0;
border-radius: 3px 0 5px 0;
background-clip: padding-box;
font-size: 10px;
vertical-align: top;
background-color: rgba(255, 255, 255, 0.9);
color: #000; }
background-color: rgba(20, 20, 20, 0.9);
color: #fff; }
article.node-materiau.vm-cardsmall div.workflow span, article.node-breve.vm-cardsmall div.workflow span {
padding: 3px 0 0 4px;
display: moz-inline-stack;
@@ -4642,16 +4642,16 @@ article.node-materiau.vm-cardmedium, article.node-breve.vm-cardmedium {
height: 17px; }
article.node-materiau.vm-cardmedium div.workflow, article.node-breve.vm-cardmedium div.workflow {
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
z-index: 11;
padding: 5px;
border-radius: 5px 0 3px 0;
border-radius: 3px 0 5px 0;
background-clip: padding-box;
font-size: 10px;
vertical-align: top;
background-color: rgba(255, 255, 255, 0.9);
color: #000; }
background-color: rgba(20, 20, 20, 0.9);
color: #fff; }
article.node-materiau.vm-cardmedium div.workflow span, article.node-breve.vm-cardmedium div.workflow span {
padding: 3px 0 0 4px;
display: moz-inline-stack;
@@ -4998,16 +4998,16 @@ article.node-materiau.vm-cardbig, article.node-breve.vm-cardbig {
height: 17px; }
article.node-materiau.vm-cardbig div.workflow, article.node-breve.vm-cardbig div.workflow {
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
z-index: 11;
padding: 5px;
border-radius: 5px 0 3px 0;
border-radius: 3px 0 5px 0;
background-clip: padding-box;
font-size: 10px;
vertical-align: top;
background-color: rgba(255, 255, 255, 0.9);
color: #000; }
background-color: rgba(20, 20, 20, 0.9);
color: #fff; }
article.node-materiau.vm-cardbig div.workflow span, article.node-breve.vm-cardbig div.workflow span {
padding: 3px 0 0 4px;
display: moz-inline-stack;
@@ -5350,16 +5350,16 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull {
height: 17px; }
article.node-materiau.vm-cardfull div.workflow, article.node-breve.vm-cardfull div.workflow {
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
z-index: 11;
padding: 5px;
border-radius: 5px 0 3px 0;
border-radius: 3px 0 5px 0;
background-clip: padding-box;
font-size: 10px;
vertical-align: top;
background-color: rgba(255, 255, 255, 0.9);
color: #000; }
background-color: rgba(20, 20, 20, 0.9);
color: #fff; }
article.node-materiau.vm-cardfull div.workflow span, article.node-breve.vm-cardfull div.workflow span {
padding: 3px 0 0 4px;
display: moz-inline-stack;
@@ -5648,16 +5648,16 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull {
height: 17px; }
.print-node-materiau div.workflow {
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
z-index: 11;
padding: 5px;
border-radius: 5px 0 3px 0;
border-radius: 3px 0 5px 0;
background-clip: padding-box;
font-size: 10px;
vertical-align: top;
background-color: rgba(255, 255, 255, 0.9);
color: #000; }
background-color: rgba(20, 20, 20, 0.9);
color: #fff; }
.print-node-materiau div.workflow span {
padding: 3px 0 0 4px;
display: moz-inline-stack;

15
sites/all/themes/gui/materiobasetheme/js/script.js
View File

@@ -1,6 +1,3 @@
// @koala-prepend "gui_ck_fw/gui.js"
// @codekit-prepend "gui.js"
(function($) {
@@ -48,13 +45,13 @@
// touch scroll
position = {x:null,y:null},
translate3d_content = 0,
_isLoggedIn = !$('body').is('.not-logged-in'),
_isFrontNotLogged = $('body').is('.front.not-logged-in'),
_isLoggedIn = !_$body.is('.not-logged-in'),
_isFrontNotLogged = _$body.is('.front.not-logged-in'),
_isFrontHomeV2 = _$body.is('.home-v2'),
_skrollr,
_isMembershipForm = $('body').is('.page-node-11186'), //$('body').is('.page-node-11187') || ,
// _isBreveMateriauNodePage = $('body').is('.node-type-breve') || $('body').is('.node-type-materiau');
_isBreveMateriauNodePage = _themeSettings.page_callback == 'node_page_view' && (_themeSettings.node_type == 'materiau' || _themeSettings.node_type == 'breve'),
_isMembershipForm = _$body.is('.page-node-11186'), //$('body').is('.page-node-11187') || ,
_isBreveMateriauNodePage = _$body.is('.node-type-breve') || _$body.is('.node-type-materiau'),
// _isBreveMateriauNodePage = _themeSettings.page_callback == 'node_page_view' && (_themeSettings.node_type == 'materiau' || _themeSettings.node_type == 'breve'),
_resizeTimer,
_max_480 = function(){ return (viewport().width < 479); },
_480_768 = function(){ return ( !_max_480() && _max_768() ); },
@@ -531,7 +528,7 @@
};
function onResultsChanged(event){
// trace('MaterioBaseTheme :: onResultsChanged',event);
trace('MaterioBaseTheme :: onResultsChanged',event);
$(document).scrollTop(0);
focusCard($('#content .search-results, #content .actuality-items').children('.node:first-child'));

4
sites/all/themes/gui/materiobasetheme/js/script.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
sites/all/themes/gui/materiobasetheme/preprocess/html.pre.php
View File

@@ -71,8 +71,8 @@ foreach ($heads as $type=>$head)
drupal_add_html_head($head, $type);
// this is not working anymore, node object don't shows up on vars
$node = isset($vars['node']) ? $vars['node'] : false;
# add body classes
if($node){
@@ -142,5 +142,3 @@ foreach ($vars['head_title_array'] as $key => $value){
}
}
$vars['head_title'] = $vars['head_array']['title'] = strip_tags(implode(' | ', $head_title_array));

6
sites/all/themes/gui/materiobasetheme/scss/styles.scss
View File

@@ -1305,11 +1305,11 @@ $cardfull_h:610px;
// &:hover{nav.nav{display:block;}}
div.workflow{
position:absolute; top:0; left:0; z-index:11;
position:absolute; bottom:0; right:0; z-index:11;
padding: 5px;
@include border-radius(5px, 0, 3px, 0);
@include border-radius(3px, 0, 5px, 0);
@include fs11; vertical-align: top;
background-color: rgba(255, 255, 255, 0.9); color:#000;
background-color: rgba(20, 20, 20, 0.9); color:#fff;
span{padding: 3px 0 0 4px; @include inlineblock();}
}