Merge branch 'no-bower'

README.md

@@ -20,6 +20,11 @@ UnderStrap is released under the terms of the GPL version 2 or (at your option)
 http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html
 
 ## Changelog
+            - ** 0.4.8 Pre-Release **
+                  - Removing Bower and replace the dependency managment copletely with npm
+                  - Update to Bootstrap 4 Alpha 4
+
+
             - ** 0.4.7 Aug. 15the 2016 **
                   - Fixing problem with tag page
                   - Fixing Navbar "hopping"
@@ -122,8 +127,8 @@ http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html
 - Combines Underscore’s PHP/JS files and Bootstrap’s HTML/CSS/JS.
 - Comes with Bootstrap (v4) Sass source files and additional .scss files. Nicely sorted and ready to add your own variables and customize the Bootstrap variables.
 - Uses a single and minified CSS file for all the basic stuff.
-- [Font Awesome](http://fortawesome.github.io/Font-Awesome/) integration (v4.6.0)
+- [Font Awesome](http://fortawesome.github.io/Font-Awesome/) integration (v4.6.3)
-- Comes with extra slider script by [Owl Carousel](http://www.owlcarousel.owlgraphic.com/) (v2.0.0-beta.2.4)
+- Comes with extra slider script by [Owl Carousel](http://www.owlcarousel.owlgraphic.com/) (v2.1.4)
 - Simple RTL file.
 - Jetpack ready.
 - WooCommerce support.
@@ -161,12 +166,12 @@ Some basics about the Sass and CSS files that come with UnderStrap:
 - Go to Appearance → Themes
 - Activate the UnderStrap theme
 
-## Developing With npm, Bower, Gulp and SASS and [Browser Sync][1]
+## Developing With npm, Gulp and SASS and [Browser Sync][1]
 
 ### Installing Dependencies
-- Make sure you have installed Node.js, Bower, and Browser-Sync on your computer globally
+- Make sure you have installed Node.js and Browser-Sync* (* optional, if you wanna use it) on your computer globally
 - Then open your terminal and browse to the location of your UnderStrap copy
-- Run: `$ npm install` then: `$ bower install` and finally: `$ gulp copy-assets`
+- Run: `$ npm install` and then: `$ gulp copy-assets`
 
 ### Running
 To work and compile your Sass files on the fly start:

bower.json

@@ -24,11 +24,6 @@
     "tests"
   ],
   "dependencies": {
-    "fontawesome": "~4.6.3",
-    "_s": "https://github.com/Automattic/_s.git",
-    "OwlCarousel2": "2.1.6",
-    "bootstrap": "v4.0.0-alpha.3",
-    "tether": "~1.3.2"
   },
   "_source": "https://github.com/holger1411/understrap.git",
   "_target": "~0.4.7",

css/theme.css

@@ -1554,14 +1554,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
 
 .has-success .form-control-feedback,
 .has-success .form-control-label,
-.has-success .radio,
+.has-success .form-check-label,
-.has-success .checkbox,
+.has-success .form-check-inline,
-.has-success .radio-inline,
-.has-success .checkbox-inline,
-.has-success.radio label,
-.has-success.checkbox label,
-.has-success.radio-inline label,
-.has-success.checkbox-inline label,
 .has-success .custom-control {
   color: #5cb85c; }
 
@@ -1581,14 +1575,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
 
 .has-warning .form-control-feedback,
 .has-warning .form-control-label,
-.has-warning .radio,
+.has-warning .form-check-label,
-.has-warning .checkbox,
+.has-warning .form-check-inline,
-.has-warning .radio-inline,
-.has-warning .checkbox-inline,
-.has-warning.radio label,
-.has-warning.checkbox label,
-.has-warning.radio-inline label,
-.has-warning.checkbox-inline label,
 .has-warning .custom-control {
   color: #f0ad4e; }
 
@@ -1608,14 +1596,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
 
 .has-danger .form-control-feedback,
 .has-danger .form-control-label,
-.has-danger .radio,
+.has-danger .form-check-label,
-.has-danger .checkbox,
+.has-danger .form-check-inline,
-.has-danger .radio-inline,
-.has-danger .checkbox-inline,
-.has-danger.radio label,
-.has-danger.checkbox label,
-.has-danger.radio-inline label,
-.has-danger.checkbox-inline label,
 .has-danger .custom-control {
   color: #d9534f; }
 
@@ -3145,7 +3127,6 @@ input[type="button"].btn-block {
     column-count: 3;
     column-gap: 1.25rem; }
     .card-columns .card {
-      display: inline-block;
       width: 100%; } }
 
 .breadcrumb {
@@ -3317,7 +3298,7 @@ a.tag:focus, a.tag:hover {
   border-radius: 0; }
 
 .alert {
-  padding: 15px;
+  padding: 1rem;
   margin-bottom: 1rem;
   border: 1px solid transparent;
   border-radius: 0.25rem; }
@@ -3329,11 +3310,11 @@ a.tag:focus, a.tag:hover {
   font-weight: bold; }
 
 .alert-dismissible {
-  padding-right: 35px; }
+  padding-right: 2rem; }
   .alert-dismissible .close {
     position: relative;
-    top: -2px;
+    top: -.125rem;
-    right: -21px;
+    right: -1rem;
     color: inherit; }
 
 .alert-success {
@@ -3515,11 +3496,6 @@ base::-moz-progress-bar,
   .progress-danger .progress-bar {
     background-color: #d9534f; } }
 
-.media {
-  margin-top: 15px; }
-  .media:first-child {
-    margin-top: 0; }
-
 .media,
 .media-body {
   overflow: hidden; }
@@ -4208,9 +4184,6 @@ button.close {
   .carousel-indicators {
     bottom: 20px; } }
 
-.bg-inverse {
-  background-color: #373a3c; }
-
 .bg-faded {
   background-color: #f7f7f9; }
 
@@ -4249,6 +4222,13 @@ a.bg-warning:focus, a.bg-warning:hover {
 a.bg-danger:focus, a.bg-danger:hover {
   background-color: #c9302c !important; }
 
+.bg-inverse {
+  color: #fff !important;
+  background-color: #373a3c !important; }
+
+a.bg-inverse:focus, a.bg-inverse:hover {
+  background-color: #1f2021 !important; }
+
 .clearfix::after {
   content: "";
   display: table;
@@ -4594,37 +4574,37 @@ a.bg-danger:focus, a.bg-danger:hover {
   color: #818a91 !important; }
 
 a.text-muted:focus, a.text-muted:hover {
-  color: #687077; }
+  color: #687077 !important; }
 
 .text-primary {
   color: #895cd1 !important; }
 
 a.text-primary:focus, a.text-primary:hover {
-  color: #6d37c3; }
+  color: #6d37c3 !important; }
 
 .text-success {
   color: #5cb85c !important; }
 
 a.text-success:focus, a.text-success:hover {
-  color: #449d44; }
+  color: #449d44 !important; }
 
 .text-info {
   color: #5bc0de !important; }
 
 a.text-info:focus, a.text-info:hover {
-  color: #31b0d5; }
+  color: #31b0d5 !important; }
 
 .text-warning {
   color: #f0ad4e !important; }
 
 a.text-warning:focus, a.text-warning:hover {
-  color: #ec971f; }
+  color: #ec971f !important; }
 
 .text-danger {
   color: #d9534f !important; }
 
 a.text-danger:focus, a.text-danger:hover {
-  color: #c9302c; }
+  color: #c9302c !important; }
 
 .text-hide {
   font: 0/0 a;

footer.php

@@ -24,7 +24,7 @@
                         <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'understrap' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'understrap' ), 'WordPress' ); ?></a>
                         <span class="sep"> | </span>
                         <?php printf( __( 'Theme: %1$s by %2$s.', 'understrap' ), 'understrap', '<a href="http://understrap.com/" rel="designer">understrap.com</a>' ); ?> 
-                        (<?php printf( __( 'Version', 'understrap' ) ); ?>: 0.4.6)
+                        (<?php printf( __( 'Version', 'understrap' ) ); ?>: 0.4.7)
                     </div><!-- .site-info -->
 
                 </footer><!-- #colophon -->

gulpfile.js

@@ -1,6 +1,7 @@
 // Defining base pathes
 var basePaths = {
     bower: './bower_components/',
+    node: './node_modules/',
     dev: './src/'
 };
 
@@ -170,48 +171,48 @@ gulp.task('copy-assets', function() {
 
 ////////////////// All Bootstrap 4 Assets /////////////////////////
 // Copy all Bootstrap JS files 
-    gulp.src(basePaths.bower + 'bootstrap/dist/js/**/*.js')
+    gulp.src(basePaths.node + 'bootstrap/dist/js/**/*.js')
        .pipe(gulp.dest(basePaths.dev + '/js/bootstrap4'));
 
 // Copy all Bootstrap SCSS files
-    gulp.src(basePaths.bower + 'bootstrap/scss/**/*.scss')
+    gulp.src(basePaths.node + 'bootstrap/scss/**/*.scss')
        .pipe(gulp.dest(basePaths.dev + '/sass/bootstrap4'));
 ////////////////// End Bootstrap 4 Assets /////////////////////////
 
 // Copy all Font Awesome Fonts
-    gulp.src(basePaths.bower + 'fontawesome/fonts/**/*.{ttf,woff,woff2,eof,svg}')
+    gulp.src(basePaths.node + 'font-awesome/fonts/**/*.{ttf,woff,woff2,eof,svg}')
         .pipe(gulp.dest('./fonts'));
 
 // Copy all Font Awesome SCSS files
-    gulp.src(basePaths.bower + 'fontawesome/scss/*.scss')
+    gulp.src(basePaths.node + 'font-awesome/scss/*.scss')
         .pipe(gulp.dest(basePaths.dev + '/sass/fontawesome'));
 
 // owl JS files
-    gulp.src(basePaths.bower + 'OwlCarousel2/dist/*.js')
+    gulp.src(basePaths.node + 'owl.carousel/dist/*.js')
         .pipe(gulp.dest(basePaths.dev + '/js'));
 
 // Copy all Owl2 SCSS files
-    gulp.src(basePaths.bower + 'OwlCarousel2/src/scss/*.scss')
+    gulp.src(basePaths.node + 'owl.carousel/src/scss/*.scss')
        .pipe(gulp.dest(basePaths.dev + '/sass/owl-carousel2'));
 
 // Copy all Owl2 CSS files
-    gulp.src(basePaths.bower + 'OwlCarousel2/dist/assets/*.css')
+    gulp.src(basePaths.node + 'owl.carousel/dist/assets/*.css')
         .pipe(gulp.dest(basePaths.dev + '/css'));
 
 // Copy jQuery
-    gulp.src(basePaths.bower + 'jquery/dist/*.js')
+    gulp.src(basePaths.node + 'jquery/dist/*.js')
         .pipe(gulp.dest(basePaths.dev + '/js'));
 
 // _s JS files
-    gulp.src(basePaths.bower + '_s/js/*.js')
+    gulp.src(basePaths.node + 'underscores-for-npm/js/*.js')
         .pipe(gulp.dest(basePaths.dev + '/js'));
 
 // Copy Tether JS files
-    gulp.src(basePaths.bower + 'tether/dist/js/*.js')
+    gulp.src(basePaths.node + 'tether/dist/js/*.js')
         .pipe(gulp.dest(basePaths.dev + '/js'));
 
 // Copy Tether CSS files
-    gulp.src(basePaths.bower + 'tether/dist/css/*.css')
+    gulp.src(basePaths.node + 'tether/dist/css/*.css')
         .pipe(gulp.dest(basePaths.dev + '/css'));
 });
 

package.json

@@ -24,21 +24,25 @@
   },
   "homepage": "https://github.com/holger1411/understrap",
   "dependencies": {
+    "bootstrap": "^4.0.0-alpha.4",
     "bower": "^1.7.9",
+    "browser-sync": "^2.13.0",
+    "font-awesome": "^4.6.3",
     "gulp": "^3.9.1",
+    "gulp-clone": "^1.0.0",
     "gulp-concat": "^2.6.0",
+    "gulp-cssnano": "^2.1.2",
     "gulp-ignore": "^2.0.1",
+    "gulp-merge": "^0.1.1",
     "gulp-plumber": "^1.1.0",
     "gulp-rename": "^1.2.2",
     "gulp-rimraf": "^0.2.0",
     "gulp-sass": "^2.3.2",
+    "gulp-sourcemaps": "^1.6.0",
     "gulp-uglify": "^1.5.3",
     "gulp-watch": "^4.3.6",
-    "gulp-clone": "^1.0.0",
-    "gulp-merge": "^0.1.1",
-    "gulp-cssnano": "^2.1.2",
-    "gulp-sourcemaps": "^1.6.0",
     "merge2": "^1.0.2",
-    "browser-sync": "^2.13.0"
+    "owl.carousel": "^2.1.4",
+    "undescores-for-npm": "^1.0.0"
   }
 }