Skip to content

Commit

Permalink
fix: correct some typos and usage.
Browse files Browse the repository at this point in the history
  • Loading branch information
plainheart authored and Ovilia committed Aug 20, 2020
1 parent cb9687e commit 67db87b
Show file tree
Hide file tree
Showing 50 changed files with 102 additions and 100 deletions.
20 changes: 10 additions & 10 deletions app/en/body.html
Expand Up @@ -42,7 +42,7 @@ <h4 class="panel-title">
</button>
<button type="button" class="btn btn-default" @click="newTheme()">
<span class="glyphicon glyphicon-repeat"></span>
Repeat
Reset
</button>
<button class="btn btn-default" data-toggle="modal" data-target="#download-modal">
<span class="glyphicon glyphicon-question-sign"></span>
Expand Down Expand Up @@ -134,7 +134,7 @@ <h4 class="panel-title">
<div class="form-group">
<div class="col-sm-12">
<input v-model="theme.axisSeperateSetting" @change="axisSeperateSettingChanges()" type="checkbox" id="axisSeperateSetting" />
<label for="axisSeperateSetting" class="control-label">Change Config For Each Axis Types</label>
<label for="axisSeperateSetting" class="control-label">Change Config For Each Axis Type</label>
</div>
</div>
<div class="axis-group" v-for="axis in theme.axis" v-if="$index > 0 || !theme.axisSeperateSetting">
Expand Down Expand Up @@ -179,7 +179,7 @@ <h4 class="panel-title">
<div class="panel-body">
<form class="form-horizontal">
<config-color :color.sync="theme.toolboxColor" title="Item"></config-color>
<config-color :color.sync="theme.toolboxEmpasisColor" title="Empasis"></config-color>
<config-color :color.sync="theme.toolboxEmphasisColor" title="Emphasis"></config-color>
</form>
</div>
</div>
Expand Down Expand Up @@ -304,11 +304,11 @@ <h4 class="panel-title">
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolTri" value="triangle" @change="updateSymbol('triangle')" />
<label for="symbolTri">Rectangle</label>
<label for="symbolTri">Triangle</label>
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolTriE" value="triangle" @change="updateSymbol('emptyTriangle')" />
<label for="symbolTriE">Empty Rectangle</label>
<label for="symbolTriE">Empty Triangle</label>
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolDiamond" value="diamond" @change="updateSymbol('diamond')" />
Expand All @@ -319,16 +319,16 @@ <h4 class="panel-title">
<label for="symbolDiamondE">Empty Diamond</label>
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolCircle" value="pin" @change="updateSymbol('pin')" />
<input type="radio" name="symbol" id="symbolPin" value="pin" @change="updateSymbol('pin')" />
<label for="symbolPin">Pin</label>
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolCircleE" value="pin" @change="updateSymbol('emptyPin')" />
<input type="radio" name="symbol" id="symbolPinE" value="pin" @change="updateSymbol('emptyPin')" />
<label for="symbolPinE">Empty Pin</label>
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolArrow" value="arrow" @change="updateSymbol('arrow')" />
<label for="symbolArrowE">Arrow</label>
<label for="symbolArrow">Arrow</label>
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolArrowE" value="arrow" @change="updateSymbol('emptyArrow')" />
Expand Down Expand Up @@ -509,11 +509,11 @@ <h4 class="modal-title">Theme Download</h4>

</div>

<script src="//cdn.jsdelivr.net/npm/echarts@4/dist/echarts.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/echarts@4/dist/echarts-en.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/lodash@4.17.19/lodash.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/bootstrap-colorpicker@2.5.3/dist/js/bootstrap-colorpicker.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/vue@1.0.28/dist/vue.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/highlightjs@9.16.2/highlight.pack.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/file-saver@2.0.2/dist/FileSaver.min.js"></script>

<script src="./theme-builder/app.min.js"></script>
<script src="./theme-builder/app.min.js"></script>
19 changes: 10 additions & 9 deletions app/en/index.html
Expand Up @@ -57,7 +57,7 @@ <h4 class="panel-title">
</button>
<button type="button" class="btn btn-default" @click="newTheme()">
<span class="glyphicon glyphicon-repeat"></span>
Repeat
Reset
</button>
<button class="btn btn-default" data-toggle="modal" data-target="#download-modal">
<span class="glyphicon glyphicon-question-sign"></span>
Expand Down Expand Up @@ -149,7 +149,7 @@ <h4 class="panel-title">
<div class="form-group">
<div class="col-sm-12">
<input v-model="theme.axisSeperateSetting" @change="axisSeperateSettingChanges()" type="checkbox" id="axisSeperateSetting" />
<label for="axisSeperateSetting" class="control-label">Change Config For Each Axis Types</label>
<label for="axisSeperateSetting" class="control-label">Change Config For Each Axis Type</label>
</div>
</div>
<div class="axis-group" v-for="axis in theme.axis" v-if="$index > 0 || !theme.axisSeperateSetting">
Expand Down Expand Up @@ -194,7 +194,7 @@ <h4 class="panel-title">
<div class="panel-body">
<form class="form-horizontal">
<config-color :color.sync="theme.toolboxColor" title="Item"></config-color>
<config-color :color.sync="theme.toolboxEmpasisColor" title="Empasis"></config-color>
<config-color :color.sync="theme.toolboxEmphasisColor" title="Emphasis"></config-color>
</form>
</div>
</div>
Expand Down Expand Up @@ -319,11 +319,11 @@ <h4 class="panel-title">
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolTri" value="triangle" @change="updateSymbol('triangle')" />
<label for="symbolTri">Rectangle</label>
<label for="symbolTri">Triangle</label>
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolTriE" value="triangle" @change="updateSymbol('emptyTriangle')" />
<label for="symbolTriE">Empty Rectangle</label>
<label for="symbolTriE">Empty Triangle</label>
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolDiamond" value="diamond" @change="updateSymbol('diamond')" />
Expand All @@ -334,16 +334,16 @@ <h4 class="panel-title">
<label for="symbolDiamondE">Empty Diamond</label>
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolCircle" value="pin" @change="updateSymbol('pin')" />
<input type="radio" name="symbol" id="symbolPin" value="pin" @change="updateSymbol('pin')" />
<label for="symbolPin">Pin</label>
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolCircleE" value="pin" @change="updateSymbol('emptyPin')" />
<input type="radio" name="symbol" id="symbolPinE" value="pin" @change="updateSymbol('emptyPin')" />
<label for="symbolPinE">Empty Pin</label>
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolArrow" value="arrow" @change="updateSymbol('arrow')" />
<label for="symbolArrowE">Arrow</label>
<label for="symbolArrow">Arrow</label>
</div>
<div class="col-sm-12">
<input type="radio" name="symbol" id="symbolArrowE" value="arrow" @change="updateSymbol('emptyArrow')" />
Expand Down Expand Up @@ -524,13 +524,14 @@ <h4 class="modal-title">Theme Download</h4>

</div>

<script src="//cdn.jsdelivr.net/npm/echarts@4/dist/echarts.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/echarts@4/dist/echarts-en.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/lodash@4.17.19/lodash.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/bootstrap-colorpicker@2.5.3/dist/js/bootstrap-colorpicker.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/vue@1.0.28/dist/vue.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/highlightjs@9.16.2/highlight.pack.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/file-saver@2.0.2/dist/FileSaver.min.js"></script>

<script src="./theme-builder/app.min.js"></script>

</body>
</html>
2 changes: 1 addition & 1 deletion app/en/theme-builder/app.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/en/theme-builder/themes/chalk.json
Expand Up @@ -145,7 +145,7 @@
],
"axisSeperateSetting": false,
"toolboxColor": "#999999",
"toolboxEmpasisColor": "#666666",
"toolboxEmphasisColor": "#666666",
"tooltipAxisColor": "#cccccc",
"tooltipAxisWidth": 1,
"timelineLineColor": "#87f7cf",
Expand All @@ -166,4 +166,4 @@
"datazoomHandleWidth": "100",
"datazoomLabelColor": "#333333"
}
}
}
4 changes: 2 additions & 2 deletions app/en/theme-builder/themes/dark.json
Expand Up @@ -148,7 +148,7 @@
],
"axisSeperateSetting": false,
"toolboxColor": "#999",
"toolboxEmpasisColor": "#666",
"toolboxEmphasisColor": "#666",
"tooltipAxisColor": "#eeeeee",
"tooltipAxisWidth": "1",
"timelineLineColor": "#eeeeee",
Expand All @@ -169,4 +169,4 @@
"datazoomHandleWidth": "100",
"datazoomLabelColor": "#eeeeee"
}
}
}
2 changes: 1 addition & 1 deletion app/en/theme-builder/themes/default.json
Expand Up @@ -149,7 +149,7 @@
],
"axisSeperateSetting": true,
"toolboxColor": "#999999",
"toolboxEmpasisColor": "#666666",
"toolboxEmphasisColor": "#666666",
"tooltipAxisColor": "#cccccc",
"tooltipAxisWidth": 1,
"timelineLineColor": "#293c55",
Expand Down
4 changes: 2 additions & 2 deletions app/en/theme-builder/themes/essos.json
Expand Up @@ -147,7 +147,7 @@
],
"axisSeperateSetting": false,
"toolboxColor": "#999",
"toolboxEmpasisColor": "#666",
"toolboxEmphasisColor": "#666",
"tooltipAxisColor": "#ccc",
"tooltipAxisWidth": 1,
"timelineLineColor": "#893448",
Expand All @@ -168,4 +168,4 @@
"datazoomHandleWidth": "100",
"datazoomLabelColor": "#333"
}
}
}
4 changes: 2 additions & 2 deletions app/en/theme-builder/themes/halloween.json
Expand Up @@ -143,7 +143,7 @@
],
"axisSeperateSetting": false,
"toolboxColor": "#999999",
"toolboxEmpasisColor": "#666666",
"toolboxEmphasisColor": "#666666",
"tooltipAxisColor": "#cccccc",
"tooltipAxisWidth": 1,
"timelineLineColor": "#ffaf51",
Expand All @@ -164,4 +164,4 @@
"datazoomHandleWidth": "100",
"datazoomLabelColor": "#999999"
}
}
}
2 changes: 1 addition & 1 deletion app/en/theme-builder/themes/infographic.json
Expand Up @@ -152,7 +152,7 @@
],
"axisSeperateSetting": true,
"toolboxColor": "#c1232b",
"toolboxEmpasisColor": "#e87c25",
"toolboxEmphasisColor": "#e87c25",
"tooltipAxisColor": "#27727b",
"tooltipAxisWidth": 1,
"timelineLineColor": "#293c55",
Expand Down
2 changes: 1 addition & 1 deletion app/en/theme-builder/themes/macarons.json
Expand Up @@ -156,7 +156,7 @@
],
"axisSeperateSetting": true,
"toolboxColor": "#2ec7c9",
"toolboxEmpasisColor": "#18a4a6",
"toolboxEmphasisColor": "#18a4a6",
"tooltipAxisColor": "#008acd",
"tooltipAxisWidth": "1",
"timelineLineColor": "#008acd",
Expand Down
4 changes: 2 additions & 2 deletions app/en/theme-builder/themes/purple-passion.json
Expand Up @@ -145,7 +145,7 @@
],
"axisSeperateSetting": false,
"toolboxColor": "#999",
"toolboxEmpasisColor": "#666",
"toolboxEmphasisColor": "#666",
"tooltipAxisColor": "#ccc",
"tooltipAxisWidth": 1,
"timelineLineColor": "#8fd3e8",
Expand All @@ -166,4 +166,4 @@
"datazoomHandleWidth": "100",
"datazoomLabelColor": "#333"
}
}
}
2 changes: 1 addition & 1 deletion app/en/theme-builder/themes/roma.json
Expand Up @@ -157,7 +157,7 @@
],
"axisSeperateSetting": true,
"toolboxColor": "#999999",
"toolboxEmpasisColor": "#666666",
"toolboxEmphasisColor": "#666666",
"tooltipAxisColor": "#cccccc",
"tooltipAxisWidth": 1,
"timelineLineColor": "#293c55",
Expand Down
2 changes: 1 addition & 1 deletion app/en/theme-builder/themes/shine.json
Expand Up @@ -139,7 +139,7 @@
],
"axisSeperateSetting": true,
"toolboxColor": "#06467c",
"toolboxEmpasisColor": "#4187c2",
"toolboxEmphasisColor": "#4187c2",
"tooltipAxisColor": "#cccccc",
"tooltipAxisWidth": 1,
"timelineLineColor": "#005eaa",
Expand Down
2 changes: 1 addition & 1 deletion app/en/theme-builder/themes/vintage.json
Expand Up @@ -148,7 +148,7 @@
],
"axisSeperateSetting": true,
"toolboxColor": "#999999",
"toolboxEmpasisColor": "#666666",
"toolboxEmphasisColor": "#666666",
"tooltipAxisColor": "#cccccc",
"tooltipAxisWidth": 1,
"timelineLineColor": "#293c55",
Expand Down
4 changes: 2 additions & 2 deletions app/en/theme-builder/themes/walden.json
Expand Up @@ -143,7 +143,7 @@
],
"axisSeperateSetting": false,
"toolboxColor": "#999999",
"toolboxEmpasisColor": "#666666",
"toolboxEmphasisColor": "#666666",
"tooltipAxisColor": "#cccccc",
"tooltipAxisWidth": 1,
"timelineLineColor": "#626c91",
Expand All @@ -164,4 +164,4 @@
"datazoomHandleWidth": "100",
"datazoomLabelColor": "#999999"
}
}
}
4 changes: 2 additions & 2 deletions app/en/theme-builder/themes/westeros.json
Expand Up @@ -144,7 +144,7 @@
],
"axisSeperateSetting": false,
"toolboxColor": "#999",
"toolboxEmpasisColor": "#666",
"toolboxEmphasisColor": "#666",
"tooltipAxisColor": "#ccc",
"tooltipAxisWidth": 1,
"timelineLineColor": "#8fd3e8",
Expand All @@ -165,4 +165,4 @@
"datazoomHandleWidth": "100",
"datazoomLabelColor": "#333"
}
}
}
4 changes: 2 additions & 2 deletions app/en/theme-builder/themes/wonderland.json
Expand Up @@ -144,7 +144,7 @@
],
"axisSeperateSetting": false,
"toolboxColor": "#999999",
"toolboxEmpasisColor": "#666666",
"toolboxEmphasisColor": "#666666",
"tooltipAxisColor": "#cccccc",
"tooltipAxisWidth": 1,
"timelineLineColor": "#4ea397",
Expand All @@ -165,4 +165,4 @@
"datazoomHandleWidth": "100",
"datazoomLabelColor": "#999999"
}
}
}
4 changes: 2 additions & 2 deletions app/scripts/main.js
Expand Up @@ -170,7 +170,7 @@ var defaultTheme = {
axis: null,

toolboxColor: '#999',
toolboxEmpasisColor: '#666',
toolboxEmphasisColor: '#666',

tooltipAxisColor: '#ccc',
tooltipAxisWidth: 1,
Expand Down Expand Up @@ -520,7 +520,7 @@ function getTheme(isToExport) {
borderColor: vm.theme.toolboxColor
},
emphasis: {
borderColor: vm.theme.toolboxEmpasisColor
borderColor: vm.theme.toolboxEmphasisColor
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/main_en.js
Expand Up @@ -168,7 +168,7 @@ var defaultTheme = {
axis: null,

toolboxColor: '#999',
toolboxEmpasisColor: '#666',
toolboxEmphasisColor: '#666',

tooltipAxisColor: '#ccc',
tooltipAxisWidth: 1,
Expand Down Expand Up @@ -518,7 +518,7 @@ function getTheme(isToExport) {
borderColor: vm.theme.toolboxColor
},
emphasis: {
borderColor: vm.theme.toolboxEmpasisColor
borderColor: vm.theme.toolboxEmphasisColor
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions app/themes/chalk.json
Expand Up @@ -145,7 +145,7 @@
],
"axisSeperateSetting": false,
"toolboxColor": "#999999",
"toolboxEmpasisColor": "#666666",
"toolboxEmphasisColor": "#666666",
"tooltipAxisColor": "#cccccc",
"tooltipAxisWidth": 1,
"timelineLineColor": "#87f7cf",
Expand All @@ -166,4 +166,4 @@
"datazoomHandleWidth": "100",
"datazoomLabelColor": "#333333"
}
}
}

0 comments on commit 67db87b

Please sign in to comment.