added vendor directory in place of mixing theme files with third party dependencies

This commit is contained in:
David Miller 2016-06-27 15:42:18 -04:00
parent 5bbfa91a33
commit e65cf7667d
54 changed files with 52 additions and 55 deletions

View File

@ -146,58 +146,59 @@ fieldset[disabled] .btn-xl.active {
color: #fed136; color: #fed136;
background-color: white; background-color: white;
} }
.navbar-default { .navbar-custom {
background-color: #222222; background-color: #222222;
border-color: transparent; border-color: transparent;
} }
.navbar-default .navbar-brand { .navbar-custom .navbar-brand {
color: #fed136; color: #fed136;
font-family: "Kaushan Script", "Helvetica Neue", Helvetica, Arial, cursive; font-family: "Kaushan Script", "Helvetica Neue", Helvetica, Arial, cursive;
} }
.navbar-default .navbar-brand:hover, .navbar-custom .navbar-brand:hover,
.navbar-default .navbar-brand:focus, .navbar-custom .navbar-brand:focus,
.navbar-default .navbar-brand:active, .navbar-custom .navbar-brand:active,
.navbar-default .navbar-brand.active { .navbar-custom .navbar-brand.active {
color: #fec503; color: #fec503;
} }
.navbar-default .navbar-collapse { .navbar-custom .navbar-collapse {
border-color: rgba(255, 255, 255, 0.02); border-color: rgba(255, 255, 255, 0.02);
} }
.navbar-default .navbar-toggle { .navbar-custom .navbar-toggle {
background-color: #fed136; background-color: #fed136;
border-color: #fed136; border-color: #fed136;
font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
text-transform: uppercase;
color: white;
font-size: 12px;
} }
.navbar-default .navbar-toggle .icon-bar { .navbar-custom .navbar-toggle:hover,
background-color: white; .navbar-custom .navbar-toggle:focus {
}
.navbar-default .navbar-toggle:hover,
.navbar-default .navbar-toggle:focus {
background-color: #fed136; background-color: #fed136;
} }
.navbar-default .nav li a { .navbar-custom .nav li a {
font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
text-transform: uppercase; text-transform: uppercase;
font-weight: 400; font-weight: 400;
letter-spacing: 1px; letter-spacing: 1px;
color: white; color: white;
} }
.navbar-default .nav li a:hover, .navbar-custom .nav li a:hover,
.navbar-default .nav li a:focus { .navbar-custom .nav li a:focus {
color: #fed136; color: #fed136;
outline: none; outline: none;
} }
.navbar-default .navbar-nav > .active > a { .navbar-custom .navbar-nav > .active > a {
border-radius: 0; border-radius: 0;
color: white; color: white;
background-color: #fed136; background-color: #fed136;
} }
.navbar-default .navbar-nav > .active > a:hover, .navbar-custom .navbar-nav > .active > a:hover,
.navbar-default .navbar-nav > .active > a:focus { .navbar-custom .navbar-nav > .active > a:focus {
color: white; color: white;
background-color: #fec503; background-color: #fec503;
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar-default { .navbar-custom {
background-color: transparent; background-color: transparent;
padding: 25px 0; padding: 25px 0;
-webkit-transition: padding 0.3s; -webkit-transition: padding 0.3s;
@ -205,22 +206,22 @@ fieldset[disabled] .btn-xl.active {
transition: padding 0.3s; transition: padding 0.3s;
border: none; border: none;
} }
.navbar-default .navbar-brand { .navbar-custom .navbar-brand {
font-size: 2em; font-size: 2em;
-webkit-transition: all 0.3s; -webkit-transition: all 0.3s;
-moz-transition: all 0.3s; -moz-transition: all 0.3s;
transition: all 0.3s; transition: all 0.3s;
} }
.navbar-default .navbar-nav > .active > a { .navbar-custom .navbar-nav > .active > a {
border-radius: 3px; border-radius: 3px;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar-default.affix { .navbar-custom.affix {
background-color: #222222; background-color: #222222;
padding: 10px 0; padding: 10px 0;
} }
.navbar-default.affix .navbar-brand { .navbar-custom.affix .navbar-brand {
font-size: 1.5em; font-size: 1.5em;
} }
} }

2
css/agency.min.css vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -56,19 +56,19 @@ gulp.task('minify-js', function() {
})) }))
}); });
// Copy Bootstrap core files from node_modules // Copy Bootstrap core files from node_modules to vendor directory
gulp.task('bootstrap', function() { gulp.task('bootstrap', function() {
return gulp.src(['node_modules/bootstrap/dist/**/*', '!**/npm.js', '!**/bootstrap-theme.*', '!**/*.map']) return gulp.src(['node_modules/bootstrap/dist/**/*', '!**/npm.js', '!**/bootstrap-theme.*', '!**/*.map'])
.pipe(gulp.dest('')) .pipe(gulp.dest('vendor/bootstrap'))
}) })
// Copy jQuery core files from node_modules // Copy jQuery core files from node_modules to vendor directory
gulp.task('jquery', function() { gulp.task('jquery', function() {
return gulp.src(['node_modules/jquery/dist/jquery.js', 'node_modules/jquery/dist/jquery.min.js']) return gulp.src(['node_modules/jquery/dist/jquery.js', 'node_modules/jquery/dist/jquery.min.js'])
.pipe(gulp.dest('js')) .pipe(gulp.dest('vendor/jquery'))
}) })
// Copy Font Awesome core files from node_modules // Copy Font Awesome core files from node_modules to vendor directory
gulp.task('fontawesome', function() { gulp.task('fontawesome', function() {
return gulp.src([ return gulp.src([
'node_modules/font-awesome/**', 'node_modules/font-awesome/**',
@ -78,10 +78,10 @@ gulp.task('fontawesome', function() {
'!node_modules/font-awesome/*.md', '!node_modules/font-awesome/*.md',
'!node_modules/font-awesome/*.json' '!node_modules/font-awesome/*.json'
]) ])
.pipe(gulp.dest('font-awesome')) .pipe(gulp.dest('vendor/font-awesome'))
}) })
// Copy all dependencies from node_modules // Copy all third party dependencies from node_modules to vendor directory
gulp.task('copy', ['bootstrap', 'jquery', 'fontawesome']); gulp.task('copy', ['bootstrap', 'jquery', 'fontawesome']);
// Configure the browserSync task // Configure the browserSync task
@ -102,3 +102,6 @@ gulp.task('dev', ['browserSync', 'less', 'minify-css', 'minify-js'], function()
gulp.watch('*.html', browserSync.reload); gulp.watch('*.html', browserSync.reload);
gulp.watch('js/**/*.js', browserSync.reload); gulp.watch('js/**/*.js', browserSync.reload);
}); });
// Build Task
gulp.task('build', ['less', 'minify-css', 'minify-js', 'copy']);

View File

@ -12,13 +12,13 @@
<title>Agency - Start Bootstrap Theme</title> <title>Agency - Start Bootstrap Theme</title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet"> <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<!-- Theme CSS --> <!-- Theme CSS -->
<link href="css/agency.min.css" rel="stylesheet"> <link href="css/agency.min.css" rel="stylesheet">
<!-- Custom Fonts --> <!-- Custom Fonts -->
<link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"> <link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
<link href='https://fonts.googleapis.com/css?family=Kaushan+Script' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Kaushan+Script' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
@ -36,15 +36,13 @@
<body id="page-top" class="index"> <body id="page-top" class="index">
<!-- Navigation --> <!-- Navigation -->
<nav id="mainNav" class="navbar navbar-default navbar-fixed-top"> <nav id="mainNav" class="navbar navbar-default navbar-custom navbar-fixed-top">
<div class="container"> <div class="container">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll"> <div class="navbar-header page-scroll">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> Menu <i class="fa fa-bars"></i>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand page-scroll" href="#page-top">Start Bootstrap</a> <a class="navbar-brand page-scroll" href="#page-top">Start Bootstrap</a>
</div> </div>
@ -641,10 +639,10 @@
</div> </div>
<!-- jQuery --> <!-- jQuery -->
<script src="js/jquery.js"></script> <script src="vendor/jquery/jquery.min.js"></script>
<!-- Bootstrap Core JavaScript --> <!-- Bootstrap Core JavaScript -->
<script src="js/bootstrap.min.js"></script> <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
<!-- Plugin JavaScript --> <!-- Plugin JavaScript -->
<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"></script> <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"></script>

View File

@ -80,7 +80,7 @@ h1, h2, h3, h4, h5, h6 {
// Custom Navigation Bar // Custom Navigation Bar
.navbar-default { .navbar-custom {
background-color: @gray-darker; background-color: @gray-darker;
border-color: transparent; border-color: transparent;
.navbar-brand { .navbar-brand {
@ -99,9 +99,9 @@ h1, h2, h3, h4, h5, h6 {
.navbar-toggle { .navbar-toggle {
background-color: @theme-primary; background-color: @theme-primary;
border-color: @theme-primary; border-color: @theme-primary;
.icon-bar { .heading-font;
background-color: white; color: white;
} font-size: 12px;
&:hover, &:hover,
&:focus { &:focus {
background-color: @theme-primary; background-color: @theme-primary;
@ -135,7 +135,7 @@ h1, h2, h3, h4, h5, h6 {
} }
@media(min-width:768px) { @media(min-width:768px) {
.navbar-default { .navbar-custom {
background-color: transparent; background-color: transparent;
padding: 25px 0; padding: 25px 0;
-webkit-transition: padding 0.3s; -webkit-transition: padding 0.3s;
@ -157,7 +157,7 @@ h1, h2, h3, h4, h5, h6 {
// Navbar Change on Scroll // Navbar Change on Scroll
@media(min-width:768px) { @media(min-width:768px) {
.navbar-default.affix { .navbar-custom.affix {
background-color: @gray-darker; background-color: @gray-darker;
padding: 10px 0; padding: 10px 0;
.navbar-brand { .navbar-brand {

View File

@ -1,3 +1,5 @@
// Mixins
// Bootstrap Button Variant // Bootstrap Button Variant
.button-variant(@color; @background; @border) { .button-variant(@color; @background; @border) {
@ -38,7 +40,7 @@
} }
} }
// Background Features // Background Cover Mixin
.background-cover() { .background-cover() {
-webkit-background-size: cover; -webkit-background-size: cover;
@ -47,7 +49,7 @@
-o-background-size: cover; -o-background-size: cover;
} }
// Font Selections // Font Mixins
.serif-font() { .serif-font() {
font-family: "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif;

View File

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 106 KiB

View File

Before

Width:  |  Height:  |  Size: 382 KiB

After

Width:  |  Height:  |  Size: 382 KiB