Merge branch 'master' into bold_fonts
Conflicts: lib/ace/theme/github.css
This commit is contained in:
commit
04030e847e
84 changed files with 3789 additions and 12594 deletions
|
|
@ -1,18 +1,5 @@
|
|||
/* CSS style content from github's default pygments highlighter template.
|
||||
Cursor and selection styles from textmate.css. */
|
||||
.ace-github .ace_editor {
|
||||
color: #333;
|
||||
background-color: #F8F8F8;
|
||||
border: 1px solid #CCC;
|
||||
font: 13px 'Bitstream Vera Sans Mono', Courier, monospace !important;
|
||||
line-height: 19px !important;
|
||||
overflow: auto;
|
||||
padding: 6px 10px;
|
||||
border-radius: 3px;
|
||||
position: relative;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.ace-github .ace_gutter {
|
||||
background: #e8e8e8;
|
||||
color: #AAA;
|
||||
|
|
@ -68,7 +55,7 @@
|
|||
font-weight: normal;
|
||||
}
|
||||
|
||||
.ace-github .ace_variable.ace_instancce {
|
||||
.ace-github .ace_variable.ace_instance {
|
||||
color: teal;
|
||||
}
|
||||
|
||||
|
|
@ -88,13 +75,15 @@
|
|||
border-bottom: 1px solid black;
|
||||
}
|
||||
|
||||
.ace-github .ace_marker-layer .ace_active_line {
|
||||
.ace-github .ace_marker-layer .ace_active-line {
|
||||
background: rgb(255, 255, 204);
|
||||
}
|
||||
|
||||
.ace-github .ace_marker-layer .ace_selection {
|
||||
background: rgb(181, 213, 255);
|
||||
}
|
||||
.ace-github.multiselect .ace_selection.start {
|
||||
|
||||
.ace-github.ace_multiselect .ace_selection.ace_start {
|
||||
box-shadow: 0 0 3px 0px white;
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
|
@ -117,17 +106,17 @@
|
|||
border: 1px solid rgb(192, 192, 192);
|
||||
}
|
||||
|
||||
.ace-github .ace_gutter_active_line {
|
||||
.ace-github .ace_gutter-active-line {
|
||||
background-color : rgba(0, 0, 0, 0.07);
|
||||
}
|
||||
|
||||
.ace-github .ace_marker-layer .ace_selected_word {
|
||||
.ace-github .ace_marker-layer .ace_selected-word {
|
||||
background: rgb(250, 250, 255);
|
||||
border: 1px solid rgb(200, 200, 250);
|
||||
|
||||
}
|
||||
|
||||
.ace-github .ace_print_margin {
|
||||
.ace-github .ace_print-margin {
|
||||
width: 1px;
|
||||
background: #e8e8e8;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue