diff --git a/octoprint_cyborgtheme/static/css/overrides-min.css b/octoprint_cyborgtheme/static/css/overrides-min.css
index b363757..4359348 100644
--- a/octoprint_cyborgtheme/static/css/overrides-min.css
+++ b/octoprint_cyborgtheme/static/css/overrides-min.css
@@ -1 +1 @@
-.octoprint-container .accordion-heading [class*=" icon-"],.octoprint-container .accordion-heading [class^=icon-]{color:#ccc}.octoprint-container .accordion-heading .accordion-heading-button a{color:#e0e0e0}.octoprint-container .accordion-heading .accordion-heading-button a:hover{color:#fff;background-color:#2ab2e4}.dropdown-menu > li > a{color:#e0e0e0}.dropdown-submenu > a:after{border-left-color:#e0e0e0}.close,.close:hover{color:#f00;text-shadow:0 1px 0 #555;opacity:0.7}#job_cancel,#job_cancel:hover,#job_cancel:focus,#job_cancel:active{color:#fff;background-color:#bd362f;background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border:1px solid #bd362f}#job_cancel.btn.disabled,#job_cancel.btn[disabled],#job_cancel.btn:hover[disabled]{color:#fff;opacity:0.65;background-color:#5c5c5c;border:1px solid #5c5c5c;background-image:none}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none}table td.timelapse_files_action a.icon-trash,table td.timelapse_unrendered_action a.icon-trash,table th.timelapse_files_action a.icon-trash,table th.timelapse_unrendered_action a.icon-trash{color:#f00}table td.timelapse_files_action a.icon-trash.disabled,table td.timelapse_unrendered_action a.icon-trash.disabled,table th.timelapse_files_action a.icon-trash.disabled,table th.timelapse_unrendered_action a.icon-trash.disabled{color:#000;cursor:not-allowed}table td.timelapse_files_action a,table td.timelapse_unrendered_action a,table th.timelapse_files_action a,table th.timelapse_unrendered_action a,table td.settings_logs_action a,table th.settings_logs_action a{color:#02cc00}table th.settings_plugin_plugin_manager_plugins_actions a.icon-trash,table td.settings_plugin_plugin_manager_plugins_actions a.icon-trash,table td.settings_logs_action a.icon-trash,table th.settings_logs_action a.icon-trash{color:#f00}table th.settings_plugin_plugin_manager_plugins_actions a.icon-trash.disabled,table td.settings_plugin_plugin_manager_plugins_actions a.icon-trash.disabled{color:#000;cursor:not-allowed}table th.settings_plugin_plugin_manager_plugins_actions a,table td.settings_plugin_plugin_manager_plugins_actions a,table td.settings_plugin_announcements_channels_actions a,table th.settings_plugin_announcements_channels_actions a{color:#fff}table td.settings_plugin_announcements_channels_actions a.disabled,table th.settings_plugin_announcements_channels_actions a.disabled{color:#000;cursor:not-allowed}table td.settings_printerProfiles_profiles_action a.icon-star,table th.settings_printerProfiles_profiles_action a.icon-star{color:#ffbe00}table td.settings_printerProfiles_profiles_action a.icon-pencil,table th.settings_printerProfiles_profiles_action a.icon-pencil{color:#00abff}table td.settings_printerProfiles_profiles_action a.icon-trash,table th.settings_printerProfiles_profiles_action a.icon-trash{color:#f00}table td.settings_users_actions a.icon-pencil,table th.settings_users_actions a.icon-pencil{color:#00abff}table td.settings_users_actions a.icon-key,table th.settings_users_actions a.icon-key{color:#0cdc00}table td.settings_users_actions a.icon-trash,table th.settings_users_actions a.icon-trash{color:#f00}.icon-sd-black-14{background:url(../img/icon-sd-light-14.png) 0 3px no-repeat;width:11px;height:17px;display:inline-block!important}.table-hover tbody tr:hover td,.table-hover tbody tr:hover th{background-color:#000;color:#ddd}#files .gcode_files .entry:hover{background-color:#000;color:#ddd}.pagination ul > .active > a,.pagination ul > .active > span{color:#000000}.nav-tabs > .active > a,.nav-tabs > .active > a:hover,.nav-tabs > .active > a:focus{color:#ffffff;background-color:#33b5e5}.octoprint-container .tab-content h1{color:#adafae}.tabbable .nav-tabs,.tabbable .nav-tabs li.active > a{border-color:#ddd}.tab-content{overflow:visible}.navbar{min-width:960px}.navbar .nav{font-size:13px;position:relative;left:0;display:block;float:left;margin:0 10px 0 0;margin-top:0px;margin-right:5px;margin-bottom:0px;margin-left:0px}.navbar .navbar-text{padding:15px 0px 0px}.nav-tabs li > a:hover,.nav-tabs li.active > a,.nav-tabs li.active > a:hover{border-color:#fff}.fileinput-button input{position:absolute;top:0;right:0;margin:0;opacity:0;filter:alpha(opacity=0);transform:translate(-300px,0) scale(4);font-size:23px;direction:ltr;cursor:pointer}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}input:-moz-placeholder,textarea:-moz-placeholder{color:#444!important}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#444!important}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#444!important}.input-append .add-on,.input-prepend .add-on{color:#222;text-shadow:0 1px 0 #d4d4d4}input[type="file"]{height:20px}
\ No newline at end of file
+.octoprint-container .accordion-heading [class*=" icon-"],.octoprint-container .accordion-heading [class^=icon-]{color:#ccc}.octoprint-container .accordion-heading .accordion-heading-button a{color:#e0e0e0}.octoprint-container .accordion-heading .accordion-heading-button a:hover{color:#fff;background-color:#2ab2e4}.dropdown-menu > li > a{color:#e0e0e0}.dropdown-submenu > a:after{border-left-color:#e0e0e0}.dropdown-menu-right{right:0;left:auto}.close,.close:hover{color:#f00;text-shadow:0 1px 0 #555;opacity:0.7}#job_cancel,#job_cancel:hover,#job_cancel:focus,#job_cancel:active{color:#fff;background-color:#bd362f;background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border:1px solid #bd362f}#job_cancel.btn.disabled,#job_cancel.btn[disabled],#job_cancel.btn:hover[disabled]{color:#fff;opacity:0.65;background-color:#5c5c5c;border:1px solid #5c5c5c;background-image:none}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none}table td.timelapse_files_action a.icon-trash,table td.timelapse_unrendered_action a.icon-trash,table th.timelapse_files_action a.icon-trash,table th.timelapse_unrendered_action a.icon-trash{color:#f00}table td.timelapse_files_action a.icon-trash.disabled,table td.timelapse_unrendered_action a.icon-trash.disabled,table th.timelapse_files_action a.icon-trash.disabled,table th.timelapse_unrendered_action a.icon-trash.disabled{color:#000;cursor:not-allowed}table td.timelapse_files_action a,table td.timelapse_unrendered_action a,table th.timelapse_files_action a,table th.timelapse_unrendered_action a,table td.settings_logs_action a,table th.settings_logs_action a{color:#02cc00}table th.settings_plugin_plugin_manager_plugins_actions a.icon-trash,table td.settings_plugin_plugin_manager_plugins_actions a.icon-trash,table td.settings_logs_action a.icon-trash,table th.settings_logs_action a.icon-trash{color:#f00}table th.settings_plugin_plugin_manager_plugins_actions a.icon-trash.disabled,table td.settings_plugin_plugin_manager_plugins_actions a.icon-trash.disabled{color:#000;cursor:not-allowed}table th.settings_plugin_plugin_manager_plugins_actions a,table td.settings_plugin_plugin_manager_plugins_actions a,table td.settings_plugin_announcements_channels_actions a,table th.settings_plugin_announcements_channels_actions a{color:#fff}table td.settings_plugin_announcements_channels_actions a.disabled,table th.settings_plugin_announcements_channels_actions a.disabled{color:#000;cursor:not-allowed}table td.settings_printerProfiles_profiles_action a.icon-star,table th.settings_printerProfiles_profiles_action a.icon-star{color:#ffbe00}table td.settings_printerProfiles_profiles_action a.icon-pencil,table th.settings_printerProfiles_profiles_action a.icon-pencil{color:#00abff}table td.settings_printerProfiles_profiles_action a.icon-trash,table th.settings_printerProfiles_profiles_action a.icon-trash{color:#f00}table td.settings_users_actions a.icon-pencil,table th.settings_users_actions a.icon-pencil{color:#00abff}table td.settings_users_actions a.icon-key,table th.settings_users_actions a.icon-key{color:#0cdc00}table td.settings_users_actions a.icon-trash,table th.settings_users_actions a.icon-trash{color:#f00}.icon-sd-black-14{background:url(../img/icon-sd-light-14.png) 0 3px no-repeat;width:11px;height:17px;display:inline-block!important}.table-hover tbody tr:hover td,.table-hover tbody tr:hover th{background-color:#000;color:#ddd}#files .gcode_files .entry:hover{background-color:#000;color:#ddd}.pagination ul > .active > a,.pagination ul > .active > span{color:#000000}.nav-tabs > .active > a,.nav-tabs > .active > a:hover,.nav-tabs > .active > a:focus{color:#ffffff;background-color:#33b5e5}.octoprint-container .tab-content h1{color:#adafae}.tabbable .nav-tabs,.tabbable .nav-tabs li.active > a{border-color:#ddd}.tab-content{overflow:visible}.navbar{min-width:960px}.navbar .nav{font-size:13px;position:relative;left:0;display:block;float:left;margin:0 10px 0 0;margin-top:0px;margin-right:5px;margin-bottom:0px;margin-left:0px}.navbar .navbar-text{padding:15px 0px 0px}.nav-tabs li > a:hover,.nav-tabs li.active > a,.nav-tabs li.active > a:hover{border-color:#fff}.fileinput-button input{position:absolute;top:0;right:0;margin:0;opacity:0;filter:alpha(opacity=0);transform:translate(-300px,0) scale(4);font-size:23px;direction:ltr;cursor:pointer}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}input:-moz-placeholder,textarea:-moz-placeholder{color:#444!important}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#444!important}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#444!important}.input-append .add-on,.input-prepend .add-on{color:#222;text-shadow:0 1px 0 #d4d4d4}.progress{color:#eee;background-color:#444;background-image:linear-gradient(to bottom,#555,#333);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}input[type="file"]{height:20px}#touch h3,#touch h4{color:black;font-weight:bold}#touch legend,#touch label{color:black}#touch .help-block,#touch .help-inline{color:#595959}#touch .navbar{min-width:1px}#touch .nav-list li > a:hover{color:#fff;background-color:#000000}#touch #terminal-filterpanel label{color:#ddd}
\ No newline at end of file
diff --git a/octoprint_cyborgtheme/static/css/overrides.css b/octoprint_cyborgtheme/static/css/overrides.css
index 3fc892a..519f0c6 100644
--- a/octoprint_cyborgtheme/static/css/overrides.css
+++ b/octoprint_cyborgtheme/static/css/overrides.css
@@ -26,6 +26,12 @@
border-left-color: #e0e0e0;
}
+/*timelapse file sorting dropdown*/
+.dropdown-menu-right {
+ right: 0;
+ left: auto;
+}
+
/*close button*/
.close,
.close:hover {
@@ -297,7 +303,48 @@ textarea::-webkit-input-placeholder {
text-shadow: 0 1px 0 #d4d4d4;
}
+/*Make progress bar easier to see*/
+.progress {
+ color: #eee;
+ background-color: #444;
+ background-image: linear-gradient(to bottom, #555, #333);
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+}
+
/*fix plugin archive upload button height*/
input[type="file"] {
height: 20px;
}
+
+/*touchui fixes*/
+
+/*page headings*/
+#touch h3, #touch h4 {
+ color: black;
+ font-weight: bold;
+}
+/*page text labels*/
+#touch legend, #touch label {
+ color: black;
+}
+/*help text*/
+#touch .help-block, #touch .help-inline {
+ color: #595959;
+}
+/*previous navbar min width fix still works on regular browsers but caused touchui to have to scroll, this is my dirty workaround*/
+#touch .navbar {
+ min-width: 1px;
+}
+
+/*settings pages drop down list*/
+#touch .nav-list li > a:hover {
+ color: #fff;
+ background-color: #000000;
+}
+
+/*terminal page filter labels*/
+#touch #terminal-filterpanel label {
+ color: #ddd;
+}
\ No newline at end of file
diff --git a/octoprint_cyborgtheme/static/font/FontAwesome.otf b/octoprint_cyborgtheme/static/font/FontAwesome.otf
deleted file mode 100644
index 7012545..0000000
Binary files a/octoprint_cyborgtheme/static/font/FontAwesome.otf and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/font/fontawesome-webfont.eot b/octoprint_cyborgtheme/static/font/fontawesome-webfont.eot
deleted file mode 100644
index 0662cb9..0000000
Binary files a/octoprint_cyborgtheme/static/font/fontawesome-webfont.eot and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/font/fontawesome-webfont.svg b/octoprint_cyborgtheme/static/font/fontawesome-webfont.svg
deleted file mode 100644
index 2edb4ec..0000000
--- a/octoprint_cyborgtheme/static/font/fontawesome-webfont.svg
+++ /dev/null
@@ -1,399 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/octoprint_cyborgtheme/static/font/fontawesome-webfont.ttf b/octoprint_cyborgtheme/static/font/fontawesome-webfont.ttf
deleted file mode 100644
index d365924..0000000
Binary files a/octoprint_cyborgtheme/static/font/fontawesome-webfont.ttf and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/font/fontawesome-webfont.woff b/octoprint_cyborgtheme/static/font/fontawesome-webfont.woff
deleted file mode 100644
index b9bd17e..0000000
Binary files a/octoprint_cyborgtheme/static/font/fontawesome-webfont.woff and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/apple-touch-icon-114x114.png b/octoprint_cyborgtheme/static/img/apple-touch-icon-114x114.png
deleted file mode 100644
index 2c8ceea..0000000
Binary files a/octoprint_cyborgtheme/static/img/apple-touch-icon-114x114.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/apple-touch-icon-144x144.png b/octoprint_cyborgtheme/static/img/apple-touch-icon-144x144.png
deleted file mode 100644
index d9afa71..0000000
Binary files a/octoprint_cyborgtheme/static/img/apple-touch-icon-144x144.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/favicon.svg b/octoprint_cyborgtheme/static/img/favicon.svg
deleted file mode 100644
index a16a1a3..0000000
--- a/octoprint_cyborgtheme/static/img/favicon.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
diff --git a/octoprint_cyborgtheme/static/img/glyphicons-halflings-white.png b/octoprint_cyborgtheme/static/img/glyphicons-halflings-white.png
deleted file mode 100644
index 3bf6484..0000000
Binary files a/octoprint_cyborgtheme/static/img/glyphicons-halflings-white.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/glyphicons-halflings.png b/octoprint_cyborgtheme/static/img/glyphicons-halflings.png
deleted file mode 100644
index a996999..0000000
Binary files a/octoprint_cyborgtheme/static/img/glyphicons-halflings.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/graph-background.png b/octoprint_cyborgtheme/static/img/graph-background.png
deleted file mode 100644
index aa93d01..0000000
Binary files a/octoprint_cyborgtheme/static/img/graph-background.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/icon-sd-black-14.png b/octoprint_cyborgtheme/static/img/icon-sd-black-14.png
deleted file mode 100644
index 7f0255a..0000000
Binary files a/octoprint_cyborgtheme/static/img/icon-sd-black-14.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/logo.png b/octoprint_cyborgtheme/static/img/logo.png
deleted file mode 100644
index bf5286f..0000000
Binary files a/octoprint_cyborgtheme/static/img/logo.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/tentacle-20x20-light.png b/octoprint_cyborgtheme/static/img/tentacle-20x20-light.png
deleted file mode 100644
index 555f4de..0000000
Binary files a/octoprint_cyborgtheme/static/img/tentacle-20x20-light.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/tentacle-20x20-light@2x.png b/octoprint_cyborgtheme/static/img/tentacle-20x20-light@2x.png
deleted file mode 100644
index c7b2d92..0000000
Binary files a/octoprint_cyborgtheme/static/img/tentacle-20x20-light@2x.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/tentacle-20x20.png b/octoprint_cyborgtheme/static/img/tentacle-20x20.png
deleted file mode 100644
index ba16913..0000000
Binary files a/octoprint_cyborgtheme/static/img/tentacle-20x20.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/tentacle-20x20@2x.png b/octoprint_cyborgtheme/static/img/tentacle-20x20@2x.png
deleted file mode 100644
index f32db7c..0000000
Binary files a/octoprint_cyborgtheme/static/img/tentacle-20x20@2x.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/tentacle-22x22.png b/octoprint_cyborgtheme/static/img/tentacle-22x22.png
deleted file mode 100644
index 5010eba..0000000
Binary files a/octoprint_cyborgtheme/static/img/tentacle-22x22.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/tentacle-32x32.png b/octoprint_cyborgtheme/static/img/tentacle-32x32.png
deleted file mode 100644
index de8ef20..0000000
Binary files a/octoprint_cyborgtheme/static/img/tentacle-32x32.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/tentacle-76x76.png b/octoprint_cyborgtheme/static/img/tentacle-76x76.png
deleted file mode 100644
index 6bfb1a5..0000000
Binary files a/octoprint_cyborgtheme/static/img/tentacle-76x76.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/trans-background.png b/octoprint_cyborgtheme/static/img/trans-background.png
deleted file mode 100644
index 903bdab..0000000
Binary files a/octoprint_cyborgtheme/static/img/trans-background.png and /dev/null differ
diff --git a/octoprint_cyborgtheme/static/img/watermark.png b/octoprint_cyborgtheme/static/img/watermark.png
deleted file mode 100644
index 18d559f..0000000
Binary files a/octoprint_cyborgtheme/static/img/watermark.png and /dev/null differ
diff --git a/setup.py b/setup.py
index f1d5029..6b32526 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
plugin_name = "OctoPrint-CyborgTheme"
-plugin_version = "0.1.1"
+plugin_version = "0.1.2"
plugin_description = """Bootstrap Cyborg theme ( https://bootswatch.com/2/cyborg/ ) adapted for octoprint."""