Aggiornamento dalla produzione

WEBdeBS · Mar 21, 2015 · ea95236 · ea95236
1 parent 71dd2cd
commit ea95236
Show file tree

Hide file tree

Showing 8 changed files with 151 additions and 30 deletions.
diff --git a/wp-content/themes/nodejs/app.js b/wp-content/themes/nodejs/app.js
diff --git a/wp-content/themes/nodejs/front-page.php b/wp-content/themes/nodejs/front-page.php
@@ -1,12 +1,8 @@
 <?php get_header(); ?>
   <div class="content">
     <?php $id = 4; ?>
-    <article id="<?php echo get_post_field("post_name", $id); ?>" class="main-page">
-      <div class="title title--main-page">
-        <img src="<?php echo get_field("icon", $id); ?>" alt="<?php echo get_the_title($id); ?>">
-        <?php echo get_the_title($id); ?>
-      </div>
-      <div class="main-page__content">
+    <article class="main-page">
+      <div id="<?php echo get_post_field("post_name", $id); ?>" class="main-page__content">
         <header>
           <h1>
             <?php echo get_field("title", $id); ?>
@@ -18,12 +14,33 @@
         <p>
           <?php echo get_post_field("post_content", $id); ?>
         </p>
-        <a class="main-page__button" target="_blank" href="https://docs.google.com/a/webdebs.org/forms/d/11gvSPQ4h1dHzILhnmtp1iNhI62iNCKI-FM2OR3ttZ_k/viewform">
-          Send now!
-        </a>
       </div>
+      <?php $id = 39; ?>
+      <div id="<?php echo get_post_field("post_name", $id); ?>" class="side-page__content">
+        <header>
+          <h1>
+            <?php echo get_the_title($id); ?>
+          </h1>
+        </header>
+        <p>
+          <?php echo get_post_field("post_content", $id); ?>
+        </p>
+      </div>
+
     </article>
   </div>
+	<div class="content">
+    <?php $id = 40; ?>
+		<div id="<?php echo get_post_field("post_name", $id); ?>" class="tickets_container">
+				<div class="page title tickets__title">
+            <img src="<?php echo get_field("icon", $id); ?>" alt="<?php echo get_the_title($id); ?>">
+            <?php echo get_the_title($id); ?>
+        </div>
+				<div class="page tickets__eventbrite-container">
+					<?php echo get_post_field("post_content", $id); ?>
+				</div>
+		</div>
+	</div>	
   <div class="hr"></div>
   <div class="content">
     <div class="pages">

diff --git a/wp-content/themes/nodejs/js/app.js b/wp-content/themes/nodejs/js/app.js
@@ -6,4 +6,4 @@ $(document).ready(function() {
     window.location.hash = tokens[tokens.length - 2];
   });
 
-});
+});
diff --git a/wp-content/themes/nodejs/sass/partials/_front-page.scss b/wp-content/themes/nodejs/sass/partials/_front-page.scss
@@ -1,5 +1,6 @@
 
-.main-page
+.main-page,
+.side-page
 {
   @extend .row;
   margin-top: 50px;
@@ -20,15 +21,37 @@
   }
 }
 
-.title--main-page
+.side-page__content
 {
-  @extend .col-sm-4;
+  @extend .col-sm-6;
+  background: $color-red url(images/bg-venue.png) no-repeat 10px 60px; 
+  color: $color-white;
+  box-sizing: border-box;
+  padding-left: 90px;
+  padding-top: 1px;
+  position: relative;
+  min-height: 240px;
+
+  h1
+  {
+    font-family: $font-title;
+  }
+
+  img
+  {
+    position: absolute;
+    top: 15px;
+    right: 10px;
+    /*transform: rotate(5deg) translateY(10px);*/
+    @media (max-width: $screen-lg-min) {
+      display: none;
+    }
+  }
 }
 
 .main-page__content
 {
-  @extend .col-sm-offset-1;
-  @extend .col-sm-7;
+  @extend .col-sm-6;
 
   h1
   {
@@ -104,4 +127,23 @@
   font-size: 120px;
   height: 50px;
   margin-top: -40px;
+}
+
+.tickets__container{
+		@extend .row;
+}
+
+.tickets__title{
+		width: 30%;
+		@media (max-width: $screen-lg-min) {
+      width: 100%;
+    }
+}
+
+.tickets__eventbrite-container{
+		width: 70%;
+		height: 400px;
+		@media (max-width: $screen-lg-min) {
+      width: 100%;
+    }
 }
diff --git a/wp-content/themes/nodejs/sass/partials/_header.scss b/wp-content/themes/nodejs/sass/partials/_header.scss
@@ -136,4 +136,20 @@
   {
     background-image: url('images/menu-supporter-icon.png');
   }
+}
+
+.page-item-39
+{
+  a::before
+  {
+    background-image: url('images/menu-venue-icon.png');
+  }
+}
+
+.page-item-40
+{
+  a::before
+  {
+    background-image: url('images/menu-tickets-icon.png');
+  }
 }
diff --git a/wp-content/themes/nodejs/style.css b/wp-content/themes/nodejs/style.css
diff --git a/wp-content/themes/nodejs/style.css.map b/wp-content/themes/nodejs/style.css.map
diff --git a/wp-content/themes/nodejs/template-singolo.php b/wp-content/themes/nodejs/template-singolo.php
@@ -6,9 +6,9 @@
 
 <?php get_header(); ?>
   <div class="content">
-    <?php $id = 4; ?>
+    <?php $id = 48; ?>
     <article id="<?php echo get_post_field("post_name", $id); ?>" class="main-page">
-      <div class="title title--main-page">
+      <div class="title title--main-page col-sm-6">
         <img src="<?php echo get_field("icon", $id); ?>" alt="<?php echo get_the_title($id); ?>">
         <?php echo get_the_title($id); ?>
       </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ $(document).ready(function() { @@
         window.location.hash = tokens[tokens.length - 2];
       });
-    });
+    });