Skip to content

Commit e1fea4a

Browse files
shellweshellwe
committed
pushing up latest changes
About to push up the latest bootstrap so syncing current changes.
1 parent fd30e5b commit e1fea4a

38 files changed

+173
-187
lines changed

‎footer.php

+21-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,27 @@
1616
<footer id="colophon" class="container-fluid site-footer" role="contentinfo">
1717
<div class="container">
1818
<div class="row">
19-
<div class="col-sm-12">
20-
<p><?php bloginfo( 'name' ); ?></p>
19+
<div class="col-sm-6 col-md-8">
20+
<p>copyright <?php bloginfo( 'name' ); ?><br/ >
21+
If you have any questions please contact the <a href='mailto:<?php get_option( 'admin_email' ); ?>'>admin here</a>.</p>
22+
</div>
23+
<div class="col-sm-6 col-md-4">
24+
<?php
25+
if ( is_user_logged_in() ) {
26+
$current_user = wp_get_current_user();
27+
printf( 'Hello %s', esc_html( $current_user->user_firstname ) );
28+
printf( ' %s!', esc_html( $current_user->user_lastname ) );
29+
?>
30+
<br />Click <a href="<?php echo wp_logout_url( home_url() ); ?>">here to log out</a>.
31+
<?php
32+
33+
} else {
34+
?>
35+
You are currently not logged in;<br>Please <a href="<?php echo wp_login_url( home_url() ); ?>" title="Login">click here to log in</a>
36+
<?php
37+
//wp_loginout();
38+
}
39+
?>
2140
</div>
2241
</div>
2342
</div>

‎functions.php

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ function custom_redirect_fuction()
2121
}
2222
add_action('login_form', 'custom_redirect_fuction');
2323

24+
//This is a not smart work around as it ignores security but until I find out where the SSL Cert is I gotta use this
25+
// https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting#php-56-certificate-verification-failure
26+
2427
/**
2528
* End --- My PHP code
2629
*/

‎gulpfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ gulp.task('uglify', function() {
4747

4848
// Watch Files For Changes
4949
gulp.task('watch', function() {
50-
gulp.watch('js/source', ['lint', 'concat']);
50+
//gulp.watch('js/source', ['lint', 'concat']);
5151
gulp.watch('scss/*.scss', ['sass']);
5252
});
5353

‎header.php

+5-16
Original file line numberDiff line numberDiff line change
@@ -29,33 +29,22 @@
2929
<header id="masthead" class="container-fluid site-header" role="banner">
3030
<div class="container">
3131
<div class="row">
32-
<div class="site-branding col-sm-8">
32+
<div class="site-branding col-md-4">
3333
<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
3434

3535
<?php $description = get_bloginfo( 'description', 'display' );
3636
if ( $description || is_customize_preview() ) : ?>
3737
<p class="site-description"><?php echo $description; /* WPCS: xss ok. */ ?></p>
3838
<?php
3939
endif; ?>
40+
</div><!-- .site-branding -->
41+
42+
<div class="col-md-8">
4043
<nav id="site-navigation" class="main-navigation row" role="navigation">
4144
<button class="menu-toggle" aria-controls="primary-menu" aria-expanded="false"><?php esc_html_e( 'Primary Menu', 'qa_wp_template' ); ?></button>
4245
<?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_id' => 'primary-menu' ) ); ?>
4346
</nav><!-- #site-navigation -->
44-
</div><!-- .site-branding -->
45-
46-
<div class="col-sm-4">
47-
<form class="login-form">
48-
<?php
49-
if ( is_user_logged_in() ) {
50-
$current_user = wp_get_current_user();
51-
printf( 'Hello %s!', esc_html( $current_user->user_firstname ) );
52-
} else {
53-
wp_login_form();
54-
//wp_loginout();
55-
}
56-
?>
57-
</form>
58-
</div>
47+
</div>
5948
</div>
6049
</div>
6150

‎js/source/bootstrap/alert.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Util from './util'
33

44
/**
55
* --------------------------------------------------------------------------
6-
* Bootstrap (v4.0.0-alpha.3): alert.js
6+
* Bootstrap (v4.0.0-alpha.4): alert.js
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
88
* --------------------------------------------------------------------------
99
*/
@@ -18,7 +18,7 @@ const Alert = (($) => {
1818
*/
1919

2020
const NAME = 'alert'
21-
const VERSION = '4.0.0-alpha.3'
21+
const VERSION = '4.0.0-alpha.4'
2222
const DATA_KEY = 'bs.alert'
2323
const EVENT_KEY = `.${DATA_KEY}`
2424
const DATA_API_KEY = '.data-api'

‎js/source/bootstrap/button.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* --------------------------------------------------------------------------
3-
* Bootstrap (v4.0.0-alpha.3): button.js
3+
* Bootstrap (v4.0.0-alpha.4): button.js
44
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
55
* --------------------------------------------------------------------------
66
*/
@@ -15,7 +15,7 @@ const Button = (($) => {
1515
*/
1616

1717
const NAME = 'button'
18-
const VERSION = '4.0.0-alpha.3'
18+
const VERSION = '4.0.0-alpha.4'
1919
const DATA_KEY = 'bs.button'
2020
const EVENT_KEY = `.${DATA_KEY}`
2121
const DATA_API_KEY = '.data-api'

‎js/source/bootstrap/carousel.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Util from './util'
33

44
/**
55
* --------------------------------------------------------------------------
6-
* Bootstrap (v4.0.0-alpha.3): carousel.js
6+
* Bootstrap (v4.0.0-alpha.4): carousel.js
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
88
* --------------------------------------------------------------------------
99
*/
@@ -18,7 +18,7 @@ const Carousel = (($) => {
1818
*/
1919

2020
const NAME = 'carousel'
21-
const VERSION = '4.0.0-alpha.3'
21+
const VERSION = '4.0.0-alpha.4'
2222
const DATA_KEY = 'bs.carousel'
2323
const EVENT_KEY = `.${DATA_KEY}`
2424
const DATA_API_KEY = '.data-api'

‎js/source/bootstrap/collapse.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Util from './util'
33

44
/**
55
* --------------------------------------------------------------------------
6-
* Bootstrap (v4.0.0-alpha.3): collapse.js
6+
* Bootstrap (v4.0.0-alpha.4): collapse.js
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
88
* --------------------------------------------------------------------------
99
*/
@@ -18,7 +18,7 @@ const Collapse = (($) => {
1818
*/
1919

2020
const NAME = 'collapse'
21-
const VERSION = '4.0.0-alpha.3'
21+
const VERSION = '4.0.0-alpha.4'
2222
const DATA_KEY = 'bs.collapse'
2323
const EVENT_KEY = `.${DATA_KEY}`
2424
const DATA_API_KEY = '.data-api'

‎js/source/bootstrap/dropdown.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Util from './util'
33

44
/**
55
* --------------------------------------------------------------------------
6-
* Bootstrap (v4.0.0-alpha.3): dropdown.js
6+
* Bootstrap (v4.0.0-alpha.4): dropdown.js
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
88
* --------------------------------------------------------------------------
99
*/
@@ -18,7 +18,7 @@ const Dropdown = (($) => {
1818
*/
1919

2020
const NAME = 'dropdown'
21-
const VERSION = '4.0.0-alpha.3'
21+
const VERSION = '4.0.0-alpha.4'
2222
const DATA_KEY = 'bs.dropdown'
2323
const EVENT_KEY = `.${DATA_KEY}`
2424
const DATA_API_KEY = '.data-api'

‎js/source/bootstrap/modal.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Util from './util'
33

44
/**
55
* --------------------------------------------------------------------------
6-
* Bootstrap (v4.0.0-alpha.3): modal.js
6+
* Bootstrap (v4.0.0-alpha.4): modal.js
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
88
* --------------------------------------------------------------------------
99
*/
@@ -18,7 +18,7 @@ const Modal = (($) => {
1818
*/
1919

2020
const NAME = 'modal'
21-
const VERSION = '4.0.0-alpha.3'
21+
const VERSION = '4.0.0-alpha.4'
2222
const DATA_KEY = 'bs.modal'
2323
const EVENT_KEY = `.${DATA_KEY}`
2424
const DATA_API_KEY = '.data-api'

‎js/source/bootstrap/popover.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Tooltip from './tooltip'
33

44
/**
55
* --------------------------------------------------------------------------
6-
* Bootstrap (v4.0.0-alpha.3): popover.js
6+
* Bootstrap (v4.0.0-alpha.4): popover.js
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
88
* --------------------------------------------------------------------------
99
*/
@@ -18,7 +18,7 @@ const Popover = (($) => {
1818
*/
1919

2020
const NAME = 'popover'
21-
const VERSION = '4.0.0-alpha.3'
21+
const VERSION = '4.0.0-alpha.4'
2222
const DATA_KEY = 'bs.popover'
2323
const EVENT_KEY = `.${DATA_KEY}`
2424
const JQUERY_NO_CONFLICT = $.fn[NAME]

‎js/source/bootstrap/scrollspy.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Util from './util'
33

44
/**
55
* --------------------------------------------------------------------------
6-
* Bootstrap (v4.0.0-alpha.3): scrollspy.js
6+
* Bootstrap (v4.0.0-alpha.4): scrollspy.js
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
88
* --------------------------------------------------------------------------
99
*/
@@ -18,7 +18,7 @@ const ScrollSpy = (($) => {
1818
*/
1919

2020
const NAME = 'scrollspy'
21-
const VERSION = '4.0.0-alpha.3'
21+
const VERSION = '4.0.0-alpha.4'
2222
const DATA_KEY = 'bs.scrollspy'
2323
const EVENT_KEY = `.${DATA_KEY}`
2424
const DATA_API_KEY = '.data-api'

‎js/source/bootstrap/tab.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Util from './util'
33

44
/**
55
* --------------------------------------------------------------------------
6-
* Bootstrap (v4.0.0-alpha.3): tab.js
6+
* Bootstrap (v4.0.0-alpha.4): tab.js
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
88
* --------------------------------------------------------------------------
99
*/
@@ -18,7 +18,7 @@ const Tab = (($) => {
1818
*/
1919

2020
const NAME = 'tab'
21-
const VERSION = '4.0.0-alpha.3'
21+
const VERSION = '4.0.0-alpha.4'
2222
const DATA_KEY = 'bs.tab'
2323
const EVENT_KEY = `.${DATA_KEY}`
2424
const DATA_API_KEY = '.data-api'

‎js/source/bootstrap/tooltip.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Util from './util'
55

66
/**
77
* --------------------------------------------------------------------------
8-
* Bootstrap (v4.0.0-alpha.3): tooltip.js
8+
* Bootstrap (v4.0.0-alpha.4): tooltip.js
99
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
1010
* --------------------------------------------------------------------------
1111
*/
@@ -28,7 +28,7 @@ const Tooltip = (($) => {
2828
*/
2929

3030
const NAME = 'tooltip'
31-
const VERSION = '4.0.0-alpha.3'
31+
const VERSION = '4.0.0-alpha.4'
3232
const DATA_KEY = 'bs.tooltip'
3333
const EVENT_KEY = `.${DATA_KEY}`
3434
const JQUERY_NO_CONFLICT = $.fn[NAME]

‎js/source/bootstrap/util.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* --------------------------------------------------------------------------
3-
* Bootstrap (v4.0.0-alpha.3): util.js
3+
* Bootstrap (v4.0.0-alpha.4): util.js
44
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
55
* --------------------------------------------------------------------------
66
*/

‎page.php

-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222

2323
get_template_part( 'template-parts/content', 'page' );
2424

25-
// If comments are open or we have at least one comment, load up the comment template.
26-
if ( comments_open() || get_comments_number() ) :
27-
comments_template();
28-
endif;
29-
3025
endwhile; // End of the loop.
3126
?>
3227

‎scss/bootstrap/.scss-lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ linters:
8989
enabled: true
9090

9191
ImportantRule:
92-
enabled: true
92+
enabled: false
9393

9494
ImportPath:
9595
enabled: true

‎scss/bootstrap/_alert.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
// Expand the right padding and account for the close button's positioning.
2727

2828
.alert-dismissible {
29-
padding-right: ($alert-padding + 20px);
29+
padding-right: ($alert-padding * 2);
3030

3131
// Adjust close link position
3232
.close {
3333
position: relative;
34-
top: -2px;
35-
right: -21px;
34+
top: -.125rem;
35+
right: -$alert-padding;
3636
color: inherit;
3737
}
3838
}

‎scss/bootstrap/_card.scss

-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@
314314
column-gap: $card-columns-sm-up-column-gap;
315315

316316
.card {
317-
display: inline-block;
318317
width: 100%; // Don't let them exceed the column width
319318
}
320319
}

‎scss/bootstrap/_input-group.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,18 @@
9090
text-align: center;
9191
background-color: $input-group-addon-bg;
9292
border: $input-btn-border-width solid $input-group-addon-border-color;
93-
@include border-radius($border-radius);
93+
@include border-radius($input-border-radius);
9494

9595
// Sizing
9696
&.form-control-sm {
9797
padding: $input-padding-y-sm $input-padding-x-sm;
9898
font-size: $font-size-sm;
99-
@include border-radius($border-radius-sm);
99+
@include border-radius($input-border-radius-sm);
100100
}
101101
&.form-control-lg {
102102
padding: $input-padding-y-lg $input-padding-x-lg;
103103
font-size: $font-size-lg;
104-
@include border-radius($border-radius-lg);
104+
@include border-radius($input-border-radius-lg);
105105
}
106106

107107
// scss-lint:disable QualifyingElement

‎scss/bootstrap/_media.scss

-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@if $enable-flex {
22
.media {
33
display: flex;
4-
margin-bottom: $spacer;
54
}
65
.media-body {
76
flex: 1;
@@ -13,13 +12,6 @@
1312
align-self: flex-end;
1413
}
1514
} @else {
16-
.media {
17-
margin-top: $media-margin-top;
18-
19-
&:first-child {
20-
margin-top: 0;
21-
}
22-
}
2315
.media,
2416
.media-body {
2517
overflow: hidden;

‎scss/bootstrap/_navbar.scss

-2
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@
214214
//
215215
// Custom override for collapse plugin in navbar.
216216

217-
// scss-lint:disable ImportantRule
218217
.navbar-toggleable {
219218
&-xs {
220219
@include clearfix;
@@ -255,4 +254,3 @@
255254
}
256255
}
257256
}
258-
// scss-lint:enable ImportantRule

‎scss/bootstrap/_print.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// scss-lint:disable ImportantRule, QualifyingElement
1+
// scss-lint:disable QualifyingElement
22

33
// Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css
44

0 commit comments

Comments
 (0)