pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some more FontAwesome related things

Browse source 
* remove some more "fa" classes where they didn't belong
  * use "fa-toggle-(on|off)" instead of circles where they were used
    to signify toggle actions
  * fix SD card icon being too high

Another follow-up to #1915
This commit is contained in:
Gina Häußge 2017-07-21 12:29:18 +02:00
parent a6d3299b91
commit e06c09e206
7 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/plugins/announcements/static/js/announcements.js
View file

@ -40,7 +40,7 @@ $(function() {
};
self.toggleButtonCss = function(data) {
var icon = data.enabled ? "fa fa-circle" : "fa fa-circle-o";
var icon = data.enabled ? "fa fa-toggle-on" : "fa fa-toggle-off";
var disabled = (self.enableToggle(data)) ? "" : " disabled";
return icon + disabled;

2
src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
View file

@ -816,7 +816,7 @@ $(function() {
};
self.toggleButtonCss = function(data) {
var icon = self._getToggleCommand(data) == "enable" ? "fa fa-circle-o" : "fa fa-circle";
var icon = self._getToggleCommand(data) == "enable" ? "fa fa-toggle-off" : "fa fa-toggle-on";
var disabled = (self.enableToggle(data)) ? "" : " disabled";
return icon + disabled;

2
src/octoprint/static/css/octoprint.css
View file

File diff suppressed because one or more lines are too long

4
src/octoprint/static/less/octoprint.less
View file

@ -1125,10 +1125,6 @@ textarea.block {
display: inline-block !important;
}
a.dropdown-sd {
padding-top: 4px !important;
}
.center {
float: none;
margin-left: auto;

2
src/octoprint/templates/sidebar/files_header.jinja2
View file

@ -35,7 +35,7 @@
{% if enableSdSupport %}
<div class="sd-trigger accordion-heading-button btn-group">
<a class="dropdown-toggle dropdown-sd" data-toggle="dropdown" href="#" title="{{ _('SD Card operations') }}">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" title="{{ _('SD Card operations') }}">
<span class="icon-sd-black-14"></span>
</a>
<ul class="dropdown-menu">

2
src/octoprint/templates/tabs/control.jinja2
View file

@ -130,7 +130,7 @@
</script>
<script type="text/html" id="customControls_containerTemplate_collapsable">
<div class="custom_section">
<h1 class="fa" data-bind="toggleContent: { class: 'fa-caret-right fa-caret-down', parent: '.custom_section', container: '> div' }"><i class="fa" data-bind="css: {'fa-caret-down': !collapsed, 'fa-caret-right': collapsed}"></i> <span data-bind="text: name"></span></h1>
<h1 data-bind="toggleContent: { class: 'fa-caret-right fa-caret-down', parent: '.custom_section', container: '> div' }"><i class="fa" data-bind="css: {'fa-caret-down': !collapsed, 'fa-caret-right': collapsed}"></i> <span data-bind="text: name"></span></h1>
<!-- ko template: { name: 'customControls_containerTemplate', data: $data } --><!-- /ko -->
</div>
</script>

2
src/octoprint/templates/tabs/timelapse.jinja2
View file

@ -116,7 +116,7 @@
</div>
<div data-bind="visible: unrenderedListHelper.allSize">
<div><small><a href="javascript:void(0)" class="fa muted" onclick="$(this).children().toggleClass('fa-caret-right fa-caret-down').parent().parent().parent().next().slideToggle('fast')"><i class="fa fa-caret-right"></i> {{ _('Unrendered Timelapses') }}</a></small></div>
<div><small><a href="javascript:void(0)" class="muted" onclick="$(this).children().toggleClass('fa-caret-right fa-caret-down').parent().parent().parent().next().slideToggle('fast')"><i class="fa fa-caret-right"></i> {{ _('Unrendered Timelapses') }}</a></small></div>
<div class="hide">
<div class="pull-left">
<div class="btn-group">