From 5ea396ae96d355ceaba80e7ce6563c806f593e61 Mon Sep 17 00:00:00 2001
From: Seori <seori@gmail.com>
Date: Tue, 19 Nov 2019 16:58:14 -0500
Subject: [PATCH 1/4] Connect and nypr logo back in place for ipads

---
 app/components/nypr-o-footer/template.hbs | 96 +++++++++++------------
 app/styles/components/_footer.scss        |  5 +-
 2 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/app/components/nypr-o-footer/template.hbs b/app/components/nypr-o-footer/template.hbs
index f857da23..83b17e42 100644
--- a/app/components/nypr-o-footer/template.hbs
+++ b/app/components/nypr-o-footer/template.hbs
@@ -16,56 +16,54 @@
               {{yield (hash slogan=(component 'blank-template'))}}
             </div>
 
-            <NyprMShareTools class="about-us-div" @label='About Us' as |share|>
-              <div class="about-us-left">
-                <a href="https://www.wnyc.org/resources/912769/fcc_eeo_public_file_report.pdf" class="about-us-links inline"
-                  target="_blank" rel="noopener">
-                  EEO Report
+            <div class="about-and-connect">
+              <NyprMShareTools class="about-us-div" @label='About Us' as |share|>
+                <div class="about-us-left">
+                  <a href="https://www.wnyc.org/resources/912769/fcc_eeo_public_file_report.pdf"
+                    class="about-us-links inline" target="_blank" rel="noopener">
+                    EEO Report
+                  </a>
+                  <a href="https://publicfiles.fcc.gov/fm-profile/wqxr-fm" class="about-us-links" target="_blank"
+                    rel="noopener">
+                    WQXR FCC Public File
+                  </a>
+                  <a href="https://www.wnyc.org/privacy" class="about-us-links" target="_blank" rel="noopener">
+                    Privacy Policy
+                  </a>
+                </div>
+                <div class="about-us-right">
+                  <a href="https://www.wnyc.org/terms" class="about-us-links" target="_blank" rel="noopener">
+                    Terms of Use
+                  </a>
+                  <a href="https://wqxr.zendesk.com/hc/en-us " class="about-us-links" target="_blank" rel="noopener">
+                    Contact Us
+                  </a>
+                  <a href="https://sponsorship.wnyc.org/" class="about-us-links" target="_blank" rel="noopener">
+                    Sponsorship
+                  </a>
+                </div>
+              </NyprMShareTools>
+
+              <NyprMShareTools class="social-media-links" @label='Connect' as |share|>
+                <div class="social-media__container">
+
+                  <share.link @service='spotify' @username='3kRXZieRfyb2lCAFtVB76u' />
+
+                  <share.link @service='facebook' @username='WQXRClassical' />
+
+                  <share.link @service='twitter' @username='WQXR' />
+
+                  <share.link @service='instagram' @username='wqxr_classical' />
+
+                  <share.link @service='youtube' @username='UCNaGXxDBmCNQGpwm3hxK9sw' />
+                </div>
+
+                <a class="feedback-link" href="https://www.surveymonkey.com/r/XQQSB68" target="_blank">
+                  <div class="feedback tertiary-hover">SEND US YOUR FEEDBACK</div>
                 </a>
-                <a href="https://publicfiles.fcc.gov/fm-profile/wqxr-fm" class="about-us-links" target="_blank"
-                  rel="noopener">
-                  WQXR FCC Public File
-                </a>
-                <a href="https://www.wnyc.org/privacy" class="about-us-links" target="_blank" rel="noopener">
-                  Privacy Policy
-                </a>
-              </div>
-              <div class="about-us-right">
-                <a href="https://www.wnyc.org/terms" class="about-us-links" target="_blank" rel="noopener">
-                  Terms of Use
-                </a>
-                <a href="https://wqxr.zendesk.com/hc/en-us " class="about-us-links" target="_blank" rel="noopener">
-                  Contact Us
-                </a>
-                <a href="https://sponsorship.wnyc.org/" class="about-us-links" target="_blank" rel="noopener">
-                  Sponsorship
-                </a>
-              </div>
-            </NyprMShareTools>
-
-            <NyprMShareTools class="social-media-links" @label='Connect' as |share|>
-              <div class="social-media__container">
-
-                <share.link @service='spotify' @username='3kRXZieRfyb2lCAFtVB76u' />
-
-                <share.link @service='facebook' @username='WQXRClassical' />
-
 
-                <share.link @service='twitter' @username='WQXR' />
-
-
-                <share.link @service='instagram' @username='wqxr_classical' />
-
-
-                <share.link @service='youtube' @username='UCNaGXxDBmCNQGpwm3hxK9sw' />
-
-              </div>
-
-              <a class="feedback-link" href="https://www.surveymonkey.com/r/XQQSB68" target="_blank">
-                <div class="feedback tertiary-hover">SEND US YOUR FEEDBACK</div>
-              </a>
-
-            </NyprMShareTools>
+              </NyprMShareTools>
+            </div>
           </div>
         </div>
       </div>
@@ -91,4 +89,4 @@
       </div>
     </div>
   </div>
-</footer>
+</footer>
\ No newline at end of file
diff --git a/app/styles/components/_footer.scss b/app/styles/components/_footer.scss
index 354c4008..af41799a 100644
--- a/app/styles/components/_footer.scss
+++ b/app/styles/components/_footer.scss
@@ -497,7 +497,8 @@
     }
 
     .c-main-footer__nypr-logo {
-      margin: 0 5px 0 0;
+      // margin: 0 5px 0 0;
+      margin: 0 auto 16px;
     }
   }
 
@@ -517,4 +518,4 @@
     display: flex;
     flex-direction: column;
   }
-}
+}
\ No newline at end of file

From 94352c88b89c924f6ae5fb968bfaf9d0f25cfde5 Mon Sep 17 00:00:00 2001
From: Seori <seori@gmail.com>
Date: Tue, 19 Nov 2019 17:18:14 -0500
Subject: [PATCH 2/4] Added back the missing classes from application.hbs and
 added extra space btwn 'by' and jlgreene logo for legibility

---
 app/styles/components/_footer.scss | 5 ++++-
 app/templates/application.hbs      | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/styles/components/_footer.scss b/app/styles/components/_footer.scss
index af41799a..9ce18c3f 100644
--- a/app/styles/components/_footer.scss
+++ b/app/styles/components/_footer.scss
@@ -485,6 +485,10 @@
       flex-direction: row;
     }
 
+    #second-slogan {
+      margin-left: 50px;
+    }    
+
     .logo-and-brands {
       display: flex;
       flex-direction: row;
@@ -497,7 +501,6 @@
     }
 
     .c-main-footer__nypr-logo {
-      // margin: 0 5px 0 0;
       margin: 0 auto 16px;
     }
   }
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index 05a4f4c2..c85e4df5 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -7,7 +7,7 @@
 {{outlet}}
 
 <NyprOFooter as |footer|>
-  <footer.slogan>
+  <footer.slogan class="slogans">
     <p class="slogan">
       WQXR is New York City’s only classical music radio station, broadcasting live on 105.9 FM. We share our audience’s
       passion for music by playing the most outstanding pieces on air, online and through our app. WQXR is made possible
@@ -15,7 +15,7 @@
       <br>
       <br>
     </p>
-    <p class="slogan"> WQXR is supported by &nbsp;
+    <p class="slogan" id="second-slogan"> WQXR is supported by &nbsp; &nbsp;
       <div class="jl-logo"><JlgreenLogo /></div>
     </p>
   </footer.slogan>

From 78f536537e0ddaf434d3cdc294f6daae40408eae Mon Sep 17 00:00:00 2001
From: Seori <seori@gmail.com>
Date: Wed, 20 Nov 2019 10:28:35 -0500
Subject: [PATCH 3/4] Id to class

---
 app/styles/components/_footer.scss | 2 +-
 app/templates/application.hbs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/styles/components/_footer.scss b/app/styles/components/_footer.scss
index 9ce18c3f..1ffaef18 100644
--- a/app/styles/components/_footer.scss
+++ b/app/styles/components/_footer.scss
@@ -485,7 +485,7 @@
       flex-direction: row;
     }
 
-    #second-slogan {
+    .second-slogan {
       margin-left: 50px;
     }    
 
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index c85e4df5..f6bd231d 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -15,7 +15,7 @@
       <br>
       <br>
     </p>
-    <p class="slogan" id="second-slogan"> WQXR is supported by &nbsp; &nbsp;
+    <p class="second-slogan"> WQXR is supported by &nbsp; &nbsp;
       <div class="jl-logo"><JlgreenLogo /></div>
     </p>
   </footer.slogan>

From a70a8c5ccf88567ec9b83f6141b45c846ce40ea9 Mon Sep 17 00:00:00 2001
From: Seori <seori@gmail.com>
Date: Wed, 20 Nov 2019 11:59:56 -0500
Subject: [PATCH 4/4] Removed nsbp, no overflow for WQXR is supported by and
 spacing for jl greene logo

---
 app/styles/components/_footer.scss | 15 +++++++++++++--
 app/templates/application.hbs      |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/styles/components/_footer.scss b/app/styles/components/_footer.scss
index 1ffaef18..c4f92618 100644
--- a/app/styles/components/_footer.scss
+++ b/app/styles/components/_footer.scss
@@ -337,6 +337,8 @@
 
   .jl-logo {
     margin-top: 4px;
+    max-height: 100%;
+    max-width: 100%;
     &:hover {
       opacity: 0.8;
       transition-duration: 0.3s;
@@ -418,6 +420,15 @@
   flex-direction: column;
 }
 
+.second-slogan {
+  white-space: nowrap;
+  overflow: hidden;
+}  
+
+.jl-logo {
+  padding-left: 5px;
+}
+
 .logo-and-brands {
   display: flex;
   flex-direction: row;
@@ -486,8 +497,8 @@
     }
 
     .second-slogan {
-      margin-left: 50px;
-    }    
+      margin-left: 30px;
+    }  
 
     .logo-and-brands {
       display: flex;
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index f6bd231d..b562fbd3 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -15,7 +15,7 @@
       <br>
       <br>
     </p>
-    <p class="second-slogan"> WQXR is supported by &nbsp; &nbsp;
+    <p class="second-slogan">WQXR is supported by 
       <div class="jl-logo"><JlgreenLogo /></div>
     </p>
   </footer.slogan>