diff --git a/static/images/Armitagep_manhattan.png b/client/galaxy/images/Armitagep_manhattan.png similarity index 100% rename from static/images/Armitagep_manhattan.png rename to client/galaxy/images/Armitagep_manhattan.png diff --git a/static/images/Armitagep_qqplot.png b/client/galaxy/images/Armitagep_qqplot.png similarity index 100% rename from static/images/Armitagep_qqplot.png rename to client/galaxy/images/Armitagep_qqplot.png diff --git a/static/images/add_icon.png b/client/galaxy/images/add_icon.png similarity index 100% rename from static/images/add_icon.png rename to client/galaxy/images/add_icon.png diff --git a/static/images/add_icon_dark.png b/client/galaxy/images/add_icon_dark.png similarity index 100% rename from static/images/add_icon_dark.png rename to client/galaxy/images/add_icon_dark.png diff --git a/static/images/aggregate_history1.png b/client/galaxy/images/aggregate_history1.png similarity index 100% rename from static/images/aggregate_history1.png rename to client/galaxy/images/aggregate_history1.png diff --git a/static/images/aggregate_history2.png b/client/galaxy/images/aggregate_history2.png similarity index 100% rename from static/images/aggregate_history2.png rename to client/galaxy/images/aggregate_history2.png diff --git a/static/images/bar_chart.png b/client/galaxy/images/bar_chart.png similarity index 100% rename from static/images/bar_chart.png rename to client/galaxy/images/bar_chart.png diff --git a/static/style/blue/base_bg.png b/client/galaxy/images/base_bg.png similarity index 100% rename from static/style/blue/base_bg.png rename to client/galaxy/images/base_bg.png diff --git a/static/images/bed_warn.png b/client/galaxy/images/bed_warn.png similarity index 100% rename from static/images/bed_warn.png rename to client/galaxy/images/bed_warn.png diff --git a/static/style/blue/button_bar_bg_light.png b/client/galaxy/images/button_bar_bg_light.png similarity index 100% rename from static/style/blue/button_bar_bg_light.png rename to client/galaxy/images/button_bar_bg_light.png diff --git a/static/images/closebox.png b/client/galaxy/images/closebox.png similarity index 100% rename from static/images/closebox.png rename to client/galaxy/images/closebox.png diff --git a/static/images/dat_points_table_brows_1.png b/client/galaxy/images/dat_points_table_brows_1.png similarity index 100% rename from static/images/dat_points_table_brows_1.png rename to client/galaxy/images/dat_points_table_brows_1.png diff --git a/static/style/blue/data_empty.png b/client/galaxy/images/data_empty.png similarity index 100% rename from static/style/blue/data_empty.png rename to client/galaxy/images/data_empty.png diff --git a/static/style/blue/data_error.png b/client/galaxy/images/data_error.png similarity index 100% rename from static/style/blue/data_error.png rename to client/galaxy/images/data_error.png diff --git a/static/style/blue/data_ok.png b/client/galaxy/images/data_ok.png similarity index 100% rename from static/style/blue/data_ok.png rename to client/galaxy/images/data_ok.png diff --git a/static/style/blue/data_queued.png b/client/galaxy/images/data_queued.png similarity index 100% rename from static/style/blue/data_queued.png rename to client/galaxy/images/data_queued.png diff --git a/static/style/shared_images/data_running.gif b/client/galaxy/images/data_running.gif similarity index 100% rename from static/style/shared_images/data_running.gif rename to client/galaxy/images/data_running.gif diff --git a/static/images/ddarrowsplit.png b/client/galaxy/images/ddarrowsplit.png similarity index 100% rename from static/images/ddarrowsplit.png rename to client/galaxy/images/ddarrowsplit.png diff --git a/static/images/delete_tag_icon_gray.png b/client/galaxy/images/delete_tag_icon_gray.png similarity index 100% rename from static/images/delete_tag_icon_gray.png rename to client/galaxy/images/delete_tag_icon_gray.png diff --git a/static/images/delete_tag_icon_white.png b/client/galaxy/images/delete_tag_icon_white.png similarity index 100% rename from static/images/delete_tag_icon_white.png rename to client/galaxy/images/delete_tag_icon_white.png diff --git a/static/images/documents-stack-faded.png b/client/galaxy/images/documents-stack-faded.png similarity index 100% rename from static/images/documents-stack-faded.png rename to client/galaxy/images/documents-stack-faded.png diff --git a/static/images/documents-stack.png b/client/galaxy/images/documents-stack.png similarity index 100% rename from static/images/documents-stack.png rename to client/galaxy/images/documents-stack.png diff --git a/static/style/blue/done_message_icon.png b/client/galaxy/images/done_message_icon.png similarity index 100% rename from static/style/blue/done_message_icon.png rename to client/galaxy/images/done_message_icon.png diff --git a/static/images/dropdownarrow.png b/client/galaxy/images/dropdownarrow.png similarity index 100% rename from static/images/dropdownarrow.png rename to client/galaxy/images/dropdownarrow.png diff --git a/static/style/blue/error_bg.png b/client/galaxy/images/error_bg.png similarity index 100% rename from static/style/blue/error_bg.png rename to client/galaxy/images/error_bg.png diff --git a/static/style/blue/error_large.png b/client/galaxy/images/error_large.png similarity index 100% rename from static/style/blue/error_large.png rename to client/galaxy/images/error_large.png diff --git a/static/style/blue/error_message_icon.png b/client/galaxy/images/error_message_icon.png similarity index 100% rename from static/style/blue/error_message_icon.png rename to client/galaxy/images/error_message_icon.png diff --git a/static/style/blue/error_small.png b/client/galaxy/images/error_small.png similarity index 100% rename from static/style/blue/error_small.png rename to client/galaxy/images/error_small.png diff --git a/static/images/fetchTax.png b/client/galaxy/images/fetchTax.png similarity index 100% rename from static/images/fetchTax.png rename to client/galaxy/images/fetchTax.png diff --git a/static/style/blue/footer_title_bg.png b/client/galaxy/images/footer_title_bg.png similarity index 100% rename from static/style/blue/footer_title_bg.png rename to client/galaxy/images/footer_title_bg.png diff --git a/static/style/blue/form_body_bg.png b/client/galaxy/images/form_body_bg.png similarity index 100% rename from static/style/blue/form_body_bg.png rename to client/galaxy/images/form_body_bg.png diff --git a/static/style/blue/form_title_bg.png b/client/galaxy/images/form_title_bg.png similarity index 100% rename from static/style/blue/form_title_bg.png rename to client/galaxy/images/form_title_bg.png diff --git a/static/style/blue/fugue.png b/client/galaxy/images/fugue.png similarity index 100% rename from static/style/blue/fugue.png rename to client/galaxy/images/fugue.png diff --git a/static/images/galaxyIcon_noText.png b/client/galaxy/images/galaxyIcon_noText.png similarity index 100% rename from static/images/galaxyIcon_noText.png rename to client/galaxy/images/galaxyIcon_noText.png diff --git a/static/style/blue/gray_bg.png b/client/galaxy/images/gray_bg.png similarity index 100% rename from static/style/blue/gray_bg.png rename to client/galaxy/images/gray_bg.png diff --git a/static/images/hatch-023858.png b/client/galaxy/images/hatch-023858.png similarity index 100% rename from static/images/hatch-023858.png rename to client/galaxy/images/hatch-023858.png diff --git a/static/style/blue/hgrad.png b/client/galaxy/images/hgrad.png similarity index 100% rename from static/style/blue/hgrad.png rename to client/galaxy/images/hgrad.png diff --git a/static/style/blue/hgrad_over.png b/client/galaxy/images/hgrad_over.png similarity index 100% rename from static/style/blue/hgrad_over.png rename to client/galaxy/images/hgrad_over.png diff --git a/static/images/histogram.png b/client/galaxy/images/histogram.png similarity index 100% rename from static/images/histogram.png rename to client/galaxy/images/histogram.png diff --git a/static/images/histogram2.png b/client/galaxy/images/histogram2.png similarity index 100% rename from static/images/histogram2.png rename to client/galaxy/images/histogram2.png diff --git a/static/style/blue/history-buttons.png b/client/galaxy/images/history-buttons.png similarity index 100% rename from static/style/blue/history-buttons.png rename to client/galaxy/images/history-buttons.png diff --git a/static/style/blue/history-states.png b/client/galaxy/images/history-states.png similarity index 100% rename from static/style/blue/history-states.png rename to client/galaxy/images/history-states.png diff --git a/static/style/blue/info_large.png b/client/galaxy/images/info_large.png similarity index 100% rename from static/style/blue/info_large.png rename to client/galaxy/images/info_large.png diff --git a/static/style/blue/info_message_icon.png b/client/galaxy/images/info_message_icon.png similarity index 100% rename from static/style/blue/info_message_icon.png rename to client/galaxy/images/info_message_icon.png diff --git a/static/style/blue/info_small.png b/client/galaxy/images/info_small.png similarity index 100% rename from static/style/blue/info_small.png rename to client/galaxy/images/info_small.png diff --git a/static/images/jstree/32px.png b/client/galaxy/images/jstree/32px.png similarity index 100% rename from static/images/jstree/32px.png rename to client/galaxy/images/jstree/32px.png diff --git a/static/images/jstree/40px.png b/client/galaxy/images/jstree/40px.png similarity index 100% rename from static/images/jstree/40px.png rename to client/galaxy/images/jstree/40px.png diff --git a/static/images/jstree/throbber.gif b/client/galaxy/images/jstree/throbber.gif similarity index 100% rename from static/images/jstree/throbber.gif rename to client/galaxy/images/jstree/throbber.gif diff --git a/static/images/kendall.png b/client/galaxy/images/kendall.png similarity index 100% rename from static/images/kendall.png rename to client/galaxy/images/kendall.png diff --git a/static/style/blue/largespinner.gif b/client/galaxy/images/largespinner.gif similarity index 100% rename from static/style/blue/largespinner.gif rename to client/galaxy/images/largespinner.gif diff --git a/static/style/blue/layout_callout_top.png b/client/galaxy/images/layout_callout_top.png similarity index 100% rename from static/style/blue/layout_callout_top.png rename to client/galaxy/images/layout_callout_top.png diff --git a/static/images/mag_glass.png b/client/galaxy/images/mag_glass.png similarity index 100% rename from static/images/mag_glass.png rename to client/galaxy/images/mag_glass.png diff --git a/static/style/blue/masthead_bg.png b/client/galaxy/images/masthead_bg.png similarity index 100% rename from static/style/blue/masthead_bg.png rename to client/galaxy/images/masthead_bg.png diff --git a/static/style/blue/menu_bg.png b/client/galaxy/images/menu_bg.png similarity index 100% rename from static/style/blue/menu_bg.png rename to client/galaxy/images/menu_bg.png diff --git a/static/images/mutation_visualization_example.png b/client/galaxy/images/mutation_visualization_example.png similarity index 100% rename from static/images/mutation_visualization_example.png rename to client/galaxy/images/mutation_visualization_example.png diff --git a/static/style/blue/ok_bg.png b/client/galaxy/images/ok_bg.png similarity index 100% rename from static/style/blue/ok_bg.png rename to client/galaxy/images/ok_bg.png diff --git a/static/style/blue/ok_large.png b/client/galaxy/images/ok_large.png similarity index 100% rename from static/style/blue/ok_large.png rename to client/galaxy/images/ok_large.png diff --git a/static/style/blue/ok_small.png b/client/galaxy/images/ok_small.png similarity index 100% rename from static/style/blue/ok_small.png rename to client/galaxy/images/ok_small.png diff --git a/static/images/overview_arrows.png b/client/galaxy/images/overview_arrows.png similarity index 100% rename from static/images/overview_arrows.png rename to client/galaxy/images/overview_arrows.png diff --git a/static/style/blue/panel_header_bg.png b/client/galaxy/images/panel_header_bg.png similarity index 100% rename from static/style/blue/panel_header_bg.png rename to client/galaxy/images/panel_header_bg.png diff --git a/static/images/pearson.png b/client/galaxy/images/pearson.png similarity index 100% rename from static/images/pearson.png rename to client/galaxy/images/pearson.png diff --git a/static/style/blue/popupmenu_callout_top.png b/client/galaxy/images/popupmenu_callout_top.png similarity index 100% rename from static/style/blue/popupmenu_callout_top.png rename to client/galaxy/images/popupmenu_callout_top.png diff --git a/static/style/blue/question-balloon.png b/client/galaxy/images/question-balloon.png similarity index 100% rename from static/style/blue/question-balloon.png rename to client/galaxy/images/question-balloon.png diff --git a/static/style/blue/question-octagon-frame.png b/client/galaxy/images/question-octagon-frame.png similarity index 100% rename from static/style/blue/question-octagon-frame.png rename to client/galaxy/images/question-octagon-frame.png diff --git a/static/images/resizable.png b/client/galaxy/images/resizable.png similarity index 100% rename from static/images/resizable.png rename to client/galaxy/images/resizable.png diff --git a/static/images/scatter.png b/client/galaxy/images/scatter.png similarity index 100% rename from static/images/scatter.png rename to client/galaxy/images/scatter.png diff --git a/static/images/scatterplot.png b/client/galaxy/images/scatterplot.png similarity index 100% rename from static/images/scatterplot.png rename to client/galaxy/images/scatterplot.png diff --git a/static/images/select2-spinner.gif b/client/galaxy/images/select2-spinner.gif similarity index 100% rename from static/images/select2-spinner.gif rename to client/galaxy/images/select2-spinner.gif diff --git a/static/images/select2.png b/client/galaxy/images/select2.png similarity index 100% rename from static/images/select2.png rename to client/galaxy/images/select2.png diff --git a/static/images/select2x2.png b/client/galaxy/images/select2x2.png similarity index 100% rename from static/images/select2x2.png rename to client/galaxy/images/select2x2.png diff --git a/static/images/silk/add.png b/client/galaxy/images/silk/add.png similarity index 100% rename from static/images/silk/add.png rename to client/galaxy/images/silk/add.png diff --git a/static/images/silk/book.png b/client/galaxy/images/silk/book.png similarity index 100% rename from static/images/silk/book.png rename to client/galaxy/images/silk/book.png diff --git a/static/images/silk/book_open.png b/client/galaxy/images/silk/book_open.png similarity index 100% rename from static/images/silk/book_open.png rename to client/galaxy/images/silk/book_open.png diff --git a/static/images/silk/chart_curve.png b/client/galaxy/images/silk/chart_curve.png similarity index 100% rename from static/images/silk/chart_curve.png rename to client/galaxy/images/silk/chart_curve.png diff --git a/static/images/silk/folder.png b/client/galaxy/images/silk/folder.png similarity index 100% rename from static/images/silk/folder.png rename to client/galaxy/images/silk/folder.png diff --git a/static/images/silk/folder_page.png b/client/galaxy/images/silk/folder_page.png similarity index 100% rename from static/images/silk/folder_page.png rename to client/galaxy/images/silk/folder_page.png diff --git a/static/images/silk/link.png b/client/galaxy/images/silk/link.png similarity index 100% rename from static/images/silk/link.png rename to client/galaxy/images/silk/link.png diff --git a/static/images/silk/link_break.png b/client/galaxy/images/silk/link_break.png similarity index 100% rename from static/images/silk/link_break.png rename to client/galaxy/images/silk/link_break.png diff --git a/static/images/silk/page_white.png b/client/galaxy/images/silk/page_white.png similarity index 100% rename from static/images/silk/page_white.png rename to client/galaxy/images/silk/page_white.png diff --git a/static/images/silk/page_white_compressed.png b/client/galaxy/images/silk/page_white_compressed.png similarity index 100% rename from static/images/silk/page_white_compressed.png rename to client/galaxy/images/silk/page_white_compressed.png diff --git a/static/images/silk/resultset_bottom.png b/client/galaxy/images/silk/resultset_bottom.png similarity index 100% rename from static/images/silk/resultset_bottom.png rename to client/galaxy/images/silk/resultset_bottom.png diff --git a/static/images/silk/resultset_next.png b/client/galaxy/images/silk/resultset_next.png similarity index 100% rename from static/images/silk/resultset_next.png rename to client/galaxy/images/silk/resultset_next.png diff --git a/static/images/silk/resultset_previous.png b/client/galaxy/images/silk/resultset_previous.png similarity index 100% rename from static/images/silk/resultset_previous.png rename to client/galaxy/images/silk/resultset_previous.png diff --git a/static/images/solid_qual.png b/client/galaxy/images/solid_qual.png similarity index 100% rename from static/images/solid_qual.png rename to client/galaxy/images/solid_qual.png diff --git a/static/images/spearman.png b/client/galaxy/images/spearman.png similarity index 100% rename from static/images/spearman.png rename to client/galaxy/images/spearman.png diff --git a/client/galaxy/images/sprite-fugue.png b/client/galaxy/images/sprite-fugue.png new file mode 100644 index 00000000000..c3a670a9133 Binary files /dev/null and b/client/galaxy/images/sprite-fugue.png differ diff --git a/client/galaxy/images/sprite-history-buttons.png b/client/galaxy/images/sprite-history-buttons.png new file mode 100644 index 00000000000..729156e9cf4 Binary files /dev/null and b/client/galaxy/images/sprite-history-buttons.png differ diff --git a/client/galaxy/images/sprite-history-states.png b/client/galaxy/images/sprite-history-states.png new file mode 100644 index 00000000000..36eff805eb0 Binary files /dev/null and b/client/galaxy/images/sprite-history-states.png differ diff --git a/static/images/thumbtack_icon.png b/client/galaxy/images/thumbtack_icon.png similarity index 100% rename from static/images/thumbtack_icon.png rename to client/galaxy/images/thumbtack_icon.png diff --git a/static/images/thumbtack_icon_dark.png b/client/galaxy/images/thumbtack_icon_dark.png similarity index 100% rename from static/images/thumbtack_icon_dark.png rename to client/galaxy/images/thumbtack_icon_dark.png diff --git a/static/style/blue/tiny_arrow_left.png b/client/galaxy/images/tiny_arrow_left.png similarity index 100% rename from static/style/blue/tiny_arrow_left.png rename to client/galaxy/images/tiny_arrow_left.png diff --git a/static/style/blue/tiny_arrow_right.png b/client/galaxy/images/tiny_arrow_right.png similarity index 100% rename from static/style/blue/tiny_arrow_right.png rename to client/galaxy/images/tiny_arrow_right.png diff --git a/static/images/visualization/draggable_horizontal.png b/client/galaxy/images/visualization/draggable_horizontal.png similarity index 100% rename from static/images/visualization/draggable_horizontal.png rename to client/galaxy/images/visualization/draggable_horizontal.png diff --git a/static/images/visualization/draggable_vertical.png b/client/galaxy/images/visualization/draggable_vertical.png similarity index 100% rename from static/images/visualization/draggable_vertical.png rename to client/galaxy/images/visualization/draggable_vertical.png diff --git a/static/images/visualization/strand_left.png b/client/galaxy/images/visualization/strand_left.png similarity index 100% rename from static/images/visualization/strand_left.png rename to client/galaxy/images/visualization/strand_left.png diff --git a/static/images/visualization/strand_left_inv.png b/client/galaxy/images/visualization/strand_left_inv.png similarity index 100% rename from static/images/visualization/strand_left_inv.png rename to client/galaxy/images/visualization/strand_left_inv.png diff --git a/static/images/visualization/strand_right.png b/client/galaxy/images/visualization/strand_right.png similarity index 100% rename from static/images/visualization/strand_right.png rename to client/galaxy/images/visualization/strand_right.png diff --git a/static/images/visualization/strand_right_inv.png b/client/galaxy/images/visualization/strand_right_inv.png similarity index 100% rename from static/images/visualization/strand_right_inv.png rename to client/galaxy/images/visualization/strand_right_inv.png diff --git a/static/style/blue/wait_large.png b/client/galaxy/images/wait_large.png similarity index 100% rename from static/style/blue/wait_large.png rename to client/galaxy/images/wait_large.png diff --git a/static/style/blue/wait_small.png b/client/galaxy/images/wait_small.png similarity index 100% rename from static/style/blue/wait_small.png rename to client/galaxy/images/wait_small.png diff --git a/static/style/blue/warn_bg.png b/client/galaxy/images/warn_bg.png similarity index 100% rename from static/style/blue/warn_bg.png rename to client/galaxy/images/warn_bg.png diff --git a/static/style/blue/warn_large.png b/client/galaxy/images/warn_large.png similarity index 100% rename from static/style/blue/warn_large.png rename to client/galaxy/images/warn_large.png diff --git a/static/style/blue/warn_message_icon.png b/client/galaxy/images/warn_message_icon.png similarity index 100% rename from static/style/blue/warn_message_icon.png rename to client/galaxy/images/warn_message_icon.png diff --git a/static/style/blue/warn_small.png b/client/galaxy/images/warn_small.png similarity index 100% rename from static/style/blue/warn_small.png rename to client/galaxy/images/warn_small.png diff --git a/static/style/blue/workflow_circle_drag.png b/client/galaxy/images/workflow_circle_drag.png similarity index 100% rename from static/style/blue/workflow_circle_drag.png rename to client/galaxy/images/workflow_circle_drag.png diff --git a/static/style/blue/workflow_circle_green.png b/client/galaxy/images/workflow_circle_green.png similarity index 100% rename from static/style/blue/workflow_circle_green.png rename to client/galaxy/images/workflow_circle_green.png diff --git a/static/style/blue/workflow_circle_open.png b/client/galaxy/images/workflow_circle_open.png similarity index 100% rename from static/style/blue/workflow_circle_open.png rename to client/galaxy/images/workflow_circle_open.png diff --git a/client/galaxy/scripts/onload.js b/client/galaxy/scripts/onload.js index 38494e11ac5..088549ff09c 100644 --- a/client/galaxy/scripts/onload.js +++ b/client/galaxy/scripts/onload.js @@ -22,6 +22,9 @@ import "jquery.complexify"; import "bootstrap"; import "bootstrap-tour"; +// Galaxy core styles +import "scss/base.scss"; + // window.bundleEntries import "apps/extended"; diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index a286302df80..01862fc9fe1 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -4,7 +4,7 @@ @import "../../../node_modules/bootstrap/scss/bootstrap.scss"; // Fontawesome configuration. -$fa-font-path: "../images/fonts"; +$fa-font-path: "../../../node_modules/font-awesome/fonts/"; @import "../../../node_modules/font-awesome/scss/font-awesome.scss"; // Bootstrap-related style overrides @@ -253,7 +253,7 @@ body { // Another way to get a caret &.popup { padding-right: 1.75em; - background: url(../images/dropdownarrow.png) no-repeat right 7px; + background: url(../../images/dropdownarrow.png) no-repeat right 7px; } } } @@ -282,7 +282,7 @@ body { text-align: center; height: $panel_footer_height; width: $panel_footer_height - 5; - background-image: url(../images/visualization/draggable_horizontal.png); + background-image: url(../../images/visualization/draggable_horizontal.png); background-repeat: no-repeat; background-position: 50% 50%; cursor: w-resize; @@ -380,23 +380,23 @@ div.unified-panel-body-background { padding: 0px; padding-left: 26px; background-color: $state-danger-bg; - background-image: url(error_small.png); + background-image: url(../../images/error_small.png); background-repeat: no-repeat; background-position: 6px 50%; } .panel-warning-message { - background-image: url(warn_small.png); + background-image: url(../../images/warn_small.png); background-color: $state-warning-bg; } .panel-done-message { - background-image: url(ok_small.png); + background-image: url(../../images/ok_small.png); background-color: $state-success-bg; } .panel-info-message { - background-image: url(info_small.png); + background-image: url(../../images/info_small.png); background-color: $state-info-bg; } @@ -809,7 +809,7 @@ button { @extend .alert; min-height: 36px; padding-left: 52px; - background-image: url(error_large.png); + background-image: url(../../images/error_large.png); background-repeat: no-repeat; background-position: 10px 5px; .messagerow { @@ -825,18 +825,18 @@ button { .warningmessagelarge { @extend .alert-warning; padding-left: 52px; - background-image: url(warn_large.png); + background-image: url(../../images/warn_large.png); } .donemessagelarge { @extend .alert-success; padding-left: 52px; - background-image: url(ok_large.png); + background-image: url(../../images/ok_large.png); } .infomessagelarge { @extend .alert-info; - background-image: url(info_large.png); + background-image: url(../../images/info_large.png); } .screencastBox { @@ -863,7 +863,7 @@ button { min-height: 15px; //border: 1px solid $error_message_border; //background-color: $error_message_bg; - background-image: url(error_small.png); + background-image: url(../../images/error_small.png); background-repeat: no-repeat; background-position: 5px 6px; } @@ -878,20 +878,20 @@ button { .warningmessagesmall, .ui-form-help .warning { @extend .alert-warning; - background-image: url(warn_small.png); + background-image: url(../../images/warn_small.png); } .donemessage, .donemessagesmall { @extend .alert-success; - background-image: url(ok_small.png); + background-image: url(../../images/ok_small.png); } .infomessage, .infomessagesmall, .ui-form-help .note { @extend .alert-info; - background-image: url(info_small.png); + background-image: url(../../images/info_small.png); } .errormark, @@ -902,20 +902,20 @@ button { .err_bgr { padding-left: 20px; min-height: 15px; - background: url(error_small.png) no-repeat; + background: url(../../images/error_small.png) no-repeat; } .warningmark { - background-image: url(warn_small.png); + background-image: url(../../images/warn_small.png); } .donemark { - background-image: url(ok_small.png); + background-image: url(../../images/ok_small.png); } .infomark, .ok_bgr { - background-image: url(info_small.png); + background-image: url(../../images/info_small.png); } /* I think this is only used in view details */ @@ -1078,7 +1078,7 @@ div.debug { border-collapse: separate; } .delete-search-icon { - background: url(../images/delete_tag_icon_gray.png) center no-repeat; + background: url(../../images/delete_tag_icon_gray.png) center no-repeat; display: inline-block; width: 10px; cursor: pointer; @@ -1385,7 +1385,7 @@ a.action-button { } .menubutton.popup.split:hover { - //background: url(../images/ddarrowsplit.png) no-repeat right -39px; + //background: url(../../images/ddarrowsplit.png) no-repeat right -39px; } // Popup menu styles @@ -1544,7 +1544,7 @@ div.permissionContainer { } .icon-button.multiinput { - background: url(../images/documents-stack.png) no-repeat; + background: url(../../images/documents-stack.png) no-repeat; cursor: pointer; float: none; display: inline-block; @@ -1552,12 +1552,12 @@ div.permissionContainer { } .icon-button.multiinput.disabled { - background: url(../images/documents-stack-faded.png) no-repeat; + background: url(../../images/documents-stack-faded.png) no-repeat; cursor: pointer; } .icon-button.link { - background: url(../images/silk/link.png) no-repeat; + background: url(../../images/silk/link.png) no-repeat; cursor: pointer; float: none; display: inline-block; @@ -1565,7 +1565,7 @@ div.permissionContainer { } .icon-button.link-broken { - background: url(../images/silk/link_break.png) no-repeat; + background: url(../../images/silk/link_break.png) no-repeat; cursor: pointer; float: none; display: inline-block; @@ -1681,7 +1681,7 @@ div.toolTitleNoSection { height: 32px; width: 32px; display: none; - background: url(largespinner.gif); + background: url(../../images/largespinner.gif); } #content_table td { @@ -1737,14 +1737,14 @@ div.toolTitleNoSection { } .icon-button.general-question { - background: url(question-octagon-frame.png) no-repeat; + background: url(../../images/question-octagon-frame.png) no-repeat; float: right; margin-top: 3px; margin-right: 4px; } .icon-button.tag-question { - background: url(question-balloon.png) no-repeat; + background: url(../../images/question-balloon.png) no-repeat; float: right; margin-top: 3px; margin-right: 4px; diff --git a/client/galaxy/style/scss/iconic_stroke.scss b/client/galaxy/style/scss/iconic_stroke.scss index 164fa9eb8b4..b8bdeed9760 100644 --- a/client/galaxy/style/scss/iconic_stroke.scss +++ b/client/galaxy/style/scss/iconic_stroke.scss @@ -2,8 +2,8 @@ font-family: "IconicStroke"; src: url("/static/images/fonts/iconic_stroke.eot"); src: url("/static/images/fonts/iconic_stroke.eot?#iefix") format("embedded-opentype"), - url("../images/fonts/iconic_stroke.ttf") format("truetype"), - url("../images/fonts/iconic_stroke.svg#iconic") format("svg"); + url("../../images/fonts/iconic_stroke.ttf") format("truetype"), + url("../../images/fonts/iconic_stroke.svg#iconic") format("svg"); font-weight: normal; font-style: normal; } diff --git a/client/galaxy/style/scss/jstree.scss b/client/galaxy/style/scss/jstree.scss index 37dd5bc3333..cf9d1beeec0 100755 --- a/client/galaxy/style/scss/jstree.scss +++ b/client/galaxy/style/scss/jstree.scss @@ -358,7 +358,7 @@ } #jstree-dnd.jstree-default .jstree-ok, #jstree-dnd.jstree-default .jstree-er { - background-image: url("../images/jstree/32px.png"); + background-image: url("../../images/jstree/32px.png"); background-repeat: no-repeat; background-color: transparent; } @@ -429,7 +429,7 @@ } .jstree-default .jstree-node, .jstree-default .jstree-icon { - background-image: url("../images/jstree/32px.png"); + background-image: url("../../images/jstree/32px.png"); } .jstree-default .jstree-node { background-position: -292px -4px; @@ -525,13 +525,13 @@ background-position: 0 0; } .jstree-default > .jstree-container-ul .jstree-loading > .jstree-ocl { - background: url("../images/jstree/throbber.gif") center center no-repeat; + background: url("../../images/jstree/throbber.gif") center center no-repeat; } .jstree-default .jstree-file { - background: url("../images/jstree/32px.png") -100px -68px no-repeat; + background: url("../../images/jstree/32px.png") -100px -68px no-repeat; } .jstree-default .jstree-folder { - background: url("../images/jstree/32px.png") -260px -4px no-repeat; + background: url("../../images/jstree/32px.png") -260px -4px no-repeat; } .jstree-default.jstree-rtl .jstree-node { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg=="); @@ -567,7 +567,7 @@ } .jstree-default-small .jstree-node, .jstree-default-small .jstree-icon { - background-image: url("../images/jstree/32px.png"); + background-image: url("../../images/jstree/32px.png"); } .jstree-default-small .jstree-node { background-position: -295px -7px; @@ -663,13 +663,13 @@ background-position: 0 0; } .jstree-default-small > .jstree-container-ul .jstree-loading > .jstree-ocl { - background: url("../images/jstree/throbber.gif") center center no-repeat; + background: url("../../images/jstree/throbber.gif") center center no-repeat; } .jstree-default-small .jstree-file { - background: url("../images/jstree/32px.png") -103px -71px no-repeat; + background: url("../../images/jstree/32px.png") -103px -71px no-repeat; } .jstree-default-small .jstree-folder { - background: url("../images/jstree/32px.png") -263px -7px no-repeat; + background: url("../../images/jstree/32px.png") -263px -7px no-repeat; } .jstree-default-small.jstree-rtl .jstree-node { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg=="); @@ -705,7 +705,7 @@ } .jstree-default-large .jstree-node, .jstree-default-large .jstree-icon { - background-image: url("../images/jstree/32px.png"); + background-image: url("../../images/jstree/32px.png"); } .jstree-default-large .jstree-node { background-position: -288px 0px; @@ -801,13 +801,13 @@ background-position: 0 0; } .jstree-default-large > .jstree-container-ul .jstree-loading > .jstree-ocl { - background: url("../images/jstree/throbber.gif") center center no-repeat; + background: url("../../images/jstree/throbber.gif") center center no-repeat; } .jstree-default-large .jstree-file { - background: url("../images/jstree/32px.png") -96px -64px no-repeat; + background: url("../../images/jstree/32px.png") -96px -64px no-repeat; } .jstree-default-large .jstree-folder { - background: url("../images/jstree/32px.png") -256px 0px no-repeat; + background: url("../../images/jstree/32px.png") -256px 0px no-repeat; } .jstree-default-large.jstree-rtl .jstree-node { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg=="); @@ -828,12 +828,12 @@ height: 40px; } #jstree-dnd.jstree-dnd-responsive > .jstree-ok { - background-image: url("../images/jstree/40px.png"); + background-image: url("../../images/jstree/40px.png"); background-position: 0 -200px; background-size: 120px 240px; } #jstree-dnd.jstree-dnd-responsive > .jstree-er { - background-image: url("../images/jstree/40px.png"); + background-image: url("../../images/jstree/40px.png"); background-position: -40px -200px; background-size: 120px 240px; } @@ -852,7 +852,7 @@ */ } .jstree-default-responsive .jstree-icon { - background-image: url("../images/jstree/40px.png"); + background-image: url("../../images/jstree/40px.png"); } .jstree-default-responsive .jstree-node, .jstree-default-responsive .jstree-leaf > .jstree-ocl { @@ -954,7 +954,7 @@ .jstree-default-responsive .jstree-node > .jstree-ocl, .jstree-default-responsive .jstree-themeicon, .jstree-default-responsive .jstree-checkbox { - background-image: url("../images/jstree/40px.png"); + background-image: url("../../images/jstree/40px.png"); background-size: 120px 240px; } .jstree-default-responsive .jstree-node { @@ -976,11 +976,11 @@ background-position: 0 0; } .jstree-default-responsive .jstree-file { - background: url("../images/jstree/40px.png") 0 -160px no-repeat; + background: url("../../images/jstree/40px.png") 0 -160px no-repeat; background-size: 120px 240px; } .jstree-default-responsive .jstree-folder { - background: url("../images/jstree/40px.png") -40px -40px no-repeat; + background: url("../../images/jstree/40px.png") -40px -40px no-repeat; background-size: 120px 240px; } } diff --git a/client/galaxy/style/scss/select2.scss b/client/galaxy/style/scss/select2.scss index 4d6aaa85b5c..66443bd650e 100644 --- a/client/galaxy/style/scss/select2.scss +++ b/client/galaxy/style/scss/select2.scss @@ -105,7 +105,7 @@ html[dir="rtl"] .select2-container .select2-choice > .select2-chosen { text-decoration: none; border: 0; - background: url("../images/select2.png") right top no-repeat; + background: url("../../images/select2.png") right top no-repeat; cursor: pointer; outline: 0; } @@ -218,7 +218,7 @@ html[dir="rtl"] .select2-container .select2-choice .select2-arrow { display: block; width: 100%; height: 100%; - background: url("../images/select2.png") no-repeat 0 1px; + background: url("../../images/select2.png") no-repeat 0 1px; } html[dir="rtl"] .select2-container .select2-choice .select2-arrow b { @@ -256,27 +256,27 @@ html[dir="rtl"] .select2-container .select2-choice .select2-arrow b { -webkit-box-shadow: none; box-shadow: none; - background: #fff url("../images/select2.png") no-repeat 100% -22px; - background: url("../images/select2.png") no-repeat 100% -22px, + background: #fff url("../../images/select2.png") no-repeat 100% -22px; + background: url("../../images/select2.png") no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); - background: url("../images/select2.png") no-repeat 100% -22px, + background: url("../../images/select2.png") no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url("../images/select2.png") no-repeat 100% -22px, + background: url("../../images/select2.png") no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url("../images/select2.png") no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; + background: url("../../images/select2.png") no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; } html[dir="rtl"] .select2-search input { padding: 4px 5px 4px 20px; - background: #fff url("../images/select2.png") no-repeat -37px -22px; - background: url("../images/select2.png") no-repeat -37px -22px, + background: #fff url("../../images/select2.png") no-repeat -37px -22px; + background: url("../../images/select2.png") no-repeat -37px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); - background: url("../images/select2.png") no-repeat -37px -22px, + background: url("../../images/select2.png") no-repeat -37px -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url("../images/select2.png") no-repeat -37px -22px, + background: url("../../images/select2.png") no-repeat -37px -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url("../images/select2.png") no-repeat -37px -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; + background: url("../../images/select2.png") no-repeat -37px -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; } .select2-drop.select2-drop-above .select2-search input { @@ -284,14 +284,14 @@ html[dir="rtl"] .select2-search input { } .select2-search input.select2-active { - background: #fff url("../images/select2-spinner.gif") no-repeat 100%; - background: url("../images/select2-spinner.gif") no-repeat 100%, + background: #fff url("../../images/select2-spinner.gif") no-repeat 100%; + background: url("../../images/select2-spinner.gif") no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); - background: url("../images/select2-spinner.gif") no-repeat 100%, + background: url("../../images/select2-spinner.gif") no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url("../images/select2-spinner.gif") no-repeat 100%, + background: url("../../images/select2-spinner.gif") no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url("../images/select2-spinner.gif") no-repeat 100%, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; + background: url("../../images/select2-spinner.gif") no-repeat 100%, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; } .select2-container-active .select2-choice, @@ -474,7 +474,7 @@ disabled look for disabled choices in the results dropdown } .select2-more-results.select2-active { - background: #f4f4f4 url("../images/select2-spinner.gif") no-repeat 100%; + background: #f4f4f4 url("../../images/select2-spinner.gif") no-repeat 100%; } .select2-results .select2-ajax-error { @@ -572,7 +572,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices li { } .select2-container-multi .select2-choices .select2-search-field input.select2-active { - background: #fff url("../images/select2-spinner.gif") no-repeat 100% !important; + background: #fff url("../../images/select2-spinner.gif") no-repeat 100% !important; } .select2-default { @@ -638,7 +638,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice font-size: 1px; outline: none; - background: url("../images/select2.png") right top no-repeat; + background: url("../../images/select2.png") right top no-repeat; } html[dir="rtl"] .select2-search-choice-close { right: auto; @@ -725,7 +725,7 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close { .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice .select2-arrow b { - background-image: url("../images/select2x2.png") !important; + background-image: url("../../images/select2x2.png") !important; background-repeat: no-repeat !important; background-size: 60px 40px !important; } diff --git a/client/galaxy/style/scss/trackster.scss b/client/galaxy/style/scss/trackster.scss index a777ee77a91..b8ddcfb9838 100644 --- a/client/galaxy/style/scss/trackster.scss +++ b/client/galaxy/style/scss/trackster.scss @@ -65,12 +65,12 @@ $separator-color: #888; } #zoom-out { - background: transparent url(../images/fugue/magnifier-zoom-out.png) center center no-repeat; + background: transparent url(../../images/fugue/magnifier-zoom-out.png) center center no-repeat; } #zoom-in { margin-left: 10px; - background: transparent url(../images/fugue/magnifier-zoom.png) center center no-repeat; + background: transparent url(../../images/fugue/magnifier-zoom.png) center center no-repeat; } .nav-input { @@ -154,7 +154,7 @@ $separator-color: #888; position: absolute; margin-top: 0px; height: 14px; - background: #c1c9e5 url(../images/visualization/draggable_horizontal.png) center center no-repeat; + background: #c1c9e5 url(../../images/visualization/draggable_horizontal.png) center center no-repeat; border: solid #666 1px; } @@ -176,7 +176,7 @@ $separator-color: #888; .group-handle { cursor: move; float: left; - background: #eee url("../images/tracks/block.png"); + background: #eee url("../../images/tracks/block.png"); width: 12px; height: 12px; } @@ -228,7 +228,7 @@ $separator-color: #888; } .tiles { - background: url("../images/tracks/diag_bg.gif"); + background: url("../../images/tracks/diag_bg.gif"); position: relative; overflow: hidden; } @@ -430,7 +430,7 @@ input { } .exclamation { - background: transparent url(../images/fugue/exclamation.png) no-repeat; + background: transparent url(../../images/fugue/exclamation.png) no-repeat; margin-left: 5em; } @@ -443,10 +443,10 @@ input { // TODO: make images into spritemap. @mixin icon-hover-mixin($name) { &.#{$name} { - background: transparent url("../images/fugue/#{$name}-bw.png") no-repeat; + background: transparent url("../../images/fugue/#{$name}-bw.png") no-repeat; &:hover { - background: transparent url("../images/fugue/#{$name}.png") no-repeat; + background: transparent url("../../images/fugue/#{$name}.png") no-repeat; } } } @@ -469,22 +469,22 @@ input { .remove-icon, .overview-close { - background: transparent url(../images/fugue/cross-small-bw.png) no-repeat; + background: transparent url(../../images/fugue/cross-small-bw.png) no-repeat; } .icon-button.remove-icon:hover, .overview-close:hover { - background: transparent url(../images/fugue/cross-circle.png) no-repeat; + background: transparent url(../../images/fugue/cross-circle.png) no-repeat; } .child-track-icon { - background: url("../images/fugue/arrow-000-small-bw.png") no-repeat; + background: url("../../images/fugue/arrow-000-small-bw.png") no-repeat; width: 30px; cursor: move; } .track-resize { - background: white url("../images/visualization/draggable_vertical.png") no-repeat top center; + background: white url("../../images/visualization/draggable_vertical.png") no-repeat top center; position: absolute; right: 3px; bottom: -4px; @@ -534,7 +534,7 @@ input { font-size: 10px; filter: alpha(opacity=80); background-repeat: no-repeat; - background-image: url(../images/tipsy.gif); + background-image: url(../../images/tipsy.gif); background-position: top center; } @@ -565,7 +565,7 @@ input { margin-top: 2px; cursor: move; float: left; - background: transparent url(../images/visualization/draggable_horizontal.png) center center no-repeat; + background: transparent url(../../images/visualization/draggable_horizontal.png) center center no-repeat; width: 10px; height: 12px; } diff --git a/client/package.json b/client/package.json index 138cf8db334..9c64ad776a2 100644 --- a/client/package.json +++ b/client/package.json @@ -53,14 +53,13 @@ "webpack-watch": "webpack -d --watch", "webpack-production": "webpack -p", "webpack-production-maps": "GXY_BUILD_SOURCEMAPS=1 webpack -p", - "style": "grunt && gulp style", - "style-watch": "grunt && gulp watch-style", + "style": "gulp style", + "style-watch": "gulp watch-style", "test": "GALAXY_TEST_AS_SINGLE_PACK=true karma start --verbose --single-run --browsers PhantomJS karma.config.js", "test-watch": "GALAXY_TEST_AS_SINGLE_PACK=true karma start --verbose --browsers PhantomJS karma.config.js", "gulp": "gulp", "gulp-production": "NODE_ENV=production gulp", "gulp-production-maps": "GXY_BUILD_SOURCEMAPS=1 NODE_ENV=production gulp", - "build-toolshed": "grunt --app=toolshed", "jshint": "jshint --exclude='galaxy/scripts/libs/**' galaxy/scripts/**/*.js", "build-charts": "webpack -p --config ../config/plugins/visualizations/charts/webpack.config.js", "build-scatterplot": "NODE_PATH=./node_modules webpack -p --config ../config/plugins/visualizations/scatterplot/webpack.config.js", @@ -107,6 +106,7 @@ "qunitjs": "^2.4.1", "sass-loader": "^7.1.0", "sinon": "^4.1.2", + "style-loader": "^0.23.1", "vue-loader": "^15.4.2", "vue-styleguidist": "^1.8.9", "vue-template-compiler": "2.5.17", diff --git a/client/webpack.config.js b/client/webpack.config.js index 7f88d0d8923..2980d1530d3 100644 --- a/client/webpack.config.js +++ b/client/webpack.config.js @@ -5,6 +5,8 @@ const VueLoaderPlugin = require("vue-loader/lib/plugin"); const scriptsBase = path.join(__dirname, "galaxy/scripts"); const libsBase = path.join(scriptsBase, "libs"); +const styleBase = path.join(__dirname, "galaxy/style"); +const imageBase = path.join(__dirname, "../static/style"); let buildconfig = { entry: { @@ -19,7 +21,7 @@ let buildconfig = { chunkFilename: "[name].chunk.js" }, resolve: { - modules: [scriptsBase, "node_modules"] + modules: [scriptsBase, "node_modules", styleBase, imageBase] }, optimization: { splitChunks: { @@ -80,6 +82,31 @@ let buildconfig = { } ] }, + { + test: /\.(png|jpg|jpeg|gif|svg|woff|woff2|ttf|eot)(\?.*$|$)/, + use: { + loader: "file-loader" + } + }, + { + test: /\.scss$/, + use: [ + { + loader: "style-loader" + }, + { + loader: "css-loader" + }, + { + loader: "sass-loader" + } + ] + }, + //{ + // test: /\.css$/, + // use: ["style-loader", "css-loader"], + // exclude: [path.join(libsBase, "components"), /(node_modules\/(?!(handsontable)\/))/] + //}, // Alternative to setting window.bundleEntries // Just import "extended" in any endpoint that needs // access to these globals, or even-better, make diff --git a/client/yarn.lock b/client/yarn.lock index 3920323ccb2..7a838b4afee 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -12904,6 +12904,14 @@ style-loader@^0.21.0: loader-utils "^1.1.0" schema-utils "^0.4.5" +style-loader@^0.23.1: + version "0.23.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925" + integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg== + dependencies: + loader-utils "^1.1.0" + schema-utils "^1.0.0" + supports-color@5.4.0, supports-color@^5.4.0: version "5.4.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" diff --git a/static/style/blue/base.css b/static/style/blue/base.css index cc98b309e72..f9de7c1b375 100644 --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -6669,8 +6669,8 @@ a.text-dark:hover, .quota-meter-text a:hover, a.text-dark:focus, .quota-meter-te * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url("../images/fonts/fontawesome-webfont.eot?v=4.7.0"); - src: url("../images/fonts/fontawesome-webfont.eot?#iefix&v=4.7.0") format("embedded-opentype"), url("../images/fonts/fontawesome-webfont.woff2?v=4.7.0") format("woff2"), url("../images/fonts/fontawesome-webfont.woff?v=4.7.0") format("woff"), url("../images/fonts/fontawesome-webfont.ttf?v=4.7.0") format("truetype"), url("../images/fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular") format("svg"); + src: url("../../../node_modules/font-awesome/fonts//fontawesome-webfont.eot?v=4.7.0"); + src: url("../../../node_modules/font-awesome/fonts//fontawesome-webfont.eot?#iefix&v=4.7.0") format("embedded-opentype"), url("../../../node_modules/font-awesome/fonts//fontawesome-webfont.woff2?v=4.7.0") format("woff2"), url("../../../node_modules/font-awesome/fonts//fontawesome-webfont.woff?v=4.7.0") format("woff"), url("../../../node_modules/font-awesome/fonts//fontawesome-webfont.ttf?v=4.7.0") format("truetype"), url("../../../node_modules/font-awesome/fonts//fontawesome-webfont.svg?v=4.7.0#fontawesomeregular") format("svg"); font-weight: normal; font-style: normal; } @@ -9174,7 +9174,7 @@ html[dir="rtl"] .select2-container .select2-choice > .select2-chosen { font-size: 1px; text-decoration: none; border: 0; - background: url("../images/select2.png") right top no-repeat; + background: url("../../images/select2.png") right top no-repeat; cursor: pointer; outline: 0; } @@ -9266,7 +9266,7 @@ html[dir="rtl"] .select2-container .select2-choice .select2-arrow { display: block; width: 100%; height: 100%; - background: url("../images/select2.png") no-repeat 0 1px; } + background: url("../../images/select2.png") no-repeat 0 1px; } html[dir="rtl"] .select2-container .select2-choice .select2-arrow b { background-position: 2px 1px; } @@ -9295,29 +9295,29 @@ html[dir="rtl"] .select2-container .select2-choice .select2-arrow b { border-radius: 0; -webkit-box-shadow: none; box-shadow: none; - background: #fff url("../images/select2.png") no-repeat 100% -22px; - background: url("../images/select2.png") no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); - background: url("../images/select2.png") no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url("../images/select2.png") no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url("../images/select2.png") no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; } + background: #fff url("../../images/select2.png") no-repeat 100% -22px; + background: url("../../images/select2.png") no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); + background: url("../../images/select2.png") no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url("../../images/select2.png") no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url("../../images/select2.png") no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; } html[dir="rtl"] .select2-search input { padding: 4px 5px 4px 20px; - background: #fff url("../images/select2.png") no-repeat -37px -22px; - background: url("../images/select2.png") no-repeat -37px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); - background: url("../images/select2.png") no-repeat -37px -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url("../images/select2.png") no-repeat -37px -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url("../images/select2.png") no-repeat -37px -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; } + background: #fff url("../../images/select2.png") no-repeat -37px -22px; + background: url("../../images/select2.png") no-repeat -37px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); + background: url("../../images/select2.png") no-repeat -37px -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url("../../images/select2.png") no-repeat -37px -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url("../../images/select2.png") no-repeat -37px -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; } .select2-drop.select2-drop-above .select2-search input { margin-top: 4px; } .select2-search input.select2-active { - background: #fff url("../images/select2-spinner.gif") no-repeat 100%; - background: url("../images/select2-spinner.gif") no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); - background: url("../images/select2-spinner.gif") no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url("../images/select2-spinner.gif") no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url("../images/select2-spinner.gif") no-repeat 100%, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; } + background: #fff url("../../images/select2-spinner.gif") no-repeat 100%; + background: url("../../images/select2-spinner.gif") no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); + background: url("../../images/select2-spinner.gif") no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url("../../images/select2-spinner.gif") no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url("../../images/select2-spinner.gif") no-repeat 100%, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; } .select2-container-active .select2-choice, .select2-container-active .select2-choices { @@ -9472,7 +9472,7 @@ disabled look for disabled choices in the results dropdown display: none; } .select2-more-results.select2-active { - background: #f4f4f4 url("../images/select2-spinner.gif") no-repeat 100%; } + background: #f4f4f4 url("../../images/select2-spinner.gif") no-repeat 100%; } .select2-results .select2-ajax-error { background: rgba(255, 50, 50, 0.2); } @@ -9552,7 +9552,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices li { background: transparent !important; } .select2-container-multi .select2-choices .select2-search-field input.select2-active { - background: #fff url("../images/select2-spinner.gif") no-repeat 100% !important; } + background: #fff url("../../images/select2-spinner.gif") no-repeat 100% !important; } .select2-default { color: #999 !important; } @@ -9600,7 +9600,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice top: 4px; font-size: 1px; outline: none; - background: url("../images/select2.png") right top no-repeat; } + background: url("../../images/select2.png") right top no-repeat; } html[dir="rtl"] .select2-search-choice-close { right: auto; @@ -9672,7 +9672,7 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close { .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice .select2-arrow b { - background-image: url("../images/select2x2.png") !important; + background-image: url("../../images/select2x2.png") !important; background-repeat: no-repeat !important; background-size: 60px 40px !important; } .select2-search input { @@ -11725,7 +11725,7 @@ button.toast-close-button { #jstree-dnd.jstree-default .jstree-ok, #jstree-dnd.jstree-default .jstree-er { - background-image: url("../images/jstree/32px.png"); + background-image: url("../../images/jstree/32px.png"); background-repeat: no-repeat; background-color: transparent; } @@ -11795,7 +11795,7 @@ button.toast-close-button { .jstree-default .jstree-node, .jstree-default .jstree-icon { - background-image: url("../images/jstree/32px.png"); } + background-image: url("../../images/jstree/32px.png"); } .jstree-default .jstree-node { background-position: -292px -4px; @@ -11891,13 +11891,13 @@ button.toast-close-button { background-position: 0 0; } .jstree-default > .jstree-container-ul .jstree-loading > .jstree-ocl { - background: url("../images/jstree/throbber.gif") center center no-repeat; } + background: url("../../images/jstree/throbber.gif") center center no-repeat; } .jstree-default .jstree-file { - background: url("../images/jstree/32px.png") -100px -68px no-repeat; } + background: url("../../images/jstree/32px.png") -100px -68px no-repeat; } .jstree-default .jstree-folder { - background: url("../images/jstree/32px.png") -260px -4px no-repeat; } + background: url("../../images/jstree/32px.png") -260px -4px no-repeat; } .jstree-default.jstree-rtl .jstree-node { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg=="); } @@ -11933,7 +11933,7 @@ button.toast-close-button { .jstree-default-small .jstree-node, .jstree-default-small .jstree-icon { - background-image: url("../images/jstree/32px.png"); } + background-image: url("../../images/jstree/32px.png"); } .jstree-default-small .jstree-node { background-position: -295px -7px; @@ -12029,13 +12029,13 @@ button.toast-close-button { background-position: 0 0; } .jstree-default-small > .jstree-container-ul .jstree-loading > .jstree-ocl { - background: url("../images/jstree/throbber.gif") center center no-repeat; } + background: url("../../images/jstree/throbber.gif") center center no-repeat; } .jstree-default-small .jstree-file { - background: url("../images/jstree/32px.png") -103px -71px no-repeat; } + background: url("../../images/jstree/32px.png") -103px -71px no-repeat; } .jstree-default-small .jstree-folder { - background: url("../images/jstree/32px.png") -263px -7px no-repeat; } + background: url("../../images/jstree/32px.png") -263px -7px no-repeat; } .jstree-default-small.jstree-rtl .jstree-node { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg=="); } @@ -12071,7 +12071,7 @@ button.toast-close-button { .jstree-default-large .jstree-node, .jstree-default-large .jstree-icon { - background-image: url("../images/jstree/32px.png"); } + background-image: url("../../images/jstree/32px.png"); } .jstree-default-large .jstree-node { background-position: -288px 0px; @@ -12167,13 +12167,13 @@ button.toast-close-button { background-position: 0 0; } .jstree-default-large > .jstree-container-ul .jstree-loading > .jstree-ocl { - background: url("../images/jstree/throbber.gif") center center no-repeat; } + background: url("../../images/jstree/throbber.gif") center center no-repeat; } .jstree-default-large .jstree-file { - background: url("../images/jstree/32px.png") -96px -64px no-repeat; } + background: url("../../images/jstree/32px.png") -96px -64px no-repeat; } .jstree-default-large .jstree-folder { - background: url("../images/jstree/32px.png") -256px 0px no-repeat; } + background: url("../../images/jstree/32px.png") -256px 0px no-repeat; } .jstree-default-large.jstree-rtl .jstree-node { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg=="); } @@ -12192,11 +12192,11 @@ button.toast-close-button { width: 40px; height: 40px; } #jstree-dnd.jstree-dnd-responsive > .jstree-ok { - background-image: url("../images/jstree/40px.png"); + background-image: url("../../images/jstree/40px.png"); background-position: 0 -200px; background-size: 120px 240px; } #jstree-dnd.jstree-dnd-responsive > .jstree-er { - background-image: url("../images/jstree/40px.png"); + background-image: url("../../images/jstree/40px.png"); background-position: -40px -200px; background-size: 120px 240px; } #jstree-marker.jstree-dnd-responsive { @@ -12212,7 +12212,7 @@ button.toast-close-button { .jstree-closed > .jstree-ocl { border-radius:20px; background-color:white; } */ } .jstree-default-responsive .jstree-icon { - background-image: url("../images/jstree/40px.png"); } + background-image: url("../../images/jstree/40px.png"); } .jstree-default-responsive .jstree-node, .jstree-default-responsive .jstree-leaf > .jstree-ocl { background: transparent; } @@ -12289,7 +12289,7 @@ button.toast-close-button { .jstree-default-responsive .jstree-node > .jstree-ocl, .jstree-default-responsive .jstree-themeicon, .jstree-default-responsive .jstree-checkbox { - background-image: url("../images/jstree/40px.png"); + background-image: url("../../images/jstree/40px.png"); background-size: 120px 240px; } .jstree-default-responsive .jstree-node { background-position: -80px 0; @@ -12305,10 +12305,10 @@ button.toast-close-button { background-image: none; background-position: 0 0; } .jstree-default-responsive .jstree-file { - background: url("../images/jstree/40px.png") 0 -160px no-repeat; + background: url("../../images/jstree/40px.png") 0 -160px no-repeat; background-size: 120px 240px; } .jstree-default-responsive .jstree-folder { - background: url("../images/jstree/40px.png") -40px -40px no-repeat; + background: url("../../images/jstree/40px.png") -40px -40px no-repeat; background-size: 120px 240px; } } .jstree-default > .jstree-container-ul > .jstree-node { @@ -12616,7 +12616,7 @@ body { margin-top: 7px; } .unified-panel-header .panel-header-button.popup { padding-right: 1.75em; - background: url(../images/dropdownarrow.png) no-repeat right 7px; } + background: url(../../images/dropdownarrow.png) no-repeat right 7px; } .unified-panel-footer, .panel-collapse { position: absolute; @@ -12638,7 +12638,7 @@ body { text-align: center; height: 25px; width: 20px; - background-image: url(../images/visualization/draggable_horizontal.png); + background-image: url(../../images/visualization/draggable_horizontal.png); background-repeat: no-repeat; background-position: 50% 50%; cursor: w-resize; } @@ -12714,20 +12714,20 @@ div.unified-panel-body-background { padding: 0px; padding-left: 26px; background-color: #f9c7c6; - background-image: url(error_small.png); + background-image: url(../../images/error_small.png); background-repeat: no-repeat; background-position: 6px 50%; } .panel-warning-message { - background-image: url(warn_small.png); + background-image: url(../../images/warn_small.png); background-color: #fcdbac; } .panel-done-message { - background-image: url(ok_small.png); + background-image: url(../../images/ok_small.png); background-color: #b1e7b1; } .panel-info-message { - background-image: url(info_small.png); + background-image: url(../../images/info_small.png); background-color: #b0e7f8; } #masthead { @@ -13049,7 +13049,7 @@ input[type="password"] { .ui-form-help .note { min-height: 36px; padding-left: 52px; - background-image: url(error_large.png); + background-image: url(../../images/error_large.png); background-repeat: no-repeat; background-position: 10px 5px; } .errormessagelarge .messagerow, .error-modal .modal-content .messagerow, @@ -13066,14 +13066,14 @@ input[type="password"] { .warningmessagelarge { padding-left: 52px; - background-image: url(warn_large.png); } + background-image: url(../../images/warn_large.png); } .donemessagelarge { padding-left: 52px; - background-image: url(ok_large.png); } + background-image: url(../../images/ok_large.png); } .infomessagelarge { - background-image: url(info_large.png); } + background-image: url(../../images/info_large.png); } .screencastBox { padding-left: 10px; @@ -13095,23 +13095,23 @@ input[type="password"] { padding: 5px; padding-left: 25px; min-height: 15px; - background-image: url(error_small.png); + background-image: url(../../images/error_small.png); background-repeat: no-repeat; background-position: 5px 6px; } .warningmessage, .warningmessagesmall, .ui-form-help .warning { - background-image: url(warn_small.png); } + background-image: url(../../images/warn_small.png); } .donemessage, .donemessagesmall { - background-image: url(ok_small.png); } + background-image: url(../../images/ok_small.png); } .infomessage, .infomessagesmall, .ui-form-help .note { - background-image: url(info_small.png); } + background-image: url(../../images/info_small.png); } .errormark, .warningmark, @@ -13121,17 +13121,17 @@ input[type="password"] { .err_bgr { padding-left: 20px; min-height: 15px; - background: url(error_small.png) no-repeat; } + background: url(../../images/error_small.png) no-repeat; } .warningmark { - background-image: url(warn_small.png); } + background-image: url(../../images/warn_small.png); } .donemark { - background-image: url(ok_small.png); } + background-image: url(../../images/ok_small.png); } .infomark, .ok_bgr { - background-image: url(info_small.png); } + background-image: url(../../images/info_small.png); } /* I think this is only used in view details */ table.simple { @@ -13282,7 +13282,7 @@ div.debug { border-collapse: separate; } .delete-search-icon { - background: url(../images/delete_tag_icon_gray.png) center no-repeat; + background: url(../../images/delete_tag_icon_gray.png) center no-repeat; display: inline-block; width: 10px; cursor: pointer; @@ -13587,25 +13587,25 @@ div.permissionContainer { border: dotted #999999 1px; } .icon-button.multiinput { - background: url(../images/documents-stack.png) no-repeat; + background: url(../../images/documents-stack.png) no-repeat; cursor: pointer; float: none; display: inline-block; margin-left: 10px; } .icon-button.multiinput.disabled { - background: url(../images/documents-stack-faded.png) no-repeat; + background: url(../../images/documents-stack-faded.png) no-repeat; cursor: pointer; } .icon-button.link { - background: url(../images/silk/link.png) no-repeat; + background: url(../../images/silk/link.png) no-repeat; cursor: pointer; float: none; display: inline-block; margin-left: 10px; } .icon-button.link-broken { - background: url(../images/silk/link_break.png) no-repeat; + background: url(../../images/silk/link_break.png) no-repeat; cursor: pointer; float: none; display: inline-block; @@ -15303,7 +15303,7 @@ div.toolTitleNoSection { height: 32px; width: 32px; display: none; - background: url(largespinner.gif); } + background: url(../../images/largespinner.gif); } #content_table td { text-align: right; @@ -15357,13 +15357,13 @@ div.toolTitleNoSection { margin-left: 0; } .icon-button.general-question { - background: url(question-octagon-frame.png) no-repeat; + background: url(../../images/question-octagon-frame.png) no-repeat; float: right; margin-top: 3px; margin-right: 4px; } .icon-button.tag-question { - background: url(question-balloon.png) no-repeat; + background: url(../../images/question-balloon.png) no-repeat; float: right; margin-top: 3px; margin-right: 4px; } diff --git a/static/style/blue/trackster.css b/static/style/blue/trackster.css index 0adbb6f5c54..90ca6ea406d 100644 --- a/static/style/blue/trackster.css +++ b/static/style/blue/trackster.css @@ -46,11 +46,11 @@ cursor: pointer; } #zoom-out { - background: transparent url(../images/fugue/magnifier-zoom-out.png) center center no-repeat; } + background: transparent url(../../images/fugue/magnifier-zoom-out.png) center center no-repeat; } #zoom-in { margin-left: 10px; - background: transparent url(../images/fugue/magnifier-zoom.png) center center no-repeat; } + background: transparent url(../../images/fugue/magnifier-zoom.png) center center no-repeat; } .nav-input { font-size: 12px; @@ -123,7 +123,7 @@ position: absolute; margin-top: 0px; height: 14px; - background: #c1c9e5 url(../images/visualization/draggable_horizontal.png) center center no-repeat; + background: #c1c9e5 url(../../images/visualization/draggable_horizontal.png) center center no-repeat; border: solid #666 1px; } .viewport-canvas { @@ -141,7 +141,7 @@ .group-handle { cursor: move; float: left; - background: #eee url("../images/tracks/block.png"); + background: #eee url("../../images/tracks/block.png"); width: 12px; height: 12px; } @@ -179,7 +179,7 @@ margin-top: 2px; } .tiles { - background: url("../images/tracks/diag_bg.gif"); + background: url("../../images/tracks/diag_bg.gif"); position: relative; overflow: hidden; } @@ -327,92 +327,92 @@ input { margin: 0px 4px 0px 4px; } .exclamation { - background: transparent url(../images/fugue/exclamation.png) no-repeat; + background: transparent url(../../images/fugue/exclamation.png) no-repeat; margin-left: 5em; } .track-icons { float: left; } .icon-button.bookmarks { - background: transparent url("../images/fugue/bookmarks-bw.png") no-repeat; } + background: transparent url("../../images/fugue/bookmarks-bw.png") no-repeat; } .icon-button.bookmarks:hover { - background: transparent url("../images/fugue/bookmarks.png") no-repeat; } + background: transparent url("../../images/fugue/bookmarks.png") no-repeat; } .icon-button.layers-stack { - background: transparent url("../images/fugue/layers-stack-bw.png") no-repeat; } + background: transparent url("../../images/fugue/layers-stack-bw.png") no-repeat; } .icon-button.layers-stack:hover { - background: transparent url("../images/fugue/layers-stack.png") no-repeat; } + background: transparent url("../../images/fugue/layers-stack.png") no-repeat; } .icon-button.hammer { - background: transparent url("../images/fugue/hammer-bw.png") no-repeat; } + background: transparent url("../../images/fugue/hammer-bw.png") no-repeat; } .icon-button.hammer:hover { - background: transparent url("../images/fugue/hammer.png") no-repeat; } + background: transparent url("../../images/fugue/hammer.png") no-repeat; } .icon-button.toolbox { - background: transparent url("../images/fugue/toolbox-bw.png") no-repeat; } + background: transparent url("../../images/fugue/toolbox-bw.png") no-repeat; } .icon-button.toolbox:hover { - background: transparent url("../images/fugue/toolbox.png") no-repeat; } + background: transparent url("../../images/fugue/toolbox.png") no-repeat; } .icon-button.globe { - background: transparent url("../images/fugue/globe-bw.png") no-repeat; } + background: transparent url("../../images/fugue/globe-bw.png") no-repeat; } .icon-button.globe:hover { - background: transparent url("../images/fugue/globe.png") no-repeat; } + background: transparent url("../../images/fugue/globe.png") no-repeat; } .icon-button.block--plus { - background: transparent url("../images/fugue/block--plus-bw.png") no-repeat; } + background: transparent url("../../images/fugue/block--plus-bw.png") no-repeat; } .icon-button.block--plus:hover { - background: transparent url("../images/fugue/block--plus.png") no-repeat; } + background: transparent url("../../images/fugue/block--plus.png") no-repeat; } .icon-button.toggle { - background: transparent url("../images/fugue/toggle-bw.png") no-repeat; } + background: transparent url("../../images/fugue/toggle-bw.png") no-repeat; } .icon-button.toggle:hover { - background: transparent url("../images/fugue/toggle.png") no-repeat; } + background: transparent url("../../images/fugue/toggle.png") no-repeat; } .icon-button.toggle-expand { - background: transparent url("../images/fugue/toggle-expand-bw.png") no-repeat; } + background: transparent url("../../images/fugue/toggle-expand-bw.png") no-repeat; } .icon-button.toggle-expand:hover { - background: transparent url("../images/fugue/toggle-expand.png") no-repeat; } + background: transparent url("../../images/fugue/toggle-expand.png") no-repeat; } .icon-button.gear { - background: transparent url("../images/fugue/gear-bw.png") no-repeat; } + background: transparent url("../../images/fugue/gear-bw.png") no-repeat; } .icon-button.gear:hover { - background: transparent url("../images/fugue/gear.png") no-repeat; } + background: transparent url("../../images/fugue/gear.png") no-repeat; } .icon-button.application-dock-270 { - background: transparent url("../images/fugue/application-dock-270-bw.png") no-repeat; } + background: transparent url("../../images/fugue/application-dock-270-bw.png") no-repeat; } .icon-button.application-dock-270:hover { - background: transparent url("../images/fugue/application-dock-270.png") no-repeat; } + background: transparent url("../../images/fugue/application-dock-270.png") no-repeat; } .icon-button.ui-slider-050 { - background: transparent url("../images/fugue/ui-slider-050-bw.png") no-repeat; } + background: transparent url("../../images/fugue/ui-slider-050-bw.png") no-repeat; } .icon-button.ui-slider-050:hover { - background: transparent url("../images/fugue/ui-slider-050.png") no-repeat; } + background: transparent url("../../images/fugue/ui-slider-050.png") no-repeat; } .icon-button.arrow-resize-090 { - background: transparent url("../images/fugue/arrow-resize-090-bw.png") no-repeat; } + background: transparent url("../../images/fugue/arrow-resize-090-bw.png") no-repeat; } .icon-button.arrow-resize-090:hover { - background: transparent url("../images/fugue/arrow-resize-090.png") no-repeat; } + background: transparent url("../../images/fugue/arrow-resize-090.png") no-repeat; } .icon-button.layer-transparent { - background: transparent url("../images/fugue/layer-transparent-bw.png") no-repeat; } + background: transparent url("../../images/fugue/layer-transparent-bw.png") no-repeat; } .icon-button.layer-transparent:hover { - background: transparent url("../images/fugue/layer-transparent.png") no-repeat; } + background: transparent url("../../images/fugue/layer-transparent.png") no-repeat; } .remove-icon, .overview-close { - background: transparent url(../images/fugue/cross-small-bw.png) no-repeat; } + background: transparent url(../../images/fugue/cross-small-bw.png) no-repeat; } .icon-button.remove-icon:hover, .overview-close:hover { - background: transparent url(../images/fugue/cross-circle.png) no-repeat; } + background: transparent url(../../images/fugue/cross-circle.png) no-repeat; } .child-track-icon { - background: url("../images/fugue/arrow-000-small-bw.png") no-repeat; + background: url("../../images/fugue/arrow-000-small-bw.png") no-repeat; width: 30px; cursor: move; } .track-resize { - background: white url("../images/visualization/draggable_vertical.png") no-repeat top center; + background: white url("../../images/visualization/draggable_vertical.png") no-repeat top center; position: absolute; right: 3px; bottom: -4px; @@ -456,7 +456,7 @@ input { font-size: 10px; filter: alpha(opacity=80); background-repeat: no-repeat; - background-image: url(../images/tipsy.gif); + background-image: url(../../images/tipsy.gif); background-position: top center; } .feature-popup-inner { @@ -483,7 +483,7 @@ input { margin-top: 2px; cursor: move; float: left; - background: transparent url(../images/visualization/draggable_horizontal.png) center center no-repeat; + background: transparent url(../../images/visualization/draggable_horizontal.png) center center no-repeat; width: 10px; height: 12px; } diff --git a/static/style/shared_images/error_large.png b/static/style/shared_images/error_large.png deleted file mode 100644 index 2cb2e8f829d..00000000000 Binary files a/static/style/shared_images/error_large.png and /dev/null differ diff --git a/static/style/shared_images/error_small.png b/static/style/shared_images/error_small.png deleted file mode 100644 index 04cdc336153..00000000000 Binary files a/static/style/shared_images/error_small.png and /dev/null differ diff --git a/static/style/shared_images/info_large.png b/static/style/shared_images/info_large.png deleted file mode 100644 index 8ac030b0b24..00000000000 Binary files a/static/style/shared_images/info_large.png and /dev/null differ diff --git a/static/style/shared_images/info_small.png b/static/style/shared_images/info_small.png deleted file mode 100644 index 81522c4447f..00000000000 Binary files a/static/style/shared_images/info_small.png and /dev/null differ diff --git a/static/style/shared_images/ok_large.png b/static/style/shared_images/ok_large.png deleted file mode 100644 index e68759ac9cb..00000000000 Binary files a/static/style/shared_images/ok_large.png and /dev/null differ diff --git a/static/style/shared_images/ok_small.png b/static/style/shared_images/ok_small.png deleted file mode 100644 index dee022cee56..00000000000 Binary files a/static/style/shared_images/ok_small.png and /dev/null differ diff --git a/static/style/shared_images/wait_large.png b/static/style/shared_images/wait_large.png deleted file mode 100644 index 480d6d9bc72..00000000000 Binary files a/static/style/shared_images/wait_large.png and /dev/null differ diff --git a/static/style/shared_images/wait_small.png b/static/style/shared_images/wait_small.png deleted file mode 100644 index 7202be86447..00000000000 Binary files a/static/style/shared_images/wait_small.png and /dev/null differ diff --git a/static/style/shared_images/warn_large.png b/static/style/shared_images/warn_large.png deleted file mode 100644 index c4c4af28678..00000000000 Binary files a/static/style/shared_images/warn_large.png and /dev/null differ diff --git a/static/style/shared_images/warn_small.png b/static/style/shared_images/warn_small.png deleted file mode 100644 index 34c0c93b625..00000000000 Binary files a/static/style/shared_images/warn_small.png and /dev/null differ