[gnome-web-www: 47/68] Merge branch 'wip/tomtryf/redesign' to master
- From: Tom Tryfonidis <tomtryf src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-web-www: 47/68] Merge branch 'wip/tomtryf/redesign' to master
- Date: Tue, 24 Jan 2017 15:51:10 +0000 (UTC)
commit 0fc2767d251f5b9a0908bb74a201bcecef141136
Merge: bcff454 e56d0ac
Author: Tom Tryfonidis <tomtryf gnome org>
Date: Mon Jan 9 19:33:10 2017 +0200
Merge branch 'wip/tomtryf/redesign' to master
theme/404.php | 17 +-
theme/css/friends.css | 153 +++++
theme/css/friends20.css | 247 --------
theme/css/home.css | 3 +
theme/css/news.css | 52 ++
theme/css/responsive.css | 458 +++------------
theme/css/text.css | 12 +-
theme/footer.php | 72 ++-
theme/functions.php | 207 ++++---
theme/header.php | 116 ++--
theme/images/asc.png | Bin 252 -> 0 bytes
theme/images/asc.svg | 118 ++++
theme/images/donations/friends-banner.png | Bin 561268 -> 0 bytes
theme/images/donations/friends-of-gnome.png | Bin 128095 -> 0 bytes
theme/images/donations/hackfests.png | Bin 49139 -> 0 bytes
theme/images/donations/infrastructure.png | Bin 15319 -> 0 bytes
theme/images/donations/outreach.png | Bin 50232 -> 0 bytes
theme/images/donations/thankyou-banner.png | Bin 760526 -> 0 bytes
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/inc/customizer.php | 207 ++++++
theme/inc/grass-sanitize.php | 27 +
theme/index.php | 17 +-
theme/js/friends.js | 162 +++---
theme/js/responsive.js | 42 --
theme/js/template.js | 28 +-
theme/lib/wp-bootstrap-navwalker.php | 220 +++++++
theme/news.php | 26 +-
theme/news_sidebar.php | 11 +-
theme/one-column-with-nav.php | 46 +-
theme/one-column-with-submenu.php | 15 +-
theme/one-column-without-title.php | 17 +-
theme/one-column.php | 35 +-
theme/page-about.php | 50 ++
theme/page-applications.php | 17 +-
theme/page-apply.php | 10 +-
theme/page-donate.php | 337 +++++-----
theme/page-foundation.php | 93 +++
theme/page-friends-of-gnome.php | 157 -----
theme/page-friends.php | 654 +++++---------------
theme/page-get-involved.php | 66 ++
theme/page-home.php | 2 -
theme/page-membership.php | 19 +-
theme/page-newhome.php | 81 +++
theme/page-news.php | 30 +-
theme/page-press.php | 22 +-
theme/page-previous-donors.php | 25 +-
theme/page-support-us.php | 152 +++---
theme/page-thank-you.php | 109 ++--
theme/project.php | 17 +-
theme/search.php | 36 +-
theme/social_icons.php | 20 +-
theme/style.css | 535 ++++++++++------
theme/taxonomy-project_category.php | 18 +-
57 files changed, 2510 insertions(+), 2374 deletions(-)
---
diff --cc theme/css/responsive.css
index f7973ed,42412ca..5607725
--- a/theme/css/responsive.css
+++ b/theme/css/responsive.css
@@@ -23,193 -4,66 +4,75 @@@
/* Make equal height columns */
-@media screen and (min-width: 768px) {
- .equalizer, .equalizer > div[class*='col-'] {
- display: -webkit-box;
- display: -webkit-flex;
- display: -ms-flexbox;
- display: flex;
+.equalizer,
+.equalizer > div[class*='col-'] {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-flex-wrap: wrap;
+ -ms-flex-wrap: wrap;
+ flex-wrap: wrap;
+}
+
+
+@media screen and (max-width: 767px) {
+ .boxes {
+ margin: 15px 0;
}
- }
+ body { padding-top: 50px } /* height of the menu collapsed */
- /*--------------General------------------------*/
- @media(max-width: 767px) {
- img {
- margin : 10px auto;
- display: block;
- }
- .mobile_text {
- text-align: justify;
- }
- }
- @media(min-width: 768px){
- #header {
- margin-bottom: 20px;
+ .nav-bg {
+ height: 45px;
+ width: 100%;
+ position: absolute;
+ top: 50px;
+ background-color: #4a86cf;
}
- }
- /*-------------Mobile-Menu, Normal-Menu----------------------*/
-
- .normal-menu .foundation-menu-item .sub-menu li a:active,
- .normal-menu .foundation-menu-item .sub-menu li a:focus,
- .normal-menu .foundation-menu-item .sub-menu li.current_page_item a{
- background: rgb(128, 128, 128);
- color: #fff;
- }
-
- .normal-menu .foundation-menu-item .sub-menu li a:hover{
- background: rgb(211, 211, 211);
- }
-
- .normal-menu .foundation-menu-item .sub-menu li a {
- color: #000;
- }
-
- .mobile-menu .top_bar ul li a {
- display: inline-block;
- width: 90%;
- height: 100%;
- padding: 1.5%;
- }
-
- .mobile-menu-text {
- letter-spacing: 1px;
- font-size: large;
- vertical-align: middle;
- height:25px;
- }
- #menu-globalnav {
- margin: 0px 0px 10px 0px;
- list-style: none;
- }
- #menu-globalnav .menu-item {
- float: none;
- font-size: large;
- letter-spacing: 2px;
- line-height: 100%;
- padding: 1%;
- }
-
- .plus-pull {
- color: white;
- /*margin-left: -5px;*/
- cursor: pointer;
- display: inline-block;
- }
-
- .menu-globalnav-container > .menu > .menu-item > .sub-menu {
- background-color: inherit;
- }
+ .menu-open .gnome-content{
+ padding-top: 40px;
+ }
- /*----------------Smartphones-------------------*/
- @media (max-width: 767px) {
- form {
- padding: 5px 10px;
- margin-left: 0.5%;
- }
- .mobile-menu {
- cursor: pointer;
- display: inline-block;
- float: right;
- visibility: visible;
- width:100%;
- }
- .normal-menu {
- display: none;
- }
- .top_bar {
- -moz-border-radius: 6px;
- -webkit-border-radius: 6px;
- border-radius: 6px;
- }
- .top_bar ul li {
- display: block !important;
- border-bottom: 1px solid rgba(102, 102, 102, 1);
- }
- .top_bar .sub-menu li {
- border-bottom: 0px;
- }
- .top_bar .sub-menu li:first-child {
- border-top: 1px white solid;
- }
- .top_bar input {
- width: 85%;
- }
- .crafted_content {
- text-align: center;
- }
+ .navbar-nav.nav > li {
+ position: static;
+ }
+ .navbar-nav.nav .dropdown-menu {
+ left: 0 !important;
+ right: 0 !important;
+ box-shadow: none;
+ border: none;
+ margin: 0 auto;
+ background: transparent;
+ padding: 0;
+ border-radius: 0;
+ max-width: 920px;
}
- /*-----------------Tablets------------------------*/
- @media (min-width: 767px) {
-
- .menu-globalnav-container {
- /* max-height: 20px;
- */ }
- .nav li {
- display: inline-block;
- vertical-align: top;
- }
- .top_bar {
- height: 36px;
- }
- #top_bar_search {
- height: 36px;
- }
- .top_bar .sub-menu {
- padding: 8px 0;
- margin-top: 8px;
- position: relative;
- z-index: 20;
- -moz-border-radius: 6px;
- -webkit-border-radius: 6px;
- border-radius: 6px;
- }
- .top_bar ul li {
- margin-right: 2px;
- }
+ .navbar-nav.nav .dropdown-menu > li {
+ float: left;
+ margin: 0px;
}
- @media (min-width:768px) and (max-width: 991px){
- .menu-globalnav-container {
- width: 724px;
- }
- .top_bar {
- max-width: 100%;
- width: 70%;
- margin-left: 0;
- margin-top: 0px !important;
- }
- #header #logo {
- height: auto;
- width: 199px;
- padding: 0 33%;
- }
- #top_bar_search {
- width: 30%;
- }
- .top_bar ul li {
- /*line-height: 28px;*/
- }
- #top_bar_search {
- margin-top: 0px !important;
- }
+ .navbar-nav.nav .dropdown-menu > li > a {
+ width: auto !important;
+ background: transparent;
+ line-height: 45px;
+ padding-top: 0;
+ padding-bottom: 0;
+ margin: 0;
}
- /*-------------------Laptops-------------------------------*/
- @media (min-width: 979px){
- .menu-globalnav-container {
- width: 680px;
+ .alert-validation-container {
+ margin-bottom: 50px;
+ }
+ .alert-validation {
+ position: absolute;
+ left: 0;
+ top: 0;
+ margin-top: -2px;
+ margin-left: 270px;
}
}
diff --cc theme/page-donate.php
index 63da6d8,4a07880..965ddc7
--- a/theme/page-donate.php
+++ b/theme/page-donate.php
@@@ -1,49 -1,43 +1,43 @@@
- <?php
+ <?php get_header(); ?>
- require_once("header.php"); ?>
+ <!-- container -->
+ <div class="container">
+ <div class="row content">
+ <div class="col-xs-12">
+ <div class="page_title">
+ <h1><?php esc_html_e('Donate to GNOME', 'grass');?></h1>
+ </div>
- <?php
- function matching_donation_text() {
- echo __('<p>Employees of some companies can have their donation to GNOME matched by their employer.
This is great way to increase your donation. Companies that offer donation matching include ... , ... and
...</p>', 'grass');
- } ?>
+ <p><?php esc_html_e( 'Thank you for donating to GNOME! Please choose a payment option that
best suits you.', 'grass' ); ?></p>
- <!-- container -->
- <div id="container">
- <div class="container">
- <div class="page_title">
- <h1><?php echo __('Donate to GNOME', 'grass');?></h1>
- </div>
-
- <div class="content">
- <p><?php _e( 'Thank you for choosing to donate to GNOME! Please choose a
payment option that best suits you.', 'grass' ); ?></p>
+ <?php while ( have_posts() ) : the_post(); ?>
+ <?php the_content(); ?>
+ <?php endwhile; // End the loop. Whew. ?>
+
+ <div class="clearfix"></div>
-
+
- <?php while ( have_posts() ) : the_post(); ?>
- <?php the_content(); ?>
- <?php endwhile; // End the loop. Whew. ?>
-
- <div class="clearfix"></div>
-
- <div class="boxes-container row equalizer">
- <div class="col-xs-6 col-sm-3">
- <div class="boxes active col-xs-12" target="1">
+ <!-- Donation Boxes -->
+ <div class="boxes-selection-container row equalizer">
+ <div class="col-sm-3">
+ <div class="boxes active col-sm-12" data-target="1">
<p class="main_feature">PayPal</p>
- <p><?php _e( 'Tax deductible in the United States', 'grass' ); ?></p>
+ <p><?php esc_html_e( 'Tax deductible in the United States', 'grass' ); ?></p>
</div>
</div>
- <div class="col-xs-6 col-sm-3">
- <div class="boxes col-xs-12" target="2">
- <p class="main_feature"><?php _e( 'Bank Transfer', 'grass' ); ?></p>
- <p><?php _e( 'For EU bank account holders only; tax deductible', 'grass' );
?></p>
+ <div class="col-sm-3">
+ <div class="boxes col-sm-12" data-target="2">
+ <p class="main_feature"><?php esc_html_e( 'Bank Transfer', 'grass' ); ?></p>
+ <p><?php esc_html_e( 'For EU bank account holders only; tax deductible',
'grass' ); ?></p>
</div>
</div>
- <div class="col-xs-6 col-sm-3">
- <div class="boxes col-xs-12" target="3">
- <p class="main_feature"><?php _e( 'Check', 'grass' ); ?></p>
- <p><?php _e( 'Available to United States bank account holders; tax deductible',
'grass' ); ?></p>
+ <div class="col-sm-3">
+ <div class="boxes col-sm-12" data-target="3">
+ <p class="main_feature"><?php /* translators: This is a payment option */
esc_html_e( 'Check', 'grass' ); ?></p>
+ <p><?php esc_html_e( 'Available to United States bank account holders; tax
deductible', 'grass' ); ?></p>
</div>
</div>
- <div class="col-xs-6 col-sm-3">
- <div class="boxes col-xs-12" target="4">
+ <div class="col-sm-3">
+ <div class="boxes col-sm-12" data-target="4">
<p class="main_feature">Bitcoin</p>
</div>
</div>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
