Merge branch 'develop'

Drupal-FR · Aug 25, 2015 · 28c3bf1 · 28c3bf1
2 parents f74871e + 20bac8c
commit 28c3bf1
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 27 deletions.
diff --git a/www7/sites/all/themes/dfrtheme/css/style.css b/www7/sites/all/themes/dfrtheme/css/style.css
@@ -340,18 +340,6 @@ div.vertical-tabs .vertical-tabs-list li {
   background: rgba(0, 178, 215, 0.9);
 }
 
-.push-drupalcamp {
-  padding-top: 1em;
-}
-.push-drupalcamp a {
-  background: transparent no-repeat 0px 0px url("../images/push-dc-small.png");
-  display: block;
-  height: 104px;
-  margin: auto;
-  text-indent: -1000px;
-  width: 434px;
-}
-
 @media screen and (min-width:480px) {
   #block-system-main-menu .menu {
   }
@@ -372,11 +360,6 @@ div.vertical-tabs .vertical-tabs-list li {
 }
 
 @media screen and (min-width:900px) {
-  .push-drupalcamp a {
-    background-image: url("../images/push-dc-medium.png");
-    height: 126px;
-    width: 890px;
-  }
   .branding {
     padding-right: 3%;
     min-width: 30%;
@@ -388,13 +371,6 @@ div.vertical-tabs .vertical-tabs-list li {
     margin: 1em 0;
   }
 }
-@media screen and (min-width:1280px) {
-  .push-drupalcamp a {
-    background-image: url("../images/push-dc-large.png");
-    height: 90px;
-    width: 1270px;
-  }
-}
 
 #header-bottom {
   background: url(../images/section4-bg.png) 0 0 repeat-x #d6e3e7;

diff --git a/www7/sites/all/themes/dfrtheme/images/push-dc-large.png b/www7/sites/all/themes/dfrtheme/images/push-dc-large.png
diff --git a/www7/sites/all/themes/dfrtheme/images/push-dc-medium.png b/www7/sites/all/themes/dfrtheme/images/push-dc-medium.png
diff --git a/www7/sites/all/themes/dfrtheme/images/push-dc-small.png b/www7/sites/all/themes/dfrtheme/images/push-dc-small.png
diff --git a/www7/sites/all/themes/dfrtheme/templates/page/page.tpl.php b/www7/sites/all/themes/dfrtheme/templates/page/page.tpl.php
@@ -112,9 +112,6 @@
 
     <div id="main-wrapper">
       <div class="inner">
-      <?php if ($is_front): ?>
-        <div class="push-drupalcamp"><a href="http://montpellier2015.drupaldays.org/" title="Site dédié des Drupal Dev Days Montpellier 2015">Visiter le site dédié aux Drupal Dev Days Montpellier du 13 au 19 avril 2015.</a></div>
-      <?php endif; ?>
 
       <?php print render($page['content_top']); ?>