Skip to content

Commit

Permalink
accept changes in the secreen size and donate button style
Browse files Browse the repository at this point in the history
  • Loading branch information
verasunyy committed Jun 19, 2019
2 parents 3955b36 + c590575 commit 307420d
Show file tree
Hide file tree
Showing 38 changed files with 15,991 additions and 189 deletions.
Binary file not shown.
7,748 changes: 7,748 additions & 0 deletions themes/rcforward/assets/gilroy-font/Gilroy-ExtraBold.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
7,581 changes: 7,581 additions & 0 deletions themes/rcforward/assets/gilroy-font/Gilroy-Light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added themes/rcforward/assets/images/nw-mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion themes/rcforward/footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,19 @@
<?php endif; ?>

<footer id="colophon" class="site-footer" role="contentinfo">
<div class="footer-site-logo">
<a href="<?php echo home_url('/'); ?>" rel="home">
<h2 class="rcforward-logo">Rc Forward</h2>
</a>
</div>
<div class="footer-nav">
<?php wp_nav_menu(array('theme_location' => 'footer-menu', 'menu_id' => 'footer-menu')); ?>
</div><!-- .footer-nav -->
<div class="footer-info">
<?php $front_page_id = get_option('page-on-front'); ?>
<p><?php echo CFS()->get('footer_info', $front_page_id) ?></p>
<img src="<?php echo CFS()->get('footer_info_icon', $front_page_id) ?>">
<!-- Insert Icon -->
<!-- Insert Icon -->
</div><!-- .footer-info -->
<div class="footer-info-sm">
<p>RC Forward is a project of:</p>
Expand Down
5 changes: 5 additions & 0 deletions themes/rcforward/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,8 @@ function red_starter_scripts()
* Custom functions that act independently of the theme templates.
*/
require get_template_directory() . '/inc/extras.php';

function custom_add_google_fonts() {
wp_enqueue_style( 'rc-montserrat', 'https://fonts.googleapis.com/css?family=Montserrat:400,600,700,800&display=swap', false );
}
add_action( 'wp_enqueue_scripts', 'custom_add_google_fonts' );
1 change: 0 additions & 1 deletion themes/rcforward/js/counter.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
time: 2000
});
$()
$('.menu-item-has-children').append('<span><i class="fas fa-angle-down"></i></span>');
}); // end doc ready
})(jQuery);

1 change: 0 additions & 1 deletion themes/rcforward/js/hamburger.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@
$('.sub-menu').slideToggle();
});
} // end if

}); // end doc ready
})(jQuery);
76 changes: 67 additions & 9 deletions themes/rcforward/sass/_charity.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
width: 728px;
}
}


}
.browse-charities-title{
Expand All @@ -90,12 +89,71 @@
}

/* Main Content Section */
.single-content{
.chimp-donate-form {
text-align: center;
display: flex;
justify-content: center;

.last-with-button{
display: flex;
width: 100%;
flex-direction: column;
flex-wrap: wrap;
padding:10px;
}
.content-image{
display: flex;
}
.content-next{
display: flex;
}
.main-content{
background:#F9F5ED;
button{
text-align: center;
}
}

.content-image{
.main-image{
flex-basis: auto;
flex-grow: 1;
order:1;
img{
width: 401px;
}
}
.content-with-image{
flex-basis: auto;
width: 50%;
flex-grow: 1;
order: 2;
}
&:nth-child(even) {
.main-image {
width: 50%;
order: 2;

}
.content-with-image {
width: 50%;
order: 1;
}
}
}



/* common parts */
.single-content{
width:100%;
}
.chimp-donate-form{
display: flex;
margin: auto;
}
}

justify-content: center;
}
.report-button{
height: 60px;
width: 181px;
border: 2px solid #48209F;
border-radius: 6px;
padding: 10px;
background: $white;
}
47 changes: 34 additions & 13 deletions themes/rcforward/sass/_content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,26 @@
// .bypostauthor {
// display: block;
// }
body{
background: $credible__blue;

body {
background: $credible__blue;
color: $grounded__green;
font-family: $montserrat__font;
}
.site{
max-width: $max-screen-size;
background: white;
.site {
max-width: $max-screen-size;
margin: 0 auto;
background: white;
}
.site-content{
padding:1rem;
@include tablet{
padding:2rem;
}
@include desktop{
padding:5rem;
}
.site-content {
@include tablet {
padding: 2rem;
}
@include desktop {
padding: 5rem;
}
}
<<<<<<< HEAD
/* Chimp Donate Button */
.chimp-donate-form {
background: $code__blue;
Expand All @@ -73,3 +77,20 @@ body{
color: $grounded__green;
font-weight: bold;
}
=======

/* Chimp Donate Button */
.chimp-donate-form {
background-color: $code__blue;
font-size: 1.6rem;
font-weight: 700;
padding: 1.6rem 5.3rem;
color: $grounded__green;
border-radius: 8px;
margin-top: 10px;
@include tablet {
}
@include desktop {
}
}
>>>>>>> c590575265e0bcd82d5845260c2817245a4e37b3
24 changes: 24 additions & 0 deletions themes/rcforward/sass/_fonts.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
/*--------------------------------------------------------------
# Embedded Fonts
--------------------------------------------------------------*/
@font-face {
font-family: 'Gilroy';
src: url('Gilroy-Light.eot');
src: url('Gilroy-Light.eot?#iefix') format('embedded-opentype'),
url('Gilroy-Light.woff2') format('woff2'),
url('Gilroy-Light.woff') format('woff'),
url('Gilroy-Light.ttf') format('truetype'),
url('Gilroy-Light.svg#Gilroy-Light') format('svg');
font-weight: 300;
font-style: normal;
}

@font-face {
font-family: 'Gilroy';
src: url('Gilroy-ExtraBold.eot');
src: url('Gilroy-ExtraBold.eot?#iefix') format('embedded-opentype'),
url('Gilroy-ExtraBold.woff2') format('woff2'),
url('Gilroy-ExtraBold.woff') format('woff'),
url('Gilroy-ExtraBold.ttf') format('truetype'),
url('Gilroy-ExtraBold.svg#Gilroy-ExtraBold') format('svg');
font-weight: 800;
font-style: normal;
}

23 changes: 20 additions & 3 deletions themes/rcforward/sass/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
.footer-sidebar, .site-footer {
background-color: $credible__blue;
}
.site-footer {
.footer-site-logo {
a {
.rcforward-logo {
color: $white;
text-transform: uppercase;
text-align: center;
}
}
}
.footer-nav {
display: none;
}
.footer-info {

}
.footer-info-sm {

}
}
12 changes: 2 additions & 10 deletions themes/rcforward/sass/_hamburger.scss
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,11 @@
}

.menu {
.menu-item-71 {
&:last-child {
padding-top: 15px;
.sub-menu {
display: none;
background: $white;
background: ye;
list-style: none;
padding: 0;
@include tablet {
Expand All @@ -152,7 +152,6 @@
.menu-item {
border-bottom: 1px solid $credible__blue;
padding: 16px;

a {
color: $credible__blue;
}
Expand Down Expand Up @@ -230,10 +229,3 @@
// }
// }
// }

i{
color: #fff;
font-size: 2em;
position: absolute;

}
2 changes: 1 addition & 1 deletion themes/rcforward/sass/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@content;
}
}

@mixin desktop {
@media (min-width: $desktop-width) {
@content;
Expand Down
Loading

0 comments on commit 307420d

Please sign in to comment.