diff --git a/static/editor.css b/static/editor.css index ebd85aeaf..91aed0439 100644 --- a/static/editor.css +++ b/static/editor.css @@ -6,10 +6,23 @@ -webkit-box-flex: 1; position: relative; z-index: 0; + font-family: Inconsolata, Monaco, Courier; + line-height: 1.3; } .editor.mini { height: auto; + line-height: 25px; +} + +.editor.mini .cursor { + width: 2px; + line-height: 20px; + margin-top: 2px; +} + +.editor .gutter .line-number.cursor-line { + opacity: 1; } .editor .gutter { @@ -19,14 +32,54 @@ text-align: right; } +.editor .gutter .line-number { + padding-right: .5em; + min-width: 35px; + box-sizing: border-box; + text-align: right; + opacity: 0.6; +} + .editor .gutter .line-numbers { position: relative; } +.editor .gutter .line-number.fold.cursor-line { + opacity: 1; +} + +.editor .gutter .line-number.fold:after { + visibility: visible; +} + .editor.mini .gutter { display: none; } +.editor .gutter .line-number:after { + font-size: 0.8em; + content: '\f078'; + font-family: 'Octicons Regular'; + -webkit-font-smoothing: antialiased; + color: #fba0e3; + visibility: hidden; +} + +.editor .fold-marker:after { + content: '\2026'; + opacity: .8; + color: #fba0e3; + padding-left: .2em; +} + +.editor .line.cursor-line .fold-marker { + opacity: 1; +} + +.editor .invisible { + opacity: 0.2; +} + .editor .vertical-scrollbar { position: absolute; right: 0; diff --git a/themes/atom-dark-ui/editor.css b/themes/atom-dark-ui/editor.css index 9dfb302ac..3006ed4ef 100644 --- a/themes/atom-dark-ui/editor.css +++ b/themes/atom-dark-ui/editor.css @@ -1,34 +1,9 @@ -.editor { - font-family: Inconsolata, Monaco, Courier; - line-height: 1.3; -} - .editor.mini { - height: auto; - line-height: 25px; border: 1px solid rgba(0, 0, 0, 0.2); border-bottom: 1px solid rgba(180, 180, 180, 0.2); border-right: 1px solid rgba(180, 180, 180, 0.2); } -.editor.mini .cursor { - width: 2px; - line-height: 20px; - margin-top: 2px; -} - -.editor .gutter .line-number { - padding-right: .5em; - min-width: 35px; - box-sizing: border-box; - text-align: right; - opacity: 0.6; -} - -.editor .gutter .line-number.cursor-line { - opacity: 1; -} - .editor .gutter.drop-shadow { -webkit-box-shadow: -2px 0px 10px 2px #222; } @@ -48,35 +23,3 @@ color: #fba0e3; opacity: .8; } - -.editor .gutter .line-number.fold.cursor-line { - opacity: 1; -} - -.editor .gutter .line-number:after { - font-size: 0.8em; - content: '\f078'; - font-family: 'Octicons Regular'; - -webkit-font-smoothing: antialiased; - color: #fba0e3; - visibility: hidden; -} - -.editor .gutter .line-number.fold:after { - visibility: visible; -} - -.editor .fold-marker:after { - content: '\2026'; - opacity: .8; - color: #fba0e3; - padding-left: .2em; -} - -.editor .line.cursor-line .fold-marker { - opacity: 1; -} - -.editor .invisible { - opacity: 0.2; -} diff --git a/themes/atom-light-ui/editor.css b/themes/atom-light-ui/editor.css index 3a3652b0b..23d8a2eaf 100644 --- a/themes/atom-light-ui/editor.css +++ b/themes/atom-light-ui/editor.css @@ -1,11 +1,4 @@ -.editor { - font-family: Inconsolata, Monaco, Courier; - line-height: 1.3; -} - .editor.mini { - height: auto; - line-height: 25px; border: 1px solid rgba(0, 0, 0, 0.2); border-bottom: 1px solid rgba(180, 180, 180, 0.3); border-right: 1px solid rgba(180, 180, 180, 0.3); @@ -15,21 +8,6 @@ .editor.mini .cursor { background: #333; - width: 2px; - line-height: 20px; - margin-top: 2px; -} - -.editor .gutter .line-number { - padding-right: .5em; - min-width: 35px; - box-sizing: border-box; - text-align: right; - opacity: 0.5; -} - -.editor .gutter .line-number.cursor-line { - opacity: 1; } .editor .gutter.drop-shadow { @@ -50,36 +28,4 @@ .editor .gutter .line-number.fold { color: #fba0e3; opacity: .8; -} - -.editor .gutter .line-number.fold.cursor-line { - opacity: 1; -} - -.editor .gutter .line-number:after { - font-size: 0.8em; - content: '\f078'; - font-family: 'Octicons Regular'; - -webkit-font-smoothing: antialiased; - color: #fba0e3; - visibility: hidden; -} - -.editor .gutter .line-number.fold:after { - visibility: visible; -} - -.editor .fold-marker:after { - content: '\2026'; - opacity: .8; - color: #fba0e3; - padding-left: .2em; -} - -.editor .line.cursor-line .fold-marker { - opacity: 1; -} - -.editor .invisible { - opacity: 0.2; -} +} \ No newline at end of file