github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-06 03:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate editor style sheets

Browse Source
This commit is contained in:
Nathan Sobo
2017-04-20 23:03:59 -06:00
committed by Antonio Scandurra
parent 5bbbe1d790
commit 77f04c47d9
3 changed files with 114 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/atom.less
View File

@@ -22,7 +22,6 @@
@import "panes";
@import "syntax";
@import "text-editor";
@import "text-editor-light";
@import "title-bar";
@import "workspace-view";

162
static/text-editor-light.less
View File

@@ -1,162 +0,0 @@
@import "ui-variables";
@import "octicon-utf-codes";
@import "octicon-mixins";
atom-text-editor {
display: flex;
font-family: Menlo, Consolas, 'DejaVu Sans Mono', monospace;
// .editor--private, .editor-contents--private {
// height: 100%;
// width: 100%;
// background-color: inherit;
// }
//
// .editor-contents--private {
// width: 100%;
// cursor: text;
// display: flex;
// -webkit-user-select: none;
// position: relative;
// }
//
// .gutter-container {
// background-color: inherit;
// }
.gutter {
overflow: hidden;
z-index: 0;
text-align: right;
cursor: default;
min-width: 1em;
box-sizing: border-box;
background-color: inherit;
}
//
// .line-numbers {
// position: relative;
// background-color: inherit;
// }
// .line-number {
// position: relative;
// // white-space: nowrap;
// padding-left: .5em;
// opacity: 0.6;
//
// &.cursor-line {
// opacity: 1;
// }
//
// .icon-right {
// .octicon(chevron-down, 0.8em);
// display: inline-block;
// visibility: hidden;
// opacity: .6;
// padding: 0 .4em;
//
// &::before {
// text-align: center;
// }
// }
// }
.gutter:hover {
.line-number.foldable .icon-right {
visibility: visible;
&:hover {
opacity: 1;
}
}
}
.gutter, .gutter:hover {
.line-number.folded .icon-right {
.octicon(chevron-right, 0.8em);
visibility: visible;
&::before {
position: relative;
left: -.1em;
}
}
}
.highlight {
background: none;
padding: 0;
}
.highlight .region {
position: absolute;
pointer-events: none;
z-index: -1;
}
.line {
white-space: pre;
&.cursor-line .fold-marker::after {
opacity: 1;
}
}
.fold-marker {
cursor: default;
&::after {
.icon(0.8em, inline);
content: @ellipsis;
padding-left: 0.2em;
}
}
.placeholder-text {
position: absolute;
color: @text-color-subtle;
}
.invisible-character {
font-weight: normal !important;
font-style: normal !important;
}
.indent-guide {
display: inline-block;
box-shadow: inset 1px 0;
}
.cursor {
z-index: 4;
pointer-events: none;
box-sizing: border-box;
position: absolute;
border-left: 1px solid;
opacity: 0;
}
&.is-focused .cursor {
opacity: 1;
}
.cursors.blink-off .cursor {
opacity: 0;
}
}
atom-text-editor[mini] {
font-size: @input-font-size;
line-height: @component-line-height;
max-height: @component-line-height + 2; // +2 for borders
overflow: auto;
}
atom-overlay {
position: fixed;
display: block;
z-index: 4;
}

115
static/text-editor.less
View File

@@ -1,12 +1,50 @@
@import "octicon-mixins.less";
@import "ui-variables";
@import "octicon-utf-codes";
@import "octicon-mixins";
atom-text-editor {
display: flex;
font-family: Menlo, Consolas, 'DejaVu Sans Mono', monospace;
.gutter-container {
float: left;
width: min-content;
background-color: inherit;
}
.gutter {
overflow: hidden;
z-index: 0;
text-align: right;
cursor: default;
min-width: 1em;
box-sizing: border-box;
background-color: inherit;
}
.gutter:hover {
.line-number.foldable .icon-right {
visibility: visible;
&:hover {
opacity: 1;
}
}
}
.gutter, .gutter:hover {
.line-number.folded .icon-right {
.octicon(chevron-right, 0.8em);
visibility: visible;
&::before {
position: relative;
left: -.1em;
}
}
}
.line-numbers {
width: max-content;
background-color: inherit;
@@ -40,4 +78,79 @@ atom-text-editor {
will-change: transform;
overflow: hidden;
}
.highlight {
background: none;
padding: 0;
}
.highlight .region {
position: absolute;
pointer-events: none;
z-index: -1;
}
.line {
white-space: pre;
&.cursor-line .fold-marker::after {
opacity: 1;
}
}
.fold-marker {
cursor: default;
&::after {
.icon(0.8em, inline);
content: @ellipsis;
padding-left: 0.2em;
}
}
.placeholder-text {
position: absolute;
color: @text-color-subtle;
}
.invisible-character {
font-weight: normal !important;
font-style: normal !important;
}
.indent-guide {
display: inline-block;
box-shadow: inset 1px 0;
}
.cursor {
z-index: 4;
pointer-events: none;
box-sizing: border-box;
position: absolute;
border-left: 1px solid;
opacity: 0;
}
&.is-focused .cursor {
opacity: 1;
}
.cursors.blink-off .cursor {
opacity: 0;
}
}
atom-text-editor[mini] {
font-size: @input-font-size;
line-height: @component-line-height;
max-height: @component-line-height + 2; // +2 for borders
overflow: auto;
}
atom-overlay {
position: fixed;
display: block;
z-index: 4;
}