[gnome-web-www: 68/68] Merge ssh://gnome-testing.osuosl.org/git/gnome-web-www into master



commit cded592530290a04204c79a6b32e490b6522d31d
Merge: 71f8dc8 ba2351f
Author: Tom Tryfonidis <tomtryf gnome org>
Date:   Tue Jan 24 17:44:47 2017 +0200

    Merge ssh://gnome-testing.osuosl.org/git/gnome-web-www into master
    
    * ssh://gnome-testing.osuosl.org/git/gnome-web-www: (66 commits)
      Add a README file for the lib folder
      Don't use CSS flex on mobile views
      Add missing CSS flex prefixes
      fog: Add missing variables_epoch input when gift option is visible
      Replace previous_participation with references variable
      Remove invalid text from style.css
      Make Foundation submenu visible only on /foundation subpages
      Make the parent link of a dropdown click through to a url, instead of opening it
      Update the "support-us" references from functions.php
      fog: Rename support-us page
      Wrap donation bar inside a div
      Add a section on Customizer for the FoG donation bar
      Remove year from the copyright notice on footer
      Hide Banners menu from the dashboard
      Hide the admin-bar when the user isn't logged in
      Remove defined menu for the Foundation page
      Fix the spacing of the boxes on donate page
      Minor pixels fix on CSS Media queries
      Drop responsive.js from the enqueque scripts
      Remove reset.css file
      ...

 README                                             |    1 +
 theme/404.php                                      |   23 +-
 theme/css/bootstrap.min.css                        |    6 +
 theme/css/bootstrap_work1.css                      | 5668 ++++++++++++++++++++
 theme/css/font-awesome.min.css                     |    4 +
 theme/css/friends.css                              |  153 +
 theme/css/friends20.css                            |  142 -
 theme/css/home.css                                 |   19 +
 theme/css/min-bootstrap.css                        | 1858 +++++++
 theme/css/news.css                                 |   52 +
 theme/css/responsive.css                           |  135 +
 theme/css/text.css                                 |   25 +-
 theme/fonts/FontAwesome.otf                        |  Bin 0 -> 124988 bytes
 theme/fonts/fontawesome-webfont.eot                |  Bin 0 -> 76518 bytes
 theme/fonts/fontawesome-webfont.svg                |  685 +++
 theme/fonts/fontawesome-webfont.ttf                |  Bin 0 -> 152796 bytes
 theme/fonts/fontawesome-webfont.woff               |  Bin 0 -> 90412 bytes
 theme/fonts/fontawesome-webfont.woff2              |  Bin 0 -> 71896 bytes
 theme/footer.php                                   |   74 +-
 theme/footer_art.php                               |    4 +-
 theme/functions.php                                |  226 +-
 theme/header.php                                   |  155 +-
 theme/images/asc.svg                               |  118 +
 theme/images/favicon.ico                           |  Bin 0 -> 5430 bytes
 .../images/foundation/foundation_back_balloons.png |  Bin 0 -> 3027 bytes
 theme/images/foundation/foundation_balloon.png     |  Bin 0 -> 7877 bytes
 theme/images/gnome-logo.svg                        |  126 +
 theme/images/home/featured_image.png               |  Bin 0 -> 320739 bytes
 theme/images/photo-missing.png                     |  Bin 0 -> 1488 bytes
 theme/inc/customizer.php                           |  236 +
 theme/inc/grass-sanitize.php                       |   27 +
 theme/index.php                                    |   21 +-
 theme/js/bootstrap.min.js                          |    7 +
 theme/js/bootstrap_work1.js                        | 5633 +++++++++++++++++++
 theme/js/clipboard.min.js                          |    7 +
 theme/js/foundation-bar.js                         |   12 +
 theme/js/friends.js                                |  110 +
 theme/js/jquery-1.10.2.min.js                      |    6 +
 theme/js/jquery-migrate-1.2.1.min.js               |    2 +
 theme/js/template.js                               |    4 +-
 theme/lib/README                                   |    5 +
 theme/lib/wp-bootstrap-navwalker.php               |  220 +
 theme/news.php                                     |   30 +-
 theme/news_sidebar.php                             |   38 +-
 theme/one-column-with-nav.php                      |   40 +-
 theme/one-column-with-submenu.php                  |   15 +-
 theme/one-column-without-title.php                 |   16 +-
 theme/one-column.php                               |   35 +-
 theme/page-about.php                               |   50 +
 theme/page-applications.php                        |   17 +-
 theme/page-apply.php                               |  380 +-
 theme/page-donate.php                              |  199 +
 theme/page-foundation.php                          |   93 +
 theme/page-friends.php                             |  654 +--
 theme/page-get-involved.php                        |   66 +
 theme/page-home.php                                |   38 +-
 theme/page-membership.php                          |   24 +-
 theme/page-newhome.php                             |   81 +
 theme/page-news.php                                |   36 +-
 theme/page-press.php                               |   29 +-
 theme/page-previous-donors.php                     |   25 +-
 theme/page-support-gnome.php                       |   92 +
 theme/page-thank-you.php                           |   80 +
 theme/project.php                                  |   17 +-
 theme/search.php                                   |   36 +-
 theme/social_icons.php                             |   26 +-
 theme/style.css                                    |  838 +++-
 theme/taxonomy-project_category.php                |   18 +-
 68 files changed, 17181 insertions(+), 1556 deletions(-)
---
diff --cc theme/footer.php
index cdfd987,2bef97a..3246c08
--- a/theme/footer.php
+++ b/theme/footer.php
@@@ -31,25 -30,33 +30,32 @@@
                  }
              }
              ?>
-             
-             <div class="icons grid_3">
-               <?php require_once("social_icons.php"); ?>
-           </div>
-           <!-- footnotes -->
-             <div id="footnotes" class="grid_9">
-                 <?php _e( 'Copyright', 'grass' ); ?> © 2005‒<?php echo date('Y');?> <strong 
class="gnome_logo"><?php _e( 'The GNOME Project', 'grass' ); ?></strong><br />
-                 <small>
-                     <?php _e( 'Free to share and remix', 'grass' ); ?>: <a 
href="http://creativecommons.org/licenses/by/3.0/";>Creative Commons CC-BY</a>.
-                     <?php _e( 'Optimized for standards', 'grass' ); ?>.
-                     <?php _e( 'Hosted by', 'grass' ); ?> <a href="http://www.redhat.com/";>Red Hat</a>.
-                     <?php _e( 'Powered by', 'grass' ); ?> <a href="http://www.wordpress.org";>WordPress</a>.
-                 </small>
 -
+             <div class="icons col-xs-12 col-sm-3">
+                 <?php require_once("social_icons.php"); ?>
              </div>
-             
-             <div class="clear"></div>
          </div>
      </div>
-     
+     </div>
+     <div class="container">
+         <!-- footnotes -->
+         <div class="row">
+             <div class="col-sm-12">
+                 <div id="footnotes" class="col-sm-9">
+                     <strong class="gnome_logo">&copy; <?php esc_html_e( 'The GNOME Project', 'grass' ); 
?></strong><br />
+                     <small>
+                         <?php esc_html_e( 'Free to share and remix', 'grass' ); ?>: <a 
href="http://creativecommons.org/licenses/by/3.0/";>Creative Commons CC-BY</a>.
+                         <?php esc_html_e( 'Optimized for standards', 'grass' ); ?>.
 -                        <?php esc_html_e( 'Hosted by', 'grass' ); ?> <a 
href="http://www.canonical.com/";>Canonical</a>.
++                        <?php esc_html_e( 'Hosted by', 'grass' ); ?> <a href="http://www.redhat.com/";>Red 
Hat</a>.
+                         <?php esc_html_e( 'Powered by', 'grass' ); ?> <a 
href="http://www.wordpress.org";>WordPress</a>.
+                     </small>
+                 </div>
+             </div>
+         </div>
+         </div>
+     </div>
+             <div class="clearfix"></div>
+ 
+ 
      <?php if ($_SERVER['HTTP_HOST'] != 'localhost') { ?>
  
      <!-- Piwik -->
diff --cc theme/functions.php
index 7e47797,0cba2d1..abacbce
--- a/theme/functions.php
+++ b/theme/functions.php
@@@ -5,29 -5,46 +5,53 @@@
   */
  
  /*
 + * The genericons.css stylesheet wasn't loaded, enqueue
 + * it for share icons to show up correctly. 
 + */
 +
 +wp_enqueue_style( 'genericons', '/wp-content/plugins/jetpack/_inc/genericons/genericons/genericons.css', 
array(), '3.1' );
 +
 +/*
-  * Add support for custom menus and posts thumbnails
+  * Add support for theme translations.
+  * Translations should be under /languages/ directory.
   */
  
- add_theme_support('menus');
- add_theme_support( 'post-thumbnails');
+ load_theme_textdomain( 'grass', get_template_directory().'/languages' );
  
+ // Add default posts and comments RSS feed links to head.
+ add_theme_support('automatic-feed-links');
  
  /*
-  * Set default banner size
+  * Let WordPress manage the document title.
+  *
+  * @link https://developer.wordpress.org/reference/functions/add_theme_support/#title-tag
   */
- set_post_thumbnail_size(940, 280);
+ 
+ add_theme_support( 'title-tag' );
  
  /*
-  * Media sizes for applications icons
+  * Switch default core markup for search form, comment form, and comments to output valid HTML5.
+  *
+  * @link https://developer.wordpress.org/reference/functions/add_theme_support/#html5
   */
+  
+ add_theme_support('html5', array(
+     'search-form',
+     'comment-form',
+     'comment-list',
+     'gallery',
+     'caption',
+ ));
+ 
+ /*
+  * Enable support for Post Thumbnails on posts and pages.
+  *
+  * @link https://developer.wordpress.org/reference/functions/add_theme_support/#post-thumbnails
+  */
+ 
+ add_theme_support('post-thumbnails');
  
+ // Media sizes for applications icons
  add_image_size( 'icon-big', 256, 256, true);
  add_image_size( 'icon-medium', 186, 186, true);
  add_image_size( 'icon-small', 64, 64, true);
diff --cc theme/page-home.php
index 9db0f03,20ddd24..22e62be
--- a/theme/page-home.php
+++ b/theme/page-home.php
@@@ -1,11 -1,7 +1,5 @@@
  <?php
  
- 
- add_action('wp_head', function() {
-     echo '<link rel="stylesheet" type="text/css" media="all" 
href="'.get_bloginfo('template_url').'/css/home.css" />';
-     echo '<link rel="stylesheet" type="text/css" media="all" 
href="'.get_bloginfo('template_url').'/css/news.css" />';
- });
- 
 -$screenshot = get_option('homepage_screenshot');
 -
  /*
   * Add link to global feeds instead of current page comments
   */
@@@ -17,23 -13,21 +11,20 @@@ add_action('wp_head', function() 
  require_once("header.php"); ?>
  
  <!-- container -->
--
- <div class="container_12">
- 
-     <div class="crafted_content">
-         <div class="section image-left">
-             <div class="image">
+ <div class="container">
+     <div id="home">
+     <div id="home-crafted-content" class="row">
+             <div class="col-sm-12 col-md-6">
 -                <a href="<?php echo $screenshot ?>"><img src="<?php echo $screenshot ?>" 
class="img-responsive" alt="release screenshost"></a>
 +                <a 
href="https://www.gnome.org/wp-content/uploads/2016/03/window-selection-3.20-420x236.png";><img 
src="https://www.gnome.org/wp-content/uploads/2016/03/window-selection-3.20-420x236.png"; alt=""></a>
              </div>
-             <div class="text">
+             <div class="text col-sm-12 col-md-6">
                  <h3>GNOME 3: Ease, comfort and control</h3>
                  <p>GNOME 3 is an easy and elegant way to use your computer. It is designed to put you in 
control and bring freedom to everybody. GNOME 3 is developed by the GNOME community, a diverse, international 
group of contributors that is supported by an independent, non-profit foundation.</p>
- 
-               <p style="text-align: center;">
-                       <a class="action_button" href="gnome-3">Discover GNOME 3</a>
-                       <a class="action_button" href="getting-gnome">Get GNOME 3</a></p>
+                 <p>
+                     <a class="action_button" href="gnome-3">Discover GNOME 3</a>
+                     <a class="action_button" href="getting-gnome">Get GNOME 3</a>
+                 </p>
              </div>
-         </div>
      </div>
  
      <hr class="bottom_shadow" style="margin-bottom: 0;"/>
diff --cc theme/page-membership.php
index a3e09ff,038594d..12a3289
--- a/theme/page-membership.php
+++ b/theme/page-membership.php
@@@ -1,19 -1,29 +1,21 @@@
  <?php
  
 +$members_url = "https://foundation.gnome.org/membership/membershiplist";;
  
 -if (false === ($members = get_transient('foundation_members_list'))) {
 +$members = json_decode(file_get_contents($members_url));
  
- require_once("header.php"); ?>
 -    $members_url = "https://www.gnome.org/membership/members-list.php?format=json";;
 -
 -    $members = json_decode(file_get_contents($members_url));
 -    
 -    // keeps a 12-hour cache until another HTTP request
 -    // to get the members list
 -    set_transient('foundation_members_list', $members, 60*60*12);
 -    
 -}
+ ?>
+ 
+ <?php get_header(); ?>
  
      <!-- container -->
-     <div id="container" class="two_columns">
-         <div class="container_12">
-               <div class="page_title" style="margin-bottom: 2px;">
-                 <h1><?php the_title(); ?></h1>
-               </div>
-               <div class="clearfix"></div>
-             <?php wp_nav_menu(array('menu'=>'foundationnav','container_class'=>'foundation_nav')); ?>
+     <div id="foundation" class="two_columns">
+         <div class="container">
+             <div class="page_title">
+                 <h1><?php the_title(); ?></h1>
+             </div>
 -        <div class="clearfix"></div>
 -            
++            <div class="clearfix"></div>
++
              <div class="content without_sidebar">
              <?php while ( have_posts() ) : the_post(); ?>
                  <?php the_content(); ?>
@@@ -34,13 -46,9 +36,9 @@@
                  <br />
                  <div class="clear"></div>
              </div>
- 
-             <?php require_once("footer_art.php"); ?>
          </div>
      </div>
 -    
 +
      <div class="clearfix"></div>
 -    
 +
-     <?php require_once("footer.php"); ?>
- </body>
- </html>
+ <?php get_footer(); ?>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]