mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-16 21:18:19 +01:00
Code Issues Projects Releases Wiki Activity

Move bower_components into vendor. Closes #747

Browse Source
This commit is contained in:
James Brooks 2015-06-19 11:47:38 +01:00
parent 9f528584f0
commit 2579b8a48e
7 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bowerrc
View File

@ -1,4 +1,4 @@
{
"directory": "bower_components",
"directory": "vendor/bower_components",
"interactive": false
}

2
elixir.json
View File

@ -1,5 +1,5 @@
{
"bowerDir": "bower_components",
"bowerDir": "vendor/bower_components",
"cssOutput": "public/dist/css",
"jsOutput": "public/dist/js",
"production": true

30
gulpfile.js
View File

@ -9,26 +9,26 @@ elixir(function (mix) {
.sass('app.scss')
.jshint('resources/assets/js/*.js')
.styles([
'bower_components/ionicons/css/ionicons.css',
'bower_components/jquery-minicolors/jquery.minicolors.css',
'vendor/bower_components/ionicons/css/ionicons.css',
'vendor/bower_components/jquery-minicolors/jquery.minicolors.css',
'public/dist/css/app.css'
], 'public/dist/css/all.css', './')
.scripts([
'bower_components/jquery/dist/jquery.js',
'bower_components/bootstrap-sass/assets/javascripts/bootstrap.js',
'bower_components/moment/min/moment-with-locales.js',
'bower_components/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js',
'bower_components/lodash/dist/lodash.js',
'bower_components/autosize/dest/autosize.js',
'bower_components/messenger/build/js/messenger.js',
'bower_components/Sortable/Sortable.js',
'bower_components/livestampjs/livestamp.js',
'bower_components/jquery-minicolors/jquery.minicolors.js',
'bower_components/jquery-serialize-object/jquery.serialize-object.js',
'bower_components/chartjs/Chart.js',
'vendor/bower_components/jquery/dist/jquery.js',
'vendor/bower_components/bootstrap-sass/assets/javascripts/bootstrap.js',
'vendor/bower_components/moment/min/moment-with-locales.js',
'vendor/bower_components/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js',
'vendor/bower_components/lodash/dist/lodash.js',
'vendor/bower_components/autosize/dest/autosize.js',
'vendor/bower_components/messenger/build/js/messenger.js',
'vendor/bower_components/Sortable/Sortable.js',
'vendor/bower_components/livestampjs/livestamp.js',
'vendor/bower_components/jquery-minicolors/jquery.minicolors.js',
'vendor/bower_components/jquery-serialize-object/jquery.serialize-object.js',
'vendor/bower_components/chartjs/Chart.js',
'resources/assets/js/app.js',
'resources/assets/js/**/*.js'
], 'public/dist/js/all.js', './')
.version(['public/dist/css/all.css', 'public/dist/js/all.js'])
.copy('bower_components/ionicons/fonts/', 'public/fonts/');
.copy('vendor/bower_components/ionicons/fonts/', 'public/fonts/');
});

2
resources/assets/sass/app.scss
View File

@ -1,7 +1,7 @@
@import "palette";
$ionicons-font-path: "../../../fonts" !default;
@import "./bower_components/ionicons/scss/ionicons";
@import "./vendor/bower_components/ionicons/scss/ionicons";
@import "modules/bootstrap";

76
resources/assets/sass/modules/_bootstrap.scss
View File

@ -2,51 +2,51 @@
@import "variables";
// Core variables and mixins
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/variables";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/mixins";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/variables";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/mixins";
// Reset and dependencies
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/normalize";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/print";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/normalize";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/print";
// Core CSS
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/type";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/code";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/grid";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/tables";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/forms";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/buttons";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/type";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/code";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/grid";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/tables";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/forms";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/buttons";
// Components
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/component-animations";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/dropdowns";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/button-groups";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/input-groups";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/navs";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/navbar";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/pagination";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/pager";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/labels";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/badges";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/jumbotron";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/thumbnails";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/alerts";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/progress-bars";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/media";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/list-group";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/panels";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/wells";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/close";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/component-animations";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/dropdowns";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/button-groups";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/input-groups";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/navs";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/navbar";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/pagination";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/pager";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/labels";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/badges";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/jumbotron";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/thumbnails";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/alerts";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/progress-bars";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/media";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/list-group";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/panels";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/wells";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/close";
// Components w/ JavaScript
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/modals";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/tooltip";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/popovers";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/carousel";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/modals";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/tooltip";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/popovers";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/carousel";
// Utility classes
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/utilities";
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/utilities";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";

2
resources/assets/sass/plugins/_animate.scss
View File

@ -1,4 +1,4 @@
@import "./bower_components/animate-sass/animate";
@import "./vendor/bower_components/animate-sass/animate";
body {
-webkit-backface-visibility: hidden; // Addresses a small issue in webkit: http://bit.ly/NEdoDq

2
resources/assets/sass/plugins/bootstrap-datetimepicker/bootstrap-datetimepicker.scss vendored
View File

@ -1,5 +1,5 @@
// Import boostrap variables including default color palette and fonts
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/_variables";
@import "./vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap/_variables";
.bootstrap-datetimepicker-widget {
list-style: none;