Fixed #280: Some CSS issues when used in combination with bootstrap

This commit is contained in:
jos 2016-03-20 15:55:38 +01:00
parent a78b2ae57a
commit d08e35797b
4 changed files with 24 additions and 9 deletions

View File

@ -7,6 +7,7 @@ https://github.com/josdejong/jsoneditor
- Implemented method `editor.destroy()` to properly cleanup the editor (#278). - Implemented method `editor.destroy()` to properly cleanup the editor (#278).
- Fixed #268: JSONEditor now trims text in fields and values. - Fixed #268: JSONEditor now trims text in fields and values.
- Fixed #280: Some CSS issues when used in combination with bootstrap.
## 2016-02-15, version 5.1.5 ## 2016-02-15, version 5.1.5

View File

@ -37,6 +37,11 @@ div.jsoneditor-contextmenu ul li button {
color: #4d4d4d; color: #4d4d4d;
background: transparent; background: transparent;
font-size: 10pt;
font-family: arial, sans-serif;
box-sizing: border-box;
line-height: 26px; line-height: 26px;
text-align: left; text-align: left;
} }

View File

@ -47,11 +47,18 @@ div.jsoneditor-value.jsoneditor-empty::after {
content: "value"; content: "value";
} }
div.jsoneditor-value.jsoneditor-url { div.jsoneditor-value.jsoneditor-url,
a.jsoneditor-value.jsoneditor-url {
color: green; color: green;
text-decoration: underline; text-decoration: underline;
} }
a.jsoneditor-value.jsoneditor-url {
display: inline-block;
padding: 2px;
margin: 2px;
}
a.jsoneditor-value.jsoneditor-url:hover, a.jsoneditor-value.jsoneditor-url:hover,
a.jsoneditor-value.jsoneditor-url:focus { a.jsoneditor-value.jsoneditor-url:focus {
color: #ee422e; color: #ee422e;

View File

@ -7,10 +7,18 @@ table.jsoneditor-search div.jsoneditor-results {
background: transparent; /* For Firefox */ background: transparent; /* For Firefox */
} }
table.jsoneditor-search div.jsoneditor-results {
color: white;
padding-right: 5px;
line-height: 24px;
}
table.jsoneditor-search { table.jsoneditor-search {
position: absolute; position: absolute;
right: 2px; right: 4px;
top: 2px; top: 4px;
border-collapse: collapse;
border-spacing: 0;
} }
table.jsoneditor-search div.jsoneditor-frame { table.jsoneditor-search div.jsoneditor-frame {
@ -32,12 +40,6 @@ table.jsoneditor-search input {
line-height: 20px; line-height: 20px;
} }
table.jsoneditor-search .jsoneditor-results {
color: #4d4d4d;
padding-right: 5px;
line-height: 24px;
}
table.jsoneditor-search button { table.jsoneditor-search button {
width: 16px; width: 16px;
height: 24px; height: 24px;