mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
migrating dependencies from bower to npm
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
@import '../../vendors/bootstrap/bootstrap';
|
||||
@import 'skin';
|
||||
@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss';
|
||||
@import '../../../../www/bower_components/jquery-ui/themes/base/jquery.ui.autocomplete'; // not extension for inline import
|
||||
@import '../../../../node_modules/jquery-ui/themes/base/autocomplete'; // not extension for inline import
|
||||
|
||||
$mainMenuBackgroundColor: #3b3b3b;
|
||||
$mainMenuLinkColor: #A6A6A6;
|
||||
|
@@ -1,7 +1,8 @@
|
||||
@import '../../_shared/styles/variables';
|
||||
|
||||
@import '../../vendors/jquery-treeview/jquery.treeview'; // to inline import css file, don't put extension
|
||||
@import '../../../../www/bower_components/jquery-file-upload/css/jquery.fileupload-ui'; // to inline import css file, don't put extension
|
||||
@import '../../../../node_modules/blueimp-file-upload/css/jquery.fileupload-ui';
|
||||
// to inline import css file, don't put extension
|
||||
@import '../../vendors/jquery-contextmenu/styles/jquery.contextmenu';
|
||||
@import '../../_shared/styles/main';
|
||||
|
||||
|
@@ -4,4 +4,4 @@
|
||||
@import '../../account/styles/skin';
|
||||
|
||||
@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss';
|
||||
@import '../../../../www/bower_components/jquery-ui/themes/base/jquery.ui.autocomplete'; // not extension for inline import
|
||||
@import '../../../../node_modules/jquery-ui/themes/base/autocomplete'; // not extension for inline import
|
||||
|
70
resources/www/vendors/bootstrap/bootstrap.scss
vendored
70
resources/www/vendors/bootstrap/bootstrap.scss
vendored
@@ -10,55 +10,57 @@
|
||||
|
||||
// Core variables and mixins
|
||||
@import "variables"; // Modify this for custom colors, font-sizes, etc
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/mixins";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_mixins";
|
||||
|
||||
// CSS Reset
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/reset";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_reset";
|
||||
|
||||
// Grid system and page structure
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/scaffolding";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/grid";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/layouts";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_scaffolding";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_grid";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_layouts";
|
||||
|
||||
// Base CSS
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/type";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/code";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/forms";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/tables";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_type";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_code";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_forms";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_tables";
|
||||
|
||||
// Components: common
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/sprites";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/dropdowns";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/wells";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/component-animations";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/close";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_sprites";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_dropdowns";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_wells";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_component-animations";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_close";
|
||||
|
||||
// Components: Buttons & Alerts
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/buttons";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/button-groups";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_buttons";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_button-groups";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_alerts";
|
||||
// Note: alerts share common CSS with buttons and thus have styles in buttons
|
||||
|
||||
// Components: Nav
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/navs";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/navbar";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/breadcrumbs";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/pagination";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/pager";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_navs";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_navbar";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_breadcrumbs";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_pagination";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_pager";
|
||||
|
||||
// Components: Popovers
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/modals";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/tooltip";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/popovers";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_modals";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_tooltip";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_popovers";
|
||||
|
||||
// Components: Misc
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/thumbnails";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/media";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/labels-badges";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/progress-bars";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/accordion";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/carousel";
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/hero-unit";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_thumbnails";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_media";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_labels-badges";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_progress-bars";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_accordion";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_carousel";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_hero-unit";
|
||||
|
||||
// Utility classes
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/utilities"; // Has to be last to override when necessary
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/responsive-utilities";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_utilities";
|
||||
// Has to be last to override when necessary
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_responsive-utilities";
|
13
resources/www/vendors/bootstrap/responsive.scss
vendored
13
resources/www/vendors/bootstrap/responsive.scss
vendored
@@ -19,30 +19,29 @@
|
||||
// Required since we compile the responsive stuff separately
|
||||
|
||||
@import "variables"; // Modify this for custom colors, font-sizes, etc
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/mixins";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_mixins";
|
||||
|
||||
|
||||
// RESPONSIVE CLASSES
|
||||
// ------------------
|
||||
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/responsive-utilities";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_responsive-utilities";
|
||||
|
||||
|
||||
// MEDIA QUERIES
|
||||
// ------------------
|
||||
|
||||
// Large desktops
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/responsive-1200px-min";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_responsive-1200px-min";
|
||||
|
||||
// Tablets to regular desktops
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/responsive-768px-979px";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_responsive-768px-979px";
|
||||
|
||||
// Phones to portrait tablets and narrow desktops
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/responsive-767px-max";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_responsive-767px-max";
|
||||
|
||||
|
||||
// RESPONSIVE NAVBAR
|
||||
// ------------------
|
||||
|
||||
// From 979px and below, show a button to toggle navbar contents
|
||||
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/responsive-navbar";
|
||||
@import "../../../../node_modules/bootstrap-sass/lib/_responsive-navbar";
|
||||
|
Reference in New Issue
Block a user