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

fixed some display bug

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi 2015-06-24 17:20:14 +02:00
parent ade4a41f76
commit 09d1f06552
4 changed files with 1067 additions and 1102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -1,4 +1,4 @@
<?php <?php
// dsm($vars, 'vars'); // dsm($vars, 'vars');
@ -17,7 +17,7 @@ $heads = array();
// $heads['HandheldFriendly'] = array( // $heads['HandheldFriendly'] = array(
// '#tag' => 'meta', // '#tag' => 'meta',
// '#attributes' => array( // '#attributes' => array(
// 'name' => 'HandheldFriendly', // 'name' => 'HandheldFriendly',
// 'content' => 'true', // 'content' => 'true',
// ), // ),
// ); // );
@ -25,13 +25,13 @@ $heads = array();
$heads['apple-mobile-web-app-capable'] = array( $heads['apple-mobile-web-app-capable'] = array(
'#tag' => 'meta', '#tag' => 'meta',
'#attributes' => array( '#attributes' => array(
'name' => 'apple-mobile-web-app-capable', 'name' => 'apple-mobile-web-app-capable',
'content' => 'yes', 'content' => 'yes',
), ),
); );
# Mobile Viewport Fix # Mobile Viewport Fix
# j.mp/mobileviewport & davidbcalhoun.com/2010/viewport-metatag # j.mp/mobileviewport & davidbcalhoun.com/2010/viewport-metatag
# device-width : Occupy full width of the screen in its current orientation # device-width : Occupy full width of the screen in its current orientation
# initial-scale = 1.0 retains dimensions instead of zooming out if page height > device height # initial-scale = 1.0 retains dimensions instead of zooming out if page height > device height
# maximum-scale = 1.0 retains dimensions instead of zooming in if page width < device width # maximum-scale = 1.0 retains dimensions instead of zooming in if page width < device width
@ -39,7 +39,7 @@ $heads['apple-mobile-web-app-capable'] = array(
$heads['viewport'] = array( $heads['viewport'] = array(
'#tag' => 'meta', '#tag' => 'meta',
'#attributes' => array( '#attributes' => array(
'name' => 'viewport', 'name' => 'viewport',
'content' => 'width=device-width,initial-scale=1,maximum-scale=1', 'content' => 'width=device-width,initial-scale=1,maximum-scale=1',
), ),
); );
@ -53,7 +53,7 @@ $heads['viewport'] = array(
$heads['icon'] = array( $heads['icon'] = array(
'#tag' => 'link', '#tag' => 'link',
'#attributes' => array( '#attributes' => array(
'href' => base_path() . path_to_theme() .'/materio-icon.png', 'href' => base_path() . path_to_theme() .'/materio-icon.png',
'rel' => 'shortcut icon', 'rel' => 'shortcut icon',
'type' => 'image/png', 'type' => 'image/png',
), ),
@ -62,7 +62,7 @@ $heads['icon'] = array(
$heads['apple-touch-icon'] = array( $heads['apple-touch-icon'] = array(
'#tag' => 'link', '#tag' => 'link',
'#attributes' => array( '#attributes' => array(
'href' => $GLOBALS['base_url'] . base_path() . path_to_theme() .'/materio-touch-icon.png', 'href' => $GLOBALS['base_url'] . base_path() . path_to_theme() .'/materio-touch-icon.png',
'rel' => 'apple-touch-icon-precomposed', 'rel' => 'apple-touch-icon-precomposed',
), ),
); );
@ -75,12 +75,12 @@ $node = isset($vars['node']) ? $vars['node'] : false;
# add body classes # add body classes
if($node){ if($node){
# from taxonomy # from taxonomy
foreach ($vars['node']->taxonomy as $tid => $term) { foreach ($vars['node']->taxonomy as $tid => $term) {
$vars['classes_array'][] = 'term-vid-'. $term->vid .' term-tid-'. $tid; $vars['classes_array'][] = 'term-vid-'. $term->vid .' term-tid-'. $tid;
} }
# from menu # from menu
$mlid = db_result(db_query("SELECT mlid FROM {menu_links} WHERE link_path = '%s'", 'node/'. $vars['node']->nid)); $mlid = db_result(db_query("SELECT mlid FROM {menu_links} WHERE link_path = '%s'", 'node/'. $vars['node']->nid));
// Now get the menu related information. // Now get the menu related information.
@ -95,9 +95,14 @@ foreach ($vars['user']->roles as $key => $value) {
$vars['classes_array'][] = "role-" . $key; $vars['classes_array'][] = "role-" . $key;
} }
// dsm($vars);
// if(){
// $vars['classes_array'][] = "fixed-grid";
// }
/* /*
if(isset($vars['page']['sidebar_first']) && isset($vars['page']['sidebar_second'])){ if(isset($vars['page']['sidebar_first']) && isset($vars['page']['sidebar_second'])){
$layout = 'two-sidebars'; $layout = 'two-sidebars';
}else if(isset($vars['page']['sidebar_first']) || isset($vars['page']['sidebar_second'])){ }else if(isset($vars['page']['sidebar_first']) || isset($vars['page']['sidebar_second'])){
$layout = isset($vars['page']['sidebar_first']) ? 'sidebar-first' : 'sidebar-second'; $layout = isset($vars['page']['sidebar_first']) ? 'sidebar-first' : 'sidebar-second';
}else{ }else{
@ -127,7 +132,7 @@ drupal_add_js(array('materiobasetheme' => array(
'page_callback' => $menu_item['page_callback'], 'page_callback' => $menu_item['page_callback'],
'node_type' => isset($node->type) ? $node->type : false, 'node_type' => isset($node->type) ? $node->type : false,
'node_nid' => isset($node->nid) ? $node->nid : false, 'node_nid' => isset($node->nid) ? $node->nid : false,
'language'=>$language->language, 'language'=>$language->language,
)), 'setting'); )), 'setting');
$head_title_array = array(); $head_title_array = array();

13
sites/all/themes/gui/materiobasetheme/scss/layout.scss
View File

@ -82,6 +82,8 @@ html, body{
} }
body{ body{
overflow-y:scroll; top:0; overflow-y:scroll; top:0;
background-color: $creme;
} }
h1, h2, h3, h4, h5, h6{ h1, h2, h3, h4, h5, h6{
@ -158,7 +160,6 @@ $header-z-index:1000;
>.region{padding-top:5px; padding-bottom:5px;} >.region{padding-top:5px; padding-bottom:5px;}
} //change this } //change this
z-index:999; z-index:999;
@include bgc(#fff);
@include padded; @include padded;
} }
@ -202,8 +203,14 @@ $header-z-index:1000;
/_/ /_/\____/_/ /_/ /_/\___/ |___/____/ /_/ /_/\____/_/ /_/ /_/\___/ |___/____/
*/ */
body:not(.page-actuality), body.front,
body:not(.page-explore){ body.page-whoweare,
body.page-node-11187,
body.page-node-11175,
body.page-node-12324,
body.page-user,
body.page-node-11186,
body.page-cart{
#header>.inner, #utilities>.inner, #center, #footer{ #header>.inner, #utilities>.inner, #center, #footer{
@include grid-row(); @include grid-row();
} }

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

@ -501,9 +501,10 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
*/ */
#utilities{ #utilities{
background-color: #fff;
margin-top:$headerouterheight; margin-top:$headerouterheight;
.not-logged-in &{ overflow:hidden; } .not-logged-in &{ overflow:hidden; }
&>.inner{padding:0.5em 0;}
&.closed{ &.closed{
.tabs, .node-didactique{display:none;} height:0; .tabs, .node-didactique{display:none;} height:0;
} }
@ -1012,14 +1013,14 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
} }
#center{ #center{
background-color: #e6e6e6; @include rounded(10px); // background-color: #e6e6e6;
.node-type-page &{ background-color:#fff; } @include rounded(10px);
.node-type-page:not(.page-node-11187) &{ background-color:#fff; }
.ie8 &{height:100%; margin-top:20px;} .ie8 &{height:100%; margin-top:20px;}
} }
#content{ #content{
// background-color: #f3f3f3; padding:1em;
// @include rounded(5px);
@include transition-simply-prefix(height 0.3s ease-out); @include transition-simply-prefix(height 0.3s ease-out);
&.faded{ &.faded{
opacity:0.5; opacity:0.5;
@ -1946,13 +1947,12 @@ body.print-node-materiau{
*/ */
.page-user, .page-user-edit, .page-user-password, .page-user-reset, .page-toboggan{ .page-user, .page-user-edit, .page-user-password, .page-user-reset, .page-toboggan{
#main{ background: #fff url('../img/user-page-bg.gif') no-repeat bottom right; }
#center{background: #fff url('../img/user-page-bg.gif') no-repeat bottom right;}
.messages{ width:800px; margin:0 auto; } .messages{ width:800px; margin:0 auto; }
&.role-6 #tasks .tabs.primary{display:none;} &.role-6 #tasks .tabs.primary{display:none;}
&.role-6 #tasks .tabs.secondary{@include tabs-primary();} &.role-6 #tasks .tabs.secondary{@include tabs-primary();}
#center >*{ #center >*{
width:800px; margin:0 auto; padding-top:1em; @include fs14; width:800px; margin:0 auto; padding-top:1em; @include fs14;
@ -2103,8 +2103,9 @@ body.node-type-simplenews{
.page-node-11175{ .page-node-11175{
#main{ #main{
// background-color:#fff; // background-color:#fff;
background: #fff url('../img/bg-contact.gif') no-repeat bottom right; #center{
background: #fff url('../img/bg-contact.gif') no-repeat bottom right;
}
.field-name-body p{ .field-name-body p{
@include inlineblock; margin: 15px; @include inlineblock; margin: 15px;
strong{@include fs18;} strong{@include fs18;}
@ -2164,7 +2165,7 @@ body.page-node-11187{
text-align:center; text-align:center;
>*{text-align:left;} >*{text-align:left;}
div.column, div.column-demi, div.column-full, div.column-auto{ div.column, div.column-demi, div.column-full, div.column-auto{
position:relative; position:relative; background-color: #fff;
@include rounded(5px); @include drop-shadow(0, 0, 6px, 0.5); @include rounded(5px); @include drop-shadow(0, 0, 6px, 0.5);
.ie8 &{max-width:500px; margin:auto; margin-bottom:15px; border:1px solid #C6C6C6;} .ie8 &{max-width:500px; margin:auto; margin-bottom:15px; border:1px solid #C6C6C6;}
overflow:hidden; overflow:hidden;
@ -2797,7 +2798,6 @@ body.page-node-11187{
*/ */
body.home-v2{ body.home-v2{
background-color: $creme;
#center{ #center{
background-color: transparent; background-color: transparent;