From 58983bf1920a45a5aacdd63eb615c012b1c8f83d Mon Sep 17 00:00:00 2001 From: Gabriel Hurley Date: Wed, 25 Jul 2012 16:27:39 -0700 Subject: [PATCH] Moves bootstrap LESS back to openstack_dashboard. Moving the entire bootstrap dir into the horizon module caused some unexpected complexities. For the time being, javascript will go into Horizon while CSS/LESS will go into OpenStack Dashboard. Change-Id: Ief3a48f2124667e936312f818baeddb6c7c290dc --- .../bootstrap/img/glyphicons-halflings-white.png | Bin .../static/bootstrap/img/glyphicons-halflings.png | Bin .../static/bootstrap/less/accordion.less | 0 .../static/bootstrap/less/alerts.less | 0 .../static/bootstrap/less/bootstrap.less | 0 .../static/bootstrap/less/breadcrumbs.less | 0 .../static/bootstrap/less/button-groups.less | 0 .../static/bootstrap/less/buttons.less | 0 .../static/bootstrap/less/carousel.less | 0 .../static/bootstrap/less/close.less | 0 .../static/bootstrap/less/code.less | 0 .../static/bootstrap/less/component-animations.less | 0 .../static/bootstrap/less/dropdowns.less | 0 .../static/bootstrap/less/forms.less | 0 .../static/bootstrap/less/grid.less | 0 .../static/bootstrap/less/hero-unit.less | 0 .../static/bootstrap/less/labels.less | 0 .../static/bootstrap/less/layouts.less | 0 .../static/bootstrap/less/mixins.less | 0 .../static/bootstrap/less/modals.less | 0 .../static/bootstrap/less/navbar.less | 0 .../static/bootstrap/less/navs.less | 0 .../static/bootstrap/less/pager.less | 0 .../static/bootstrap/less/pagination.less | 0 .../static/bootstrap/less/popovers.less | 0 .../static/bootstrap/less/progress-bars.less | 0 .../static/bootstrap/less/reset.less | 0 .../static/bootstrap/less/responsive.less | 0 .../static/bootstrap/less/scaffolding.less | 0 .../static/bootstrap/less/sprites.less | 0 .../static/bootstrap/less/tables.less | 0 .../static/bootstrap/less/thumbnails.less | 0 .../static/bootstrap/less/tooltip.less | 0 .../static/bootstrap/less/type.less | 0 .../static/bootstrap/less/utilities.less | 0 .../static/bootstrap/less/variables.less | 0 .../static/bootstrap/less/wells.less | 0 .../static/dashboard/less/horizon.less | 2 +- 38 files changed, 1 insertion(+), 1 deletion(-) rename {horizon => openstack_dashboard}/static/bootstrap/img/glyphicons-halflings-white.png (100%) rename {horizon => openstack_dashboard}/static/bootstrap/img/glyphicons-halflings.png (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/accordion.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/alerts.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/bootstrap.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/breadcrumbs.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/button-groups.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/buttons.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/carousel.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/close.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/code.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/component-animations.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/dropdowns.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/forms.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/grid.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/hero-unit.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/labels.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/layouts.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/mixins.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/modals.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/navbar.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/navs.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/pager.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/pagination.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/popovers.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/progress-bars.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/reset.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/responsive.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/scaffolding.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/sprites.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/tables.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/thumbnails.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/tooltip.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/type.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/utilities.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/variables.less (100%) rename {horizon => openstack_dashboard}/static/bootstrap/less/wells.less (100%) diff --git a/horizon/static/bootstrap/img/glyphicons-halflings-white.png b/openstack_dashboard/static/bootstrap/img/glyphicons-halflings-white.png similarity index 100% rename from horizon/static/bootstrap/img/glyphicons-halflings-white.png rename to openstack_dashboard/static/bootstrap/img/glyphicons-halflings-white.png diff --git a/horizon/static/bootstrap/img/glyphicons-halflings.png b/openstack_dashboard/static/bootstrap/img/glyphicons-halflings.png similarity index 100% rename from horizon/static/bootstrap/img/glyphicons-halflings.png rename to openstack_dashboard/static/bootstrap/img/glyphicons-halflings.png diff --git a/horizon/static/bootstrap/less/accordion.less b/openstack_dashboard/static/bootstrap/less/accordion.less similarity index 100% rename from horizon/static/bootstrap/less/accordion.less rename to openstack_dashboard/static/bootstrap/less/accordion.less diff --git a/horizon/static/bootstrap/less/alerts.less b/openstack_dashboard/static/bootstrap/less/alerts.less similarity index 100% rename from horizon/static/bootstrap/less/alerts.less rename to openstack_dashboard/static/bootstrap/less/alerts.less diff --git a/horizon/static/bootstrap/less/bootstrap.less b/openstack_dashboard/static/bootstrap/less/bootstrap.less similarity index 100% rename from horizon/static/bootstrap/less/bootstrap.less rename to openstack_dashboard/static/bootstrap/less/bootstrap.less diff --git a/horizon/static/bootstrap/less/breadcrumbs.less b/openstack_dashboard/static/bootstrap/less/breadcrumbs.less similarity index 100% rename from horizon/static/bootstrap/less/breadcrumbs.less rename to openstack_dashboard/static/bootstrap/less/breadcrumbs.less diff --git a/horizon/static/bootstrap/less/button-groups.less b/openstack_dashboard/static/bootstrap/less/button-groups.less similarity index 100% rename from horizon/static/bootstrap/less/button-groups.less rename to openstack_dashboard/static/bootstrap/less/button-groups.less diff --git a/horizon/static/bootstrap/less/buttons.less b/openstack_dashboard/static/bootstrap/less/buttons.less similarity index 100% rename from horizon/static/bootstrap/less/buttons.less rename to openstack_dashboard/static/bootstrap/less/buttons.less diff --git a/horizon/static/bootstrap/less/carousel.less b/openstack_dashboard/static/bootstrap/less/carousel.less similarity index 100% rename from horizon/static/bootstrap/less/carousel.less rename to openstack_dashboard/static/bootstrap/less/carousel.less diff --git a/horizon/static/bootstrap/less/close.less b/openstack_dashboard/static/bootstrap/less/close.less similarity index 100% rename from horizon/static/bootstrap/less/close.less rename to openstack_dashboard/static/bootstrap/less/close.less diff --git a/horizon/static/bootstrap/less/code.less b/openstack_dashboard/static/bootstrap/less/code.less similarity index 100% rename from horizon/static/bootstrap/less/code.less rename to openstack_dashboard/static/bootstrap/less/code.less diff --git a/horizon/static/bootstrap/less/component-animations.less b/openstack_dashboard/static/bootstrap/less/component-animations.less similarity index 100% rename from horizon/static/bootstrap/less/component-animations.less rename to openstack_dashboard/static/bootstrap/less/component-animations.less diff --git a/horizon/static/bootstrap/less/dropdowns.less b/openstack_dashboard/static/bootstrap/less/dropdowns.less similarity index 100% rename from horizon/static/bootstrap/less/dropdowns.less rename to openstack_dashboard/static/bootstrap/less/dropdowns.less diff --git a/horizon/static/bootstrap/less/forms.less b/openstack_dashboard/static/bootstrap/less/forms.less similarity index 100% rename from horizon/static/bootstrap/less/forms.less rename to openstack_dashboard/static/bootstrap/less/forms.less diff --git a/horizon/static/bootstrap/less/grid.less b/openstack_dashboard/static/bootstrap/less/grid.less similarity index 100% rename from horizon/static/bootstrap/less/grid.less rename to openstack_dashboard/static/bootstrap/less/grid.less diff --git a/horizon/static/bootstrap/less/hero-unit.less b/openstack_dashboard/static/bootstrap/less/hero-unit.less similarity index 100% rename from horizon/static/bootstrap/less/hero-unit.less rename to openstack_dashboard/static/bootstrap/less/hero-unit.less diff --git a/horizon/static/bootstrap/less/labels.less b/openstack_dashboard/static/bootstrap/less/labels.less similarity index 100% rename from horizon/static/bootstrap/less/labels.less rename to openstack_dashboard/static/bootstrap/less/labels.less diff --git a/horizon/static/bootstrap/less/layouts.less b/openstack_dashboard/static/bootstrap/less/layouts.less similarity index 100% rename from horizon/static/bootstrap/less/layouts.less rename to openstack_dashboard/static/bootstrap/less/layouts.less diff --git a/horizon/static/bootstrap/less/mixins.less b/openstack_dashboard/static/bootstrap/less/mixins.less similarity index 100% rename from horizon/static/bootstrap/less/mixins.less rename to openstack_dashboard/static/bootstrap/less/mixins.less diff --git a/horizon/static/bootstrap/less/modals.less b/openstack_dashboard/static/bootstrap/less/modals.less similarity index 100% rename from horizon/static/bootstrap/less/modals.less rename to openstack_dashboard/static/bootstrap/less/modals.less diff --git a/horizon/static/bootstrap/less/navbar.less b/openstack_dashboard/static/bootstrap/less/navbar.less similarity index 100% rename from horizon/static/bootstrap/less/navbar.less rename to openstack_dashboard/static/bootstrap/less/navbar.less diff --git a/horizon/static/bootstrap/less/navs.less b/openstack_dashboard/static/bootstrap/less/navs.less similarity index 100% rename from horizon/static/bootstrap/less/navs.less rename to openstack_dashboard/static/bootstrap/less/navs.less diff --git a/horizon/static/bootstrap/less/pager.less b/openstack_dashboard/static/bootstrap/less/pager.less similarity index 100% rename from horizon/static/bootstrap/less/pager.less rename to openstack_dashboard/static/bootstrap/less/pager.less diff --git a/horizon/static/bootstrap/less/pagination.less b/openstack_dashboard/static/bootstrap/less/pagination.less similarity index 100% rename from horizon/static/bootstrap/less/pagination.less rename to openstack_dashboard/static/bootstrap/less/pagination.less diff --git a/horizon/static/bootstrap/less/popovers.less b/openstack_dashboard/static/bootstrap/less/popovers.less similarity index 100% rename from horizon/static/bootstrap/less/popovers.less rename to openstack_dashboard/static/bootstrap/less/popovers.less diff --git a/horizon/static/bootstrap/less/progress-bars.less b/openstack_dashboard/static/bootstrap/less/progress-bars.less similarity index 100% rename from horizon/static/bootstrap/less/progress-bars.less rename to openstack_dashboard/static/bootstrap/less/progress-bars.less diff --git a/horizon/static/bootstrap/less/reset.less b/openstack_dashboard/static/bootstrap/less/reset.less similarity index 100% rename from horizon/static/bootstrap/less/reset.less rename to openstack_dashboard/static/bootstrap/less/reset.less diff --git a/horizon/static/bootstrap/less/responsive.less b/openstack_dashboard/static/bootstrap/less/responsive.less similarity index 100% rename from horizon/static/bootstrap/less/responsive.less rename to openstack_dashboard/static/bootstrap/less/responsive.less diff --git a/horizon/static/bootstrap/less/scaffolding.less b/openstack_dashboard/static/bootstrap/less/scaffolding.less similarity index 100% rename from horizon/static/bootstrap/less/scaffolding.less rename to openstack_dashboard/static/bootstrap/less/scaffolding.less diff --git a/horizon/static/bootstrap/less/sprites.less b/openstack_dashboard/static/bootstrap/less/sprites.less similarity index 100% rename from horizon/static/bootstrap/less/sprites.less rename to openstack_dashboard/static/bootstrap/less/sprites.less diff --git a/horizon/static/bootstrap/less/tables.less b/openstack_dashboard/static/bootstrap/less/tables.less similarity index 100% rename from horizon/static/bootstrap/less/tables.less rename to openstack_dashboard/static/bootstrap/less/tables.less diff --git a/horizon/static/bootstrap/less/thumbnails.less b/openstack_dashboard/static/bootstrap/less/thumbnails.less similarity index 100% rename from horizon/static/bootstrap/less/thumbnails.less rename to openstack_dashboard/static/bootstrap/less/thumbnails.less diff --git a/horizon/static/bootstrap/less/tooltip.less b/openstack_dashboard/static/bootstrap/less/tooltip.less similarity index 100% rename from horizon/static/bootstrap/less/tooltip.less rename to openstack_dashboard/static/bootstrap/less/tooltip.less diff --git a/horizon/static/bootstrap/less/type.less b/openstack_dashboard/static/bootstrap/less/type.less similarity index 100% rename from horizon/static/bootstrap/less/type.less rename to openstack_dashboard/static/bootstrap/less/type.less diff --git a/horizon/static/bootstrap/less/utilities.less b/openstack_dashboard/static/bootstrap/less/utilities.less similarity index 100% rename from horizon/static/bootstrap/less/utilities.less rename to openstack_dashboard/static/bootstrap/less/utilities.less diff --git a/horizon/static/bootstrap/less/variables.less b/openstack_dashboard/static/bootstrap/less/variables.less similarity index 100% rename from horizon/static/bootstrap/less/variables.less rename to openstack_dashboard/static/bootstrap/less/variables.less diff --git a/horizon/static/bootstrap/less/wells.less b/openstack_dashboard/static/bootstrap/less/wells.less similarity index 100% rename from horizon/static/bootstrap/less/wells.less rename to openstack_dashboard/static/bootstrap/less/wells.less diff --git a/openstack_dashboard/static/dashboard/less/horizon.less b/openstack_dashboard/static/dashboard/less/horizon.less index 32a42577c6..08b1ff75e0 100644 --- a/openstack_dashboard/static/dashboard/less/horizon.less +++ b/openstack_dashboard/static/dashboard/less/horizon.less @@ -1,4 +1,4 @@ -@import "../../../../horizon/static/bootstrap/less/bootstrap.less"; +@import "../../bootstrap/less/bootstrap.less"; /* new clearfix */ .clearfix:after {