From dece82791f43b5e8d278aba89cf8d6119af1478f Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 9 Apr 2012 13:11:40 -0700 Subject: - Decouple code editor from stage document switching logic - cleaning up Signed-off-by: Ananya Sen --- js/stage/stage-view.reel/stage-view.css | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'js/stage/stage-view.reel/stage-view.css') diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css index ce7072c7..372af144 100755 --- a/js/stage/stage-view.reel/stage-view.css +++ b/js/stage/stage-view.reel/stage-view.css @@ -23,15 +23,17 @@ } */ -.CodeMirror { - width: 100%; - height: 100%; - background: white; -} +/*.CodeMirror {*/ + /*width: 100%;*/ + /*height: 100%;*/ + /*background: white;*/ +/*}*/ + +/*.CodeMirror .CodeMirror-scroll {*/ + /*height: 100%;*/ + /*overflow: scroll;*/ + /*overflow-x: auto;*/ + /*overflow-y: auto;*/ +/*}*/ + -.CodeMirror .CodeMirror-scroll { - height: 100%; - overflow: scroll; - overflow-x: auto; - overflow-y: auto; -} -- cgit v1.2.3 From 6ffda1a7ebe18adb518eb24a612df22305b050a6 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 9 Apr 2012 17:15:41 -0700 Subject: - added configurability of code completion with the file type - added logic to toggle between automatic code completion and manually triggered code completion [ UI pending ] Signed-off-by: Ananya Sen --- js/stage/stage-view.reel/stage-view.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'js/stage/stage-view.reel/stage-view.css') diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css index 372af144..a7e255ae 100755 --- a/js/stage/stage-view.reel/stage-view.css +++ b/js/stage/stage-view.reel/stage-view.css @@ -37,3 +37,8 @@ /*}*/ +span.CodeMirror-matchhighlight { background: #e9e9e9 } +.CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important } +.activeline {background: #e8f2ff !important;} +div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;background-color: #ffd500;} +.CodeMirror-completions select {background-color:#e8f2ff;border:1px solid #c1c1c1;box-shadow: 8px 8px 8px rgba(0, 0, 0, 0.8);} \ No newline at end of file -- cgit v1.2.3 From 8cd6c76aabb4c75ab63f8d46b7e89bddbcbfe2a7 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Thu, 19 Apr 2012 10:38:43 -0700 Subject: - fixed the text cursor - code cleanup Signed-off-by: Ananya Sen --- js/stage/stage-view.reel/stage-view.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/stage/stage-view.reel/stage-view.css') diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css index a7e255ae..4cf5b2ab 100755 --- a/js/stage/stage-view.reel/stage-view.css +++ b/js/stage/stage-view.reel/stage-view.css @@ -14,7 +14,7 @@ width: 100%; height: 100%; overflow:auto; - /*display: none;*/ + cursor:text; } /* OLD CSS for reference -- cgit v1.2.3 From c3a0bdb0af1db149efb86b1a8f6b14cb695831cf Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 23 Apr 2012 12:33:24 -0700 Subject: fixed ugly scroll coming in the middle of the page for a short file Signed-off-by: Ananya Sen --- js/stage/stage-view.reel/stage-view.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'js/stage/stage-view.reel/stage-view.css') diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css index 4cf5b2ab..2fc8fd15 100755 --- a/js/stage/stage-view.reel/stage-view.css +++ b/js/stage/stage-view.reel/stage-view.css @@ -17,6 +17,10 @@ cursor:text; } +.codeViewContainer>div{ + width:2050px;/*to prevent scrolling of editor container in the middle of the page for short files*/ +} + /* OLD CSS for reference #mainContent #codeMirror_1 { height:100%; -- cgit v1.2.3 From 46c3c16d0a7c737a2669b1684cdb1ede74a628c0 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 23 Apr 2012 13:03:07 -0700 Subject: IKNINJA-1528 : temporarily disabling active line color for this Signed-off-by: Ananya Sen --- js/stage/stage-view.reel/stage-view.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/stage/stage-view.reel/stage-view.css') diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css index 2fc8fd15..b86c197a 100755 --- a/js/stage/stage-view.reel/stage-view.css +++ b/js/stage/stage-view.reel/stage-view.css @@ -43,6 +43,6 @@ span.CodeMirror-matchhighlight { background: #e9e9e9 } .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important } -.activeline {background: #e8f2ff !important;} +/*.activeline {background: #e8f2ff !important;}*/ div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;background-color: #ffd500;} .CodeMirror-completions select {background-color:#e8f2ff;border:1px solid #c1c1c1;box-shadow: 8px 8px 8px rgba(0, 0, 0, 0.8);} \ No newline at end of file -- cgit v1.2.3 From a7548b4c53de8f42cb5e0fb1c054eba6f7c45afb Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Tue, 24 Apr 2012 16:45:47 -0700 Subject: IKNINJA-1529 : zooming such that cursor position can be calculated accurately Signed-off-by: Ananya Sen --- js/stage/stage-view.reel/stage-view.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/stage/stage-view.reel/stage-view.css') diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css index b86c197a..10f80476 100755 --- a/js/stage/stage-view.reel/stage-view.css +++ b/js/stage/stage-view.reel/stage-view.css @@ -18,7 +18,7 @@ } .codeViewContainer>div{ - width:2050px;/*to prevent scrolling of editor container in the middle of the page for short files*/ + width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/ } /* OLD CSS for reference -- cgit v1.2.3 From 7aee2bd02218d9572ac1c00f191d08efe57f5bcb Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Thu, 26 Apr 2012 14:28:36 -0700 Subject: increasing z-indem of code hinting dropdown to appear above the disabled panels Signed-off-by: Ananya Sen --- js/stage/stage-view.reel/stage-view.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/stage/stage-view.reel/stage-view.css') diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css index 10f80476..eb7aa23f 100755 --- a/js/stage/stage-view.reel/stage-view.css +++ b/js/stage/stage-view.reel/stage-view.css @@ -45,4 +45,5 @@ span.CodeMirror-matchhighlight { background: #e9e9e9 } .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important } /*.activeline {background: #e8f2ff !important;}*/ div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;background-color: #ffd500;} -.CodeMirror-completions select {background-color:#e8f2ff;border:1px solid #c1c1c1;box-shadow: 8px 8px 8px rgba(0, 0, 0, 0.8);} \ No newline at end of file +.CodeMirror-completions select {background-color:#e8f2ff;border:1px solid #c1c1c1;box-shadow: 8px 8px 8px rgba(0, 0, 0, 0.8);} +.CodeMirror-completions {z-index:6001 !important;} -- cgit v1.2.3 From 052caf2b8e10a1e42ec1355a9bb7dd039ea01f69 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 30 Apr 2012 17:26:24 -0700 Subject: set up different activeline colors for different themes Signed-off-by: Ananya Sen --- js/stage/stage-view.reel/stage-view.css | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'js/stage/stage-view.reel/stage-view.css') diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css index eb7aa23f..e2c4bb0e 100755 --- a/js/stage/stage-view.reel/stage-view.css +++ b/js/stage/stage-view.reel/stage-view.css @@ -43,7 +43,17 @@ span.CodeMirror-matchhighlight { background: #e9e9e9 } .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important } -/*.activeline {background: #e8f2ff !important;}*/ div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;background-color: #ffd500;} .CodeMirror-completions select {background-color:#e8f2ff;border:1px solid #c1c1c1;box-shadow: 8px 8px 8px rgba(0, 0, 0, 0.8);} .CodeMirror-completions {z-index:6001 !important;} + +.cm-s-default .activeline {background: #e8f2ff; !important} +.cm-s-eclipse .activeline {background: #e8f2ff; !important} +.cm-s-elegant .activeline {background: #e8f2ff; !important} +.cm-s-neat .activeline {background: #e8f2ff; !important} +.cm-s-night .activeline {background: #8da6ce; !important} +.cm-s-cobalt .activeline {background: #8da6ce; !important} +.cm-s-monokai .activeline {background: #8da6ce; !important} +.cm-s-rubyblue .activeline {background: #3E7087; !important} +.cm-s-lesser-dark .activeline {background: #8da6ce; !important} +.cm-s-xq-dark .activeline {background: #8da6ce; !important} \ No newline at end of file -- cgit v1.2.3