From 6b7382db6a099fdce8b29d40769e4b0186e9ba5e Mon Sep 17 00:00:00 2001 From: Ryan LaBouve Date: Fri, 4 Mar 2016 16:50:54 -0600 Subject: [PATCH 1/3] Port responsive header and footer from guides * add flag for responsive --- config.rb | 7 +- images/header.svg | 1 + source/_footer.html.erb | 33 ++++ source/_header.html.erb | 20 +++ source/ember-community-survey-2016.html.erb | 1 + source/images/ember-logo.svg | 1 + source/images/header.svg | 1 + source/images/search-icon.svg | 7 + source/layout.erb | 50 +----- source/stylesheets/_footer.scss | 93 ++++++++++ source/stylesheets/_header.scss | 181 ++++++++++++++++++++ source/stylesheets/site.css.scss | 4 +- source/stylesheets/survey.css.scss | 2 +- 13 files changed, 351 insertions(+), 50 deletions(-) create mode 100644 images/header.svg create mode 100644 source/_footer.html.erb create mode 100644 source/_header.html.erb create mode 100644 source/images/ember-logo.svg create mode 100644 source/images/header.svg create mode 100644 source/images/search-icon.svg create mode 100644 source/stylesheets/_footer.scss create mode 100644 source/stylesheets/_header.scss diff --git a/config.rb b/config.rb index c1b0180a8c..dcefd27d8d 100644 --- a/config.rb +++ b/config.rb @@ -114,9 +114,14 @@ def link_to_page name, url "#{name}" end - def page_classes + def page_classes(page) classes = super return 'not-found' if classes == '404' + + if page.responsive + classes += ' responsive' + end + classes end diff --git a/images/header.svg b/images/header.svg new file mode 100644 index 0000000000..510d3c9a2c --- /dev/null +++ b/images/header.svg @@ -0,0 +1 @@ + diff --git a/source/_footer.html.erb b/source/_footer.html.erb new file mode 100644 index 0000000000..8158014b1d --- /dev/null +++ b/source/_footer.html.erb @@ -0,0 +1,33 @@ +
+
+
+ Copyright <%= Time.now.strftime('%Y') %> + Tilde Inc. +
+ Core Team | + Sponsors +
+ Security | + Legal | + Logos +
+ Community Guidelines +
+ +
+ Ember.js is free, open source and always will be. +
+ +
+ + + + + + + + + +
+
+
diff --git a/source/_header.html.erb b/source/_header.html.erb new file mode 100644 index 0000000000..8c138528b1 --- /dev/null +++ b/source/_header.html.erb @@ -0,0 +1,20 @@ +
+ +
diff --git a/source/ember-community-survey-2016.html.erb b/source/ember-community-survey-2016.html.erb index 0db8c11e50..32ea968e13 100644 --- a/source/ember-community-survey-2016.html.erb +++ b/source/ember-community-survey-2016.html.erb @@ -1,5 +1,6 @@ --- title: "Ember Community Survey 2016" +responsive: true --- <% content_for :head do %> diff --git a/source/images/ember-logo.svg b/source/images/ember-logo.svg new file mode 100644 index 0000000000..25c1a64c83 --- /dev/null +++ b/source/images/ember-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/images/header.svg b/source/images/header.svg new file mode 100644 index 0000000000..510d3c9a2c --- /dev/null +++ b/source/images/header.svg @@ -0,0 +1 @@ + diff --git a/source/images/search-icon.svg b/source/images/search-icon.svg new file mode 100644 index 0000000000..89a1cda1a9 --- /dev/null +++ b/source/images/search-icon.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/source/layout.erb b/source/layout.erb index e57dd7a048..b7f90ef82e 100644 --- a/source/layout.erb +++ b/source/layout.erb @@ -18,8 +18,7 @@ <%= yield_content :head %> - - + - + <%= partial "header" %> <%= yield_content :outside_wrapper %> @@ -67,28 +44,7 @@ - + <%= partial "footer" %> <%= yield_content :foot %>