From 2c4101ab454070587ba4e070f1d00782d9b404f8 Mon Sep 17 00:00:00 2001
From: Gopesh Tulsyan <gopesh.7500@gmail.com>
Date: Tue, 24 Jun 2014 20:05:45 +0530
Subject: [PATCH] Theme intrgration initiated by Onassis theme of Blacktie.co
 Banner Component designed

---
 app/assets/stylesheets/application.css       |  1 +
 app/assets/stylesheets/osem.css              |  1 -
 app/assets/stylesheets/splash.css.scss       | 91 ++++++++++++++++++++
 app/views/conference/_registration.html.haml |  2 +-
 app/views/conference/show.html.haml          |  2 +-
 app/views/layouts/application.html.haml      |  1 +
 6 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/stylesheets/splash.css.scss

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 41c8fb74..febb4d2e 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -9,4 +9,5 @@
  *= require osem-rating
  *= require osem-schedule
  *= require osem-schedule-print
+ *= require font-awesome
 */
diff --git a/app/assets/stylesheets/osem.css b/app/assets/stylesheets/osem.css
index 089acc74..e9af8f12 100644
--- a/app/assets/stylesheets/osem.css
+++ b/app/assets/stylesheets/osem.css
@@ -115,7 +115,6 @@ body {
 
 .banner-text{
     padding-top: 10%;
-    color: #fff;
 }
 
 .pad{
diff --git a/app/assets/stylesheets/splash.css.scss b/app/assets/stylesheets/splash.css.scss
new file mode 100644
index 00000000..5f8d840b
--- /dev/null
+++ b/app/assets/stylesheets/splash.css.scss
@@ -0,0 +1,91 @@
+@import url(http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic);
+@import url(http://fonts.googleapis.com/css?family=Raleway:400,300,700);
+@import url(http://fonts.googleapis.com/css?family=Coustard:400,900);
+
+body {
+  background-color: #f2f2f2;
+  font-family: 'Lato';
+  font-weight: 300;
+  font-size: 16px;
+  color: #555;
+
+  -webkit-font-smoothing: antialiased;
+  /*-webkit-overflow-scrolling: touch;*/
+}
+
+/* Titles */
+h1, h2, h3, h4, h5, h6 {
+  font-family: "Raleway";
+  font-weight: 300;
+  color: #333;
+}
+
+/* Paragraph & Typographic */
+p {
+    line-height: 28px;
+    margin-bottom: 25px;
+}
+
+.centered {
+    text-align: center;
+}
+
+/* Links */
+a {
+    color: #f85c37;
+    word-wrap: break-word;
+
+    -webkit-transition: color 0.1s ease-in, background 0.1s ease-in;
+    -moz-transition: color 0.1s ease-in, background 0.1s ease-in;
+    -ms-transition: color 0.1s ease-in, background 0.1s ease-in;
+    -o-transition: color 0.1s ease-in, background 0.1s ease-in;
+    transition: color 0.1s ease-in, background 0.1s ease-in;
+}
+
+a:hover,
+a:focus {
+    color: #7b7b7b;
+    text-decoration: none;
+    outline: 0;
+}
+
+a:before,
+a:after {
+    -webkit-transition: color 0.1s ease-in, background 0.1s ease-in;
+    -moz-transition: color 0.1s ease-in, background 0.1s ease-in;
+    -ms-transition: color 0.1s ease-in, background 0.1s ease-in;
+    -o-transition: color 0.1s ease-in, background 0.1s ease-in;
+    transition: color 0.1s ease-in, background 0.1s ease-in;
+}
+
+ hr {
+    display: block;
+    height: 1px;
+    border: 0;
+    border-top: 1px solid #ccc;
+    margin: 1em 0;
+    padding: 0;
+}
+/* ==========================================================================
+   Wrap Sections
+   ========================================================================== */
+
+#splash-banner{
+  h1, h3{
+    color:#3399CC;
+  }
+  h3{
+    font-family: 'Coustard', serif;
+    font-weight: 600;
+    text-shadow: 0.2em 0.2em 0 #4A4F6A;
+  }
+  h1{
+    font-size: 200px;
+    font-weight: 700;
+    text-shadow:0.04em 0.04em 0 black;
+  }
+  p {
+    color: #fff;
+    font-weight: 500;
+  }
+}
diff --git a/app/views/conference/_registration.html.haml b/app/views/conference/_registration.html.haml
index cf7982c6..654bb2ca 100644
--- a/app/views/conference/_registration.html.haml
+++ b/app/views/conference/_registration.html.haml
@@ -3,7 +3,7 @@
     %a.smoothscroll{ href: '#registration' } Registration
 %div.container.text-center
   %div.row
-    %h2 Registration
+    %h1 Registration
   - if !@conference.registration_description.blank?
     %p
       = @conference.registration_description
diff --git a/app/views/conference/show.html.haml b/app/views/conference/show.html.haml
index 277b5218..ce120949 100644
--- a/app/views/conference/show.html.haml
+++ b/app/views/conference/show.html.haml
@@ -7,7 +7,7 @@
         %div.container.text-center.banner-text
           .row
             %h1
-              = @conference.title
+              = @conference.short_title
           - if @conference.start_date && @conference.end_date
             .row
               %h3
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 199dbfb0..84263735 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -6,6 +6,7 @@
     %meta{:content => "", :name => "description"}
     %meta{:content => "", :name => "author"}
     = stylesheet_link_tag "application", :media => "all"
+    = stylesheet_link_tag "splash" if content_for :splash
     = javascript_include_tag "application"
     = csrf_meta_tags
     :javascript