Skip to content

Commit

Permalink
Merge pull request #1695 from natefoo/help-message-css
Browse files Browse the repository at this point in the history
[16.01] Update help text rST note/warning/error box styling for change in div class from toolHelpBody to ui-form-help.
  • Loading branch information
martenson committed Feb 8, 2016
2 parents ef6bd90 + 5e77af1 commit 054c04f
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
10 changes: 5 additions & 5 deletions client/galaxy/style/less/base.less
Expand Up @@ -744,7 +744,7 @@ input[type="submit"], button {

// Messages

.errormessagelarge, .warningmessagelarge, .donemessagelarge, .infomessagelarge, .toolHelpBody .error, .toolHelpBody .warning, .toolHelpBody .note {
.errormessagelarge, .warningmessagelarge, .donemessagelarge, .infomessagelarge, .ui-form-help .error, .ui-form-help .warning, .ui-form-help .note {
.alert();
min-height: 36px;
padding-left: 52px;
Expand Down Expand Up @@ -782,7 +782,7 @@ input[type="submit"], button {
background-image: none;
}

.errormessage, .warningmessage, .donemessage, .infomessage, .errormessagesmall, .warningmessagesmall, .donemessagesmall, .infomessagesmall, toolHelpBody .error, .toolHelpBody .warning, .toolHelpBody .note {
.errormessage, .warningmessage, .donemessage, .infomessage, .errormessagesmall, .warningmessagesmall, .donemessagesmall, .infomessagesmall, .ui-form-help .error, .ui-form-help .warning, .ui-form-help .note {
.alert();
padding: 5px;
padding-left: 25px;
Expand All @@ -794,11 +794,11 @@ input[type="submit"], button {
background-position: 5px 5px;
}

.errormessage, .errormessagesmall, .toolHelpBody .error {
.errormessage, .errormessagesmall, .ui-form-help .error {
.alert-danger();
}

.warningmessage, .warningmessagesmall, .toolHelpBody .warning {
.warningmessage, .warningmessagesmall, .ui-form-help .warning {
.alert-warning();
background-image: url(warn_small.png);
}
Expand All @@ -808,7 +808,7 @@ input[type="submit"], button {
background-image: url(ok_small.png);
}

.infomessage, .infomessagesmall, .toolHelpBody .note {
.infomessage, .infomessagesmall, .ui-form-help .note {
.alert-info();
background-image: url(info_small.png);
}
Expand Down
2 changes: 1 addition & 1 deletion static/scripts/bundled/analysis.bundled.js.map

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions static/scripts/bundled/libs.bundled.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/libs.bundled.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/style/blue/base.css

Large diffs are not rendered by default.

0 comments on commit 054c04f

Please sign in to comment.