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 #24 from ntoff/addLessFiles
Browse files Browse the repository at this point in the history
tweak active button colour
  • Loading branch information
ntoff authored Nov 24, 2017
2 parents c2f9f71 + 3bc533a commit b4d6cf1
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 0 deletions.
32 changes: 32 additions & 0 deletions octoprint_cyborgtheme/static/css/cyborg.css
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,38 @@
color: #bfbfbf;
cursor: not-allowed;
}
.Cyborg .btn-group > .btn.active {
z-index: 3;
color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #424242;
background-image: -moz-linear-gradient(top, #4d4d4d, #333333);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4d4d4d), to(#333333));
background-image: -webkit-linear-gradient(top, #4d4d4d, #333333);
background-image: -o-linear-gradient(top, #4d4d4d, #333333);
background-image: linear-gradient(to bottom, #4d4d4d, #333333);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4d4d4d', endColorstr='#ff333333', GradientType=0);
border-color: #333333 #333333 #0d0d0d;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
*background-color: #333333;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
}
.Cyborg .btn-group > .btn.active:hover,
.Cyborg .btn-group > .btn.active:focus,
.Cyborg .btn-group > .btn.active:active,
.Cyborg .btn-group > .btn.active.active,
.Cyborg .btn-group > .btn.active.disabled,
.Cyborg .btn-group > .btn.active[disabled] {
color: #fff;
background-color: #333333;
*background-color: #262626;
}
.Cyborg .btn-group > .btn.active:active,
.Cyborg .btn-group > .btn.active.active {
background-color: #191919 \9;
}
.Cyborg #job_cancel,
.Cyborg #job_cancel:hover,
.Cyborg #job_cancel:focus,
Expand Down
5 changes: 5 additions & 0 deletions octoprint_cyborgtheme/static/less/cyborg.less
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,11 @@
}
}

.btn-group>.btn.active {
z-index: 3;
.buttonBackground(darken(@gray, 30%), darken(@gray, 40%));
}

#job_cancel, #job_cancel:hover, #job_cancel:focus, #job_cancel:active {
color: @almostNotWhite;
background-color: #bd362f;
Expand Down

0 comments on commit b4d6cf1

Please sign in to comment.