Skip to content
This repository has been archived by the owner on Jun 28, 2021. It is now read-only.

Commit

Permalink
Merge pull request #14 from ntoff/0.1.2
Browse files Browse the repository at this point in the history
Update to 0.1.2
  • Loading branch information
ntoff authored May 15, 2017
2 parents c977aef + 43f0f9b commit 4b6f07e
Show file tree
Hide file tree
Showing 25 changed files with 49 additions and 468 deletions.
2 changes: 1 addition & 1 deletion octoprint_cyborgtheme/static/css/overrides-min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions octoprint_cyborgtheme/static/css/overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
border-left-color: #e0e0e0;
}

/*timelapse file sorting dropdown*/
.dropdown-menu-right {
right: 0;
left: auto;
}

/*close button*/
.close,
.close:hover {
Expand Down Expand Up @@ -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;
}
Binary file removed octoprint_cyborgtheme/static/font/FontAwesome.otf
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 4b6f07e

Please sign in to comment.