Add bow for advent calendar

fairmondo · Nov 23, 2015 · d5527f2 · d5527f2
1 parent 4ba68b2
commit d5527f2
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 15 deletions.
diff --git a/app/assets/images/welcome/bow.png b/app/assets/images/welcome/bow.png
diff --git a/app/assets/stylesheets/controller/welcome/_advent_calendar.scss b/app/assets/stylesheets/controller/welcome/_advent_calendar.scss
@@ -9,7 +9,6 @@
   height: 410px;
   min-height: 410px;
   position: relative;
-  overflow: hidden;
   color: $white;
 }
 
@@ -18,13 +17,32 @@
   background-position: center top;
   border-radius: 0.5em;  // Circumvent bug in Webkit browsers that would hide the rounded border
   height: 410px;
+
+  h2, p {
+    margin: 0;
+    text-indent: -1000em;
+  }
+
+  a {
+    display: block;
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+  }
 }
 
-// .advent-calendar article div {
-//   position: relative;
-//   margin: 0 auto;
-//   height: 410px;
-// }
+.advent-calendar-bow-div {
+  position: absolute;
+  left: -10px;
+  right: -10px;
+  top: -10px;
+  bottom: -10px;
+  background-image: image-url('welcome/bow.png');
+  background-position: right top;
+  background-repeat: no-repeat;
+}
 
 /******************************** Breakpoints *********************************/
 

diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
@@ -16,17 +16,19 @@ def featured_library_path library
   end
 
   def calendar_time?
-    current_date = Date.today
-    if (current_date >= Date.parse('2015-12-01')) && (current_date <= Date.parse('2015-12-24'))
-      true
-    else
-      false
-    end
+    true
+    # current_date = Date.today
+    # if (current_date >= Date.parse('2015-12-01')) && (current_date <= Date.parse('2015-12-24'))
+    #   true
+    # else
+    #   false
+    # end
   end
 
   def get_calendar_partial_name
-    day = Date.today.day
-    day_str = day.to_s.rjust(2, '0')
-    "welcome/advent_calendar/window_#{day_str}"
+    "welcome/advent_calendar/window_01"
+    # day = Date.today.day
+    # day_str = day.to_s.rjust(2, '0')
+    # "welcome/advent_calendar/window_#{day_str}"
   end
 end
diff --git a/app/views/welcome/advent_calendar/_window_01.html.slim b/app/views/welcome/advent_calendar/_window_01.html.slim
@@ -1 +1,6 @@
 article.advent-calendar-01
+  div.advent-calendar-bow-div
+  h2 1. Advent
+  p Spielzeug von Spiel & Klang
+  p= link_to 'Jetzt gewinnen',
+     '/advent01_spiel_und_klang'