Merge pull request #68 from nypublicradio/seori/DSODA-connect2

footer fixes -- connect, jl greene logo clean up, alignment of copyright
nypublicradio · Nov 20, 2019 · fccdba4 · fccdba4
2 parents 69ec9e9 + a70a8c5
commit fccdba4
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 53 deletions.
diff --git 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>
diff --git 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;
@@ -485,6 +496,10 @@
  flex-direction: row;
  }
 
+ .second-slogan {
+ margin-left: 30px;
+ } 
+
  .logo-and-brands {
  display: flex;
  flex-direction: row;
@@ -497,7 +512,7 @@
  }
 
  .c-main-footer__nypr-logo {
- margin: 0 5px 0 0;
+ margin: 0 auto 16px;
  }
  }
 
@@ -517,4 +532,4 @@
  display: flex;
  flex-direction: column;
  }
-}
+}
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
@@ -7,15 +7,15 @@
 {{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
  thanks to the generous support of our members and sponsors.
  <br>
  <br>
  </p>
- <p class="slogan"> WQXR is supported by &nbsp;
+ <p class="second-slogan">WQXR is supported by 
  <div class="jl-logo"><JlgreenLogo /></div>
  </p>
  </footer.slogan>