Skip to content

Commit

Permalink
Rename grid.css to chart.css (#24529)
Browse files Browse the repository at this point in the history
Given it was no longer used in the new grid view and only the chart
pages, _and_ we want to have a new css file for the react grid
components it is better to rename this one now.
  • Loading branch information
ashb committed Jun 17, 2022
1 parent 8b054ef commit 376faef
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion airflow/www/templates/airflow/chart.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

{% block head_css %}
{{ super() }}
<link rel="stylesheet" type="text/css" href="{{ url_for_asset('grid.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for_asset('chart.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for_asset('nv.d3.min.css') }}">
<script src="{{ url_for_asset('d3.min.js') }}"></script>
<script src="{{ url_for_asset('nv.d3.min.js') }}"></script>
Expand Down
2 changes: 1 addition & 1 deletion airflow/www/templates/airflow/duration_chart.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

{% block head_css %}
{{ super() }}
<link rel="stylesheet" type="text/css" href="{{ url_for_asset('grid.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for_asset('chart.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for_asset('nv.d3.min.css') }}">
<script src="{{ url_for_asset('d3.min.js') }}"></script>
<script src="{{ url_for_asset('nv.d3.min.js') }}"></script>
Expand Down
2 changes: 1 addition & 1 deletion airflow/www/templates/airflow/gantt.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{% block head_css %}
{{ super() }}
<link rel="stylesheet" type="text/css" href="{{ url_for_asset('gantt.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for_asset('grid.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for_asset('chart.css') }}">
<style type="text/css">
{% for state, state_color in state_color_mapping.items() %}
rect.{{state}} {
Expand Down
3 changes: 2 additions & 1 deletion airflow/www/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const config = {
entry: {
airflowDefaultTheme: `${CSS_DIR}/bootstrap-theme.css`,
connectionForm: `${JS_DIR}/connection_form.js`,
chart: [`${CSS_DIR}/chart.css`],
dag: `${JS_DIR}/dag.js`,
dagCode: `${JS_DIR}/dag_code.js`,
dagDependencies: `${JS_DIR}/dag_dependencies.js`,
Expand All @@ -72,7 +73,7 @@ const config = {
task: `${JS_DIR}/task.js`,
taskInstances: `${JS_DIR}/task_instances.js`,
tiLog: `${JS_DIR}/ti_log.js`,
grid: [`${CSS_DIR}/grid.css`, `${JS_DIR}/grid/index.jsx`],
grid: [`${JS_DIR}/grid/index.jsx`],
calendar: [`${CSS_DIR}/calendar.css`, `${JS_DIR}/calendar.js`],
durationChart: `${JS_DIR}/duration_chart.js`,
trigger: `${JS_DIR}/trigger.js`,
Expand Down

0 comments on commit 376faef

Please sign in to comment.