[obs-commits] [PATCH] [webui] Combine CodeMirror2 CSS into one 'suse.css'

From: Sascha Peilicke --- src/webui/app/views/shared/_editor.html.erb | 4 +- src/webui/app/views/shared/_sourcediff.html.erb | 1 - .../public/javascripts/cm2/codemirror-ui-old.js | 508 -------------------- .../public/stylesheets/cm2/codemirror-ui-find.css | 19 - src/webui/public/stylesheets/cm2/codemirror-ui.css | 121 ----- src/webui/public/stylesheets/cm2/codemirror.css | 68 --- src/webui/public/stylesheets/cm2/suse.css | 198 ++++++++ src/webui/public/stylesheets/cm2/theme/cobalt.css | 17 - src/webui/public/stylesheets/cm2/theme/default.css | 19 - src/webui/public/stylesheets/cm2/theme/eclipse.css | 24 - src/webui/public/stylesheets/cm2/theme/elegant.css | 9 - src/webui/public/stylesheets/cm2/theme/neat.css | 8 - src/webui/public/stylesheets/cm2/theme/night.css | 20 - 13 files changed, 200 insertions(+), 816 deletions(-) delete mode 100644 src/webui/public/javascripts/cm2/codemirror-ui-old.js delete mode 100644 src/webui/public/stylesheets/cm2/codemirror-ui-find.css delete mode 100644 src/webui/public/stylesheets/cm2/codemirror-ui.css delete mode 100644 src/webui/public/stylesheets/cm2/codemirror.css create mode 100644 src/webui/public/stylesheets/cm2/suse.css delete mode 100644 src/webui/public/stylesheets/cm2/theme/cobalt.css delete mode 100644 src/webui/public/stylesheets/cm2/theme/default.css delete mode 100644 src/webui/public/stylesheets/cm2/theme/eclipse.css delete mode 100644 src/webui/public/stylesheets/cm2/theme/elegant.css delete mode 100644 src/webui/public/stylesheets/cm2/theme/neat.css delete mode 100644 src/webui/public/stylesheets/cm2/theme/night.css diff --git a/src/webui/app/views/shared/_editor.html.erb b/src/webui/app/views/shared/_editor.html.erb index d2394f8..34aa098 100644 --- a/src/webui/app/views/shared/_editor.html.erb +++ b/src/webui/app/views/shared/_editor.html.erb @@ -5,7 +5,7 @@ <% no_border ||= false %> <% content_for :content_for_head do %> - <%= stylesheet_link_tag 'cm2/codemirror', 'cm2/codemirror-ui', 'cm2/theme/default' %> + <%= stylesheet_link_tag 'cm2/suse' %> <style type="text/css"> <% if no_border %> .CodeMirror { @@ -22,7 +22,7 @@ } </style> <% end %> -<%= javascript_include_tag 'cm2/codemirror-compressed', 'cm2/codemirror-ui' %> +<%= javascript_include_tag 'cm2/codemirror', 'cm2/codemirror-ui', "cm2/mode/#{mode}" %> <% uid = rand().to_s()[2..-1] # unique id to allow including multiple editors %> <textarea id="editor_<%= uid %>" name="editor_<%= uid %>" style="display: none;" rows="0" cols="0"><%= force_utf8_and_transform_nonprintables(text) %></textarea> diff --git a/src/webui/app/views/shared/_sourcediff.html.erb b/src/webui/app/views/shared/_sourcediff.html.erb index dae6456..34d1760 100644 --- a/src/webui/app/views/shared/_sourcediff.html.erb +++ b/src/webui/app/views/shared/_sourcediff.html.erb @@ -61,7 +61,6 @@ <% end %> <td align="center" valign="bottom"><%= link_to('^', :anchor => "diff_view_#{file_id}") %></td> <td colspan="2"> - <%# TODO: Fix editor size adjustment %> <%= render :partial => "shared/editor", :locals => {:text => file_diff_text, :mode => 'diff', :read_only => true, :height => 'auto', :width => '750px', :no_border => true} %> </td> </tr> diff --git a/src/webui/public/javascripts/cm2/codemirror-ui-old.js b/src/webui/public/javascripts/cm2/codemirror-ui-old.js deleted file mode 100644 index 6635b3c..0000000 --- a/src/webui/public/javascripts/cm2/codemirror-ui-old.js +++ /dev/null @@ -1,508 +0,0 @@ -/* Demonstration of embedding CodeMirror in a bigger application. The -* interface defined here is a mess of prompts and confirms, and -* should probably not be used in a real project. -*/ -/* - * Modified by saschpe - */ -//var CodeMirrorUI = Class.create(); - -function CodeMirrorUI(place, options, mirrorOptions) { - this.initialize(place, options, mirrorOptions); -} - -CodeMirrorUI.prototype = { - - initialize: function(textarea, options, mirrorOptions) { - var defaultOptions = { - searchMode: 'popup', // other options are 'inline' and 'dialog'. The 'dialog' option needs work. - path: 'js', - imagePath: 'images', - buttons: ['search', 'undo', 'redo', 'jump', 'reindentSelection', 'reindent','about'], - saveCallback: null, - } - this.textarea = textarea - this.options = options; - this.setDefaults(this.options, defaultOptions); - //We need to keep a handle on the undo and redo buttons - //since they will be frequently updated based on the state - //of the mirror.historySize() object. - //Same for the save button - this.saveButtons = []; - this.undoButtons = []; - this.redoButtons = []; - - this.buttonDefs = { - 'save': ["Save", "save", this.options.imagePath + "/page_save.png", this.save], - 'search': ["Search/Replace", "find_replace_popup", this.options.imagePath + "/find.png", this.find_replace_popup], - 'searchClose': ["Close", "find_replace_popup_close", this.options.imagePath + "/cancel.png", this.find_replace_popup_close], - 'searchDialog': ["Search/Replace", "find_replace_window", this.options.imagePath + "/find.png", this.find_replace_window], - 'undo': ["Undo", "undo", this.options.imagePath + "/arrow_undo.png", this.undo], - 'redo': ["Redo", "redo", this.options.imagePath + "/arrow_redo.png", this.redo], - 'jump': ["Jump to line #", "jump", this.options.imagePath + "/page_go.png", this.jump], - 'reindentSelection': ["Reformat selection", "reindentSelect", this.options.imagePath + "/text_indent.png", this.reindentSelection], - 'reindent': ["Reformat whole document", "reindent", this.options.imagePath + "/page_refresh.png", this.reindent], - 'about': ["About CodeMirror-UI", "about", this.options.imagePath + "/help.png", this.about] - }; - - //place = CodeMirror.replace(place) - - this.home = document.createElement("div"); - this.textarea.parentNode.insertBefore(this.home, this.textarea); - /*if (place.appendChild) - place.appendChild(this.home); - else - place(this.home); - */ - this.self = this; - - mir = CodeMirror.fromTextArea(this.textarea, mirrorOptions); - //console.log(mir); - this.mirror = mir; - - this.initButtons(); - - //this.initWordWrapControl(); // CodeMirror v2 does not support word wrapping - - if (this.options.searchMode == 'inline') { - this.initFindControl(); - } else if (this.options.searchMode == 'popup') { - this.initPopupFindControl(); - } - - mirrorOptions['onChange'] = this.editorChanged.bind(this); - - //now trigger the save, undo/redo buttons - this.addButtonsClass(this.saveButtons, 'inactive'); - this.addButtonsClass(this.undoButtons, 'inactive'); - this.addButtonsClass(this.redoButtons, 'inactive'); - }, - setDefaults: function(object, defaults) { - for (var option in defaults) { - if (!object.hasOwnProperty(option)) - object[option] = defaults[option]; - } - }, - toTextArea: function() { - this.home.parentNode.removeChild(this.home); - this.mirror.toTextArea(); - }, - initButtons: function() { - this.buttonFrame = document.createElement("div"); - this.buttonFrame.className = "codemirror-ui-clearfix codemirror-ui-button-frame"; - this.home.appendChild(this.buttonFrame); - for (var i = 0; i < this.options.buttons.length; i++) { - var buttonId = this.options.buttons[i]; - var buttonDef = this.buttonDefs[buttonId]; - this.addButton(buttonDef[0], buttonDef[1], buttonDef[2], buttonDef[3], this.buttonFrame); - } - - //this.makeButton("Search", "search"); - //this.makeButton("Replace", "replace"); - //this.makeButton("Current line", "line"); - //this.makeButton("Jump to line", "jump"); - //this.makeButton("Insert constructor", "macro"); - //this.makeButton("Indent all", "reindent"); - }, - /* - * This is left over from the MirrorFrame demo. - * Get rid of it quick. - */ - /* - makeButton : function(name, action){ - var button = document.createElement("input"); - button.type = "button"; - button.value = name; - this.home.appendChild(button); - button.onclick = function(){ - self[action].call(self); - }; - }, - */ - createFindBar: function() { - var findBar = document.createElement("div"); - findBar.className = "codemirror-ui-find-bar"; - - this.findString = document.createElement("input"); - this.findString.type = "text"; - this.findString.size = 8; - - this.findButton = document.createElement("input"); - this.findButton.type = "button"; - this.findButton.value = "Find"; - this.findButton.onclick = function(){this.find()}.bind(this); - - this.connect(this.findString, "keyup", function(e){ - var code = e.keyCode; - if (code == 13){ - this.find(this.mirror.getCursor(false)) - }else{ - if(!this.findString.value == ""){ - this.find(this.mirror.getCursor(true)) - } - } - this.findString.focus(); - - }.bind(this) ); - - var regLabel = document.createElement("label"); - regLabel.title = "Regular Expressions" - this.regex = document.createElement("input"); - this.regex.type = "checkbox" - this.regex.className = "codemirror-ui-checkbox" - regLabel.appendChild(this.regex); - regLabel.appendChild(document.createTextNode("RegEx")); - - var caseLabel = document.createElement("label"); - caseLabel.title = "Case Sensitive" - this.caseSensitive = document.createElement("input"); - this.caseSensitive.type = "checkbox" - this.caseSensitive.className = "codemirror-ui-checkbox" - caseLabel.appendChild(this.caseSensitive); - caseLabel.appendChild(document.createTextNode("A/a")); - - this.replaceString = document.createElement("input"); - this.replaceString.type = "text"; - this.replaceString.size = 8; - - this.connect(this.replaceString, "keyup", function(e){ - var code = e.keyCode; - if (code == 13){ - this.replace() - } - }.bind(this) ); - - this.replaceButton = document.createElement("input"); - this.replaceButton.type = "button"; - this.replaceButton.value = "Replace"; - this.replaceButton.onclick = this.replace.bind(this); - - var replaceAllLabel = document.createElement("label"); - replaceAllLabel.title = "Replace All" - this.replaceAll = document.createElement("input"); - this.replaceAll.type = "checkbox" - this.replaceAll.className = "codemirror-ui-checkbox" - replaceAllLabel.appendChild(this.replaceAll); - replaceAllLabel.appendChild(document.createTextNode("All")); - - findBar.appendChild(this.findString); - findBar.appendChild(this.findButton); - findBar.appendChild(caseLabel); - findBar.appendChild(regLabel); - - findBar.appendChild(this.replaceString); - findBar.appendChild(this.replaceButton); - findBar.appendChild(replaceAllLabel); - return findBar; - }, - initPopupFindControl: function() { - var findBar = this.createFindBar(); - - this.popupFindWrap = document.createElement("div"); - this.popupFindWrap.className = "codemirror-ui-popup-find-wrap"; - - this.popupFindWrap.appendChild(findBar); - - var buttonDef = this.buttonDefs['searchClose']; - this.addButton(buttonDef[0], buttonDef[1], buttonDef[2], buttonDef[3], this.popupFindWrap); - - this.buttonFrame.appendChild(this.popupFindWrap); - - }, - initFindControl: function() { - var findBar = this.createFindBar(); - this.buttonFrame.appendChild(findBar); - }, - find: function( start ) { - if(start == null){ - start = this.mirror.getCursor(); - } - var findString = this.findString.value; - if (findString == null || findString == '') { - alert('You must enter something to search for.'); - return; - } - if (this.regex.checked) { - findString = new RegExp(findString); - } - - this.cursor = this.mirror.getSearchCursor(findString, start, !this.caseSensitive.checked ); - var found = this.cursor.findNext(); - if (found) { - this.mirror.setSelection(this.cursor.from(),this.cursor.to()) - //this.cursor.select(); - } else { - if (confirm("No more matches. Should we start from the top?")) { - this.cursor = this.mirror.getSearchCursor(findString, 0, !this.caseSensitive.checked); - found = this.cursor.findNext(); - if (found) { - this.mirror.setSelection(this.cursor.from(),this.cursor.to()) - //this.cursor.select(); - } else { - alert("No matches found."); - } - } - } - }, - replace: function() { - if (this.replaceAll.checked) { - var cursor = this.mirror.getSearchCursor(this.findString.value, this.mirror.getCursor(), !this.caseSensitive.checked); - while (cursor.findNext()) - this.mirror.replaceRange(this.replaceString.value,cursor.from(),cursor.to()) - //cursor.replace(this.replaceString.value); - } else { - this.mirror.replaceRange(this.replaceString.value,this.cursor.from(),this.cursor.to()) - //this.cursor.replace(this.replaceString.value); - this.find(); - } - }, - initWordWrapControl: function() { - var wrapDiv = document.createElement("div"); - wrapDiv.className = "codemirror-ui-wrap" - - var label = document.createElement("label"); - - this.wordWrap = document.createElement("input"); - this.wordWrap.type = "checkbox" - this.wordWrap.checked = true; - label.appendChild(this.wordWrap); - label.appendChild(document.createTextNode("Word Wrap")); - this.wordWrap.onchange = this.toggleWordWrap.bind(this); - wrapDiv.appendChild(label); - this.buttonFrame.appendChild(wrapDiv); - }, - toggleWordWrap: function() { - if (this.wordWrap.checked) { - this.mirror.setTextWrapping("nowrap"); - } else { - this.mirror.setTextWrapping(""); - } - }, - addButton: function(name, action, image, func, frame) { - var button = document.createElement("a"); - button.href = "#"; - button.className = "codemirror-ui-button " + action; - button.title = name; - button.func = func.bind(this); - button.onclick = function(event) { - //alert(event.target); - event.target.func(); - return false; - //this.self[action].call(this); - //eval("this."+action)(); - } - .bind(this, func); - var img = document.createElement("img"); - img.src = image; - img.border = 0; - img.func = func.bind(this); - button.appendChild(img); - frame.appendChild(button); - if (action == 'save') { - this.saveButtons.push(button); - } - if (action == 'undo') { - this.undoButtons.push(button); - } - if (action == 'redo') { - this.redoButtons.push(button); - } - }, - classNameRegex: function(className) { - var regex = new RegExp("(.*) *" + className + " *(.*)"); - return regex; - }, - addButtonsClass: function(buttons, className) { - - for (var b = 0; b < buttons.length; b++) { - button = buttons[b]; - if (!button.className.match(this.classNameRegex(className))) { - button.className += " " + className; - } - } - - }, - removeButtonsClass: function(buttons, className) { - for (var b = 0; b < buttons.length; b++) { - button = buttons[b]; - //console.log("testing " + button.className + " for " + className); - var m = button.className.match(this.classNameRegex(className)) - if (m) { - button.className = m[1] + " " + m[2]; - } - } - }, - editorChanged: function() { - if(!this.mirror) { - return - } - var his = this.mirror.historySize(); - if (his['undo'] > 0) { - this.removeButtonsClass(this.saveButtons, 'inactive'); - this.removeButtonsClass(this.undoButtons, 'inactive'); - } else { - this.addButtonsClass(this.saveButtons, 'inactive'); - this.addButtonsClass(this.undoButtons, 'inactive'); - } - if (his['redo'] > 0) { - this.removeButtonsClass(this.redoButtons, 'inactive'); - } else { - this.addButtonsClass(this.redoButtons, 'inactive'); - } - //alert("undo size = " + his['undo'] + " and redo size = " + his['redo']); - }, - save: function() { - for (var b = 0; b < this.saveButtons.length; b++) { - button = this.saveButtons[b]; - if (!button.className.match(this.classNameRegex('inactive'))) { - this.options.saveCallback(); - } - } - }, - undo: function() { - this.mirror.undo(); - }, - redo: function() { - this.mirror.redo(); - }, - replaceSelection: function(newVal) { - this.mirror.replaceSelection(newVal); - this.searchWindow.focus(); - }, - raise_search_window: function() { - //alert('raising window!'); - this.searchWindow.focus(); - }, - find_replace_window: function() { - if (this.searchWindow == null) { - this.searchWindow = window.open(this.options.path + "find_replace.html", "mywindow", "scrollbars=1,width=400,height=350,modal=yes"); - this.searchWindow.codeMirrorUI = this; - } - this.searchWindow.focus(); - }, - find_replace_popup: function() { - //alert('Hello!'); - this.popupFindWrap.className = "codemirror-ui-popup-find-wrap active"; - this.findString.focus(); - }, - find_replace_popup_close: function() { - //alert('Hello!'); - this.popupFindWrap.className = "codemirror-ui-popup-find-wrap"; - }, - /* - find_replace: function(){ - this.find_replace = document.createElement("div"); - this.find_replace.className = "codemirror-search-replace"; - this.find_replace.innerHTML = "Just a test!"; - this.home.appendChild(this.find_replace); - }, - - search: function(){ - var text = prompt("Enter search term:", ""); - if (!text) - return; - - var first = true; - do { - var cursor = this.mirror.getSearchCursor(text, first); - first = false; - while (cursor.findNext()) { - cursor.select(); - if (!confirm("Search again?")) - return; - } - } - while (confirm("End of document reached. Start over?")); - }, - - replace: function(){ - // This is a replace-all, but it is possible to implement a - // prompting replace. - var from = prompt("Enter search string:", ""), to; - if (from) - to = prompt("What should it be replaced with?", ""); - if (to == null) - return; - - var cursor = this.mirror.getSearchCursor(from, false); - while (cursor.findNext()) - cursor.replace(to); - }, - */ - jump: function() { - var line = prompt("Jump to line:", ""); - if (line && !isNaN(Number(line))) { - this.mirror.setCursor(Number(line),0); - this.mirror.setSelection({line:Number(line),ch:0},{line:Number(line)+1,ch:0}); - this.mirror.focus(); - } - }, - /* - line: function(){ - alert("The cursor is currently at line " + this.mirror.currentLine()); - this.mirror.focus(); - }, - - macro: function(){ - var name = prompt("Name your constructor:", ""); - if (name) - this.mirror.replaceSelection("function " + name + "() {\n \n}\n\n" + name + ".prototype = {\n \n};\n"); - }, - */ - reindent: function() { - var lineCount = this.mirror.lineCount(); - for(var line = 0; line < lineCount; line++) { - this.mirror.indentLine(line); - } - }, - about : function() { - string = "CodeMirror-UI was written by Jeremy Green (http://www.octolabs.com/) as a light interface around CodeMirror by Marijn Haverbeke (http://codemirror.net)." - string += "\n\n" - string += "Documentation and the code can be found at https://github.com/jagthedrummer/codemirror-ui/." - alert(string); - }, - reindentSelection: function() { - var cur = this.mirror.getCursor() - //console.log(cur) - var start = this.mirror.getCursor(true)["line"] - var end = this.mirror.getCursor(false)["line"] - for(var line = start; line <= end; line++) { - this.mirror.indentLine(line); - } - //this.mirror.reindentSelection(); - - }, - // Event handler registration. If disconnect is true, it'll return a - // function that unregisters the handler. - // Borrowed from CodeMirror + modified - connect: function (node, type, handler, disconnect) { - /*function wrapHandler(event) { - handler(new Event(event || window.event)); - }*/ - - if (typeof node.addEventListener == "function") { - node.addEventListener(type, handler, false); - if (disconnect) - return function() { - node.removeEventListener(type, handler, false); - }; - } else { - node.attachEvent("on" + type, handler); - if (disconnect) - return function() { - node.detachEvent("on" + type, handler); - }; - } - } -}; - -/* - * This makes coding callbacks much more sane - */ -Function.prototype.bind = function(scope) { - var _function = this; - - return function() { - return _function.apply(scope, arguments); - } -} diff --git a/src/webui/public/stylesheets/cm2/codemirror-ui-find.css b/src/webui/public/stylesheets/cm2/codemirror-ui-find.css deleted file mode 100644 index fd37a5f..0000000 --- a/src/webui/public/stylesheets/cm2/codemirror-ui-find.css +++ /dev/null @@ -1,19 +0,0 @@ -#buttons{ - float:right; -} - -#buttons a{ - - display:block; - text-align:center; - background:#ddd; - border:1px solid black; - color:black; - text-decoration:none; - padding:3px; - -} - -#buttons a:hover{ - background:white; -} \ No newline at end of file diff --git a/src/webui/public/stylesheets/cm2/codemirror-ui.css b/src/webui/public/stylesheets/cm2/codemirror-ui.css deleted file mode 100644 index 47ae984..0000000 --- a/src/webui/public/stylesheets/cm2/codemirror-ui.css +++ /dev/null @@ -1,121 +0,0 @@ -.codemirror-ui-button-frame{ - border:1px solid #ccc; - background:#eee; - position:relative; -} - -.codemirror-ui-button-frame input,.codemirror-ui-button-frame label{ - font-size:0.6em; -} - -.codemirror-ui-button-frame label input{ - margin:0px 2px; - vertical-align:middle; -} -.codemirror-ui-button-frame label{ - padding:0px; - margin:2px 5px; - margin-top:0px; - display:inline-block; -} - -input.codemirror-ui-checkbox{ - -} - -.codemirror-ui-button{ - display:block; - float:left; - padding:3px; - line-height:0; - margin:1px; - margin-right:0px; -} - -.codemirror-ui-button:hover{ - padding:2px; - border:1px solid #ccc; -} - -.codemirror-ui-button img{ - line-height:0; -} - -.codemirror-ui-button.inactive{ - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; - filter: alpha(opacity=50); - opacity: .5; -} - -.codemirror-ui-wrap{ - float:right; -} - -.codemirror-find-replace{ - border:1px solid black; - background : #ddd; - padding:10px; - position:absolute; - width:300px; - top:0%; - left:50%; - margin-left:-150px; -} - -iframe{ - /*border:1px solid green !important;*/ -} - -.codemirror-ui-find-bar{ - text-align:center; -} - -.codemirror-ui-popup-find-wrap{ - position:absolute; - bottom:100%; - left:-1px; - border:1px solid #ccc; - background:#eee; - padding:2px 5px; - border-bottom:0px; - margin-bottom:-1px; - display:none; -} - -.codemirror-ui-popup-find-wrap.active{ - display:block; -} - - -.codemirror-ui-popup-find-wrap .codemirror-ui-button{ - float:left; -} - -.codemirror-ui-popup-find-wrap .codemirror-ui-find-bar{ - float:left; -} - -.CodeMirror{ - border:1px solid #ccc; - border-top:0px; - background:white; -} - -/* - * This lets us make sure that the fancy-tab-gutter will always enclose the tabs inside it. - * We're namspcing it since many frameworks include a .clearfix rule of somesort. - */ - -.codemirror-ui-clearfix:after { - visibility: hidden; - display: block; - font-size: 0; - content:"\0020"; - clear: both; - height: 0; - } -.codemirror-ui-clearfix { display: inline-block; } -/* start commented backslash hack \*/ -* html .codemirror-ui-clearfix { height: 1%; } -.codemirror-ui-clearfix { display: block; } -/* close commented backslash hack */ diff --git a/src/webui/public/stylesheets/cm2/codemirror.css b/src/webui/public/stylesheets/cm2/codemirror.css deleted file mode 100644 index aea1574..0000000 --- a/src/webui/public/stylesheets/cm2/codemirror.css +++ /dev/null @@ -1,68 +0,0 @@ -.CodeMirror { - line-height: 1em; - font-family: monospace; -} - -.CodeMirror-scroll { - overflow: auto; - height: 300px; - /* This is needed to prevent an IE[67] bug where the scrolled content - is visible outside of the scrolling box. */ - position: relative; -} - -.CodeMirror-gutter { - position: absolute; left: 0; top: 0; - z-index: 10; - background-color: #f7f7f7; - border-right: 1px solid #eee; - min-width: 2em; - height: 100%; -} -.CodeMirror-gutter-text { - color: #aaa; - text-align: right; - padding: .4em .2em .4em .4em; -} -.CodeMirror-lines { - padding: .4em; -} - -.CodeMirror pre { - -moz-border-radius: 0; - -webkit-border-radius: 0; - -o-border-radius: 0; - border-radius: 0; - border-width: 0; margin: 0; padding: 0; background: transparent; - font-family: inherit; - font-size: inherit; - padding: 0; margin: 0; - white-space: pre; - word-wrap: normal; -} - -.CodeMirror textarea { - font-family: inherit !important; - font-size: inherit !important; -} - -.CodeMirror-cursor { - z-index: 10; - position: absolute; - visibility: hidden; - border-left: 1px solid black !important; -} -.CodeMirror-focused .CodeMirror-cursor { - visibility: visible; -} - -span.CodeMirror-selected { - background: #ccc !important; - color: HighlightText !important; -} -.CodeMirror-focused span.CodeMirror-selected { - background: Highlight !important; -} - -.CodeMirror-matchingbracket {color: #0f0 !important;} -.CodeMirror-nonmatchingbracket {color: #f22 !important;} diff --git a/src/webui/public/stylesheets/cm2/suse.css b/src/webui/public/stylesheets/cm2/suse.css new file mode 100644 index 0000000..52be907 --- /dev/null +++ b/src/webui/public/stylesheets/cm2/suse.css @@ -0,0 +1,198 @@ +/* BEGIN: CodeMirror */ +.CodeMirror { + line-height: 1em; + font-family: monospace; +} +.CodeMirror-scroll { + overflow: auto; + height: 300px; + /* This is needed to prevent an IE[67] bug where the scrolled content + is visible outside of the scrolling box. */ + position: relative; +} +.CodeMirror-gutter { + position: absolute; left: 0; top: 0; + z-index: 10; + background-color: #f7f7f7; + border-right: 1px solid #eee; + min-width: 2em; + height: 100%; +} +.CodeMirror-gutter-text { + color: #aaa; + text-align: right; + padding: .4em .2em .4em .4em; +} +.CodeMirror-lines { + padding: .4em; +} +.CodeMirror pre { + -moz-border-radius: 0; + -webkit-border-radius: 0; + -o-border-radius: 0; + border-radius: 0; + border-width: 0; margin: 0; padding: 0; background: transparent; + font-family: inherit; + font-size: inherit; + padding: 0; margin: 0; + white-space: pre; + word-wrap: normal; +} +.CodeMirror textarea { + font-family: inherit !important; + font-size: inherit !important; +} +.CodeMirror-cursor { + z-index: 10; + position: absolute; + visibility: hidden; + border-left: 1px solid black !important; +} +.CodeMirror-focused .CodeMirror-cursor { + visibility: visible; +} +span.CodeMirror-selected { + background: #ccc !important; + color: HighlightText !important; +} +.CodeMirror-focused span.CodeMirror-selected { + background: Highlight !important; +} +.CodeMirror-matchingbracket {color: #0f0 !important;} +.CodeMirror-nonmatchingbracket {color: #f22 !important;} +/* END: CodeMirror */ + + +/* BEGIN: CodeMirror-UI */ +.codemirror-ui-button-frame { + border:1px solid #ccc; + background:#eee; + position:relative; +} +.codemirror-ui-button-frame input,.codemirror-ui-button-frame label { + font-size:0.6em; +} +.codemirror-ui-button-frame label input { + margin:0px 2px; + vertical-align:middle; +} +.codemirror-ui-button-frame label { + padding:0px; + margin:2px 5px; + margin-top:0px; + display:inline-block; +} +input.codemirror-ui-checkbox { +} +.codemirror-ui-button { + display:block; + float:left; + padding:3px; + line-height:0; + margin:1px; + margin-right:0px; +} +.codemirror-ui-button:hover { + padding:2px; + border:1px solid #ccc; +} +.codemirror-ui-button img { + line-height:0; +} +.codemirror-ui-button.inactive { + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; + filter: alpha(opacity=50); + opacity: .5; +} +.codemirror-ui-wrap { + float:right; +} +.codemirror-find-replace { + border:1px solid black; + background : #ddd; + padding:10px; + position:absolute; + width:300px; + top:0%; + left:50%; + margin-left:-150px; +} +iframe { + /*border:1px solid green !important;*/ +} +.codemirror-ui-find-bar { + text-align:center; +} +.codemirror-ui-popup-find-wrap { + position:absolute; + bottom:100%; + left:-1px; + border:1px solid #ccc; + background:#eee; + padding:2px 5px; + border-bottom:0px; + margin-bottom:-1px; + display:none; +} +.codemirror-ui-popup-find-wrap.active { + display:block; +} +.codemirror-ui-popup-find-wrap .codemirror-ui-button { + float:left; +} +.codemirror-ui-popup-find-wrap .codemirror-ui-find-bar { + float:left; +} +.CodeMirror { + border:1px solid #ccc; + border-top:0px; + background:white; +} +/* + * This lets us make sure that the fancy-tab-gutter will always enclose the tabs inside it. + * We're namspcing it since many frameworks include a .clearfix rule of somesort. + */ +.codemirror-ui-clearfix:after { + visibility: hidden; + display: block; + font-size: 0; + content:"\0020"; + clear: both; + height: 0; +} +.codemirror-ui-clearfix { display: inline-block; } +/* start commented backslash hack \*/ +* html .codemirror-ui-clearfix { height: 1%; } +.codemirror-ui-clearfix { display: block; } +/* close commented backslash hack */ +/* END: CodeMirror-UI */ + + +/* BEGIN: Default theme */ +.cm-s-default span.cm-keyword {color: #708;} +.cm-s-default span.cm-atom {color: #219;} +.cm-s-default span.cm-number {color: #164;} +.cm-s-default span.cm-def {color: #00f;} +.cm-s-default span.cm-variable {color: black;} +.cm-s-default span.cm-variable-2 {color: #05a;} +.cm-s-default span.cm-variable-3 {color: #0a5;} +.cm-s-default span.cm-property {color: black;} +.cm-s-default span.cm-operator {color: black;} +.cm-s-default span.cm-comment {color: #a50;} +.cm-s-default span.cm-string {color: #a11;} +.cm-s-default span.cm-string-2 {color: #f50;} +.cm-s-default span.cm-meta {color: #555;} +.cm-s-default span.cm-error {color: #f00;} +.cm-s-default span.cm-qualifier {color: #555;} +.cm-s-default span.cm-builtin {color: #30a;} +.cm-s-default span.cm-bracket {color: #cc7;} +.cm-s-default span.cm-tag {color: #170;} +.cm-s-default span.cm-attribute {color: #00c;} +/* END: Default theme */ + + +/* BEGIN: Diff mode */ +.cm-s-default span.cm-rangeinfo {color: #18b2b2;} +.cm-s-default span.cm-minus {color: red;} +.cm-s-default span.cm-plus {color: green;} +/* END: Diff mode */ diff --git a/src/webui/public/stylesheets/cm2/theme/cobalt.css b/src/webui/public/stylesheets/cm2/theme/cobalt.css deleted file mode 100644 index ba47da8..0000000 --- a/src/webui/public/stylesheets/cm2/theme/cobalt.css +++ /dev/null @@ -1,17 +0,0 @@ -.cm-s-cobalt { background: #002240; color: white; } -.cm-s-cobalt span.CodeMirror-selected { background: #b36539 !important; } -.cm-s-cobalt .CodeMirror-gutter { background: #002240; border-right: 1px solid #aaa; } -.cm-s-cobalt .CodeMirror-gutter-text { color: #d0d0d0; } -.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white !important; } - -.cm-s-cobalt span.cm-comment { color: #08f; } -.cm-s-cobalt span.cm-atom { color: #845dc4; } -.cm-s-cobalt span.cm-number, .cm-s-cobalt span.cm-attribute { color: #ff80e1; } -.cm-s-cobalt span.cm-keyword { color: #ffee80; } -.cm-s-cobalt span.cm-string { color: #3ad900; } -.cm-s-cobalt span.cm-meta { color: #ff9d00; } -.cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; } -.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; } -.cm-s-cobalt span.cm-error { color: #9d1e15; } -.cm-s-cobalt span.cm-bracket { color: #d8d8d8; } -.cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; } diff --git a/src/webui/public/stylesheets/cm2/theme/default.css b/src/webui/public/stylesheets/cm2/theme/default.css deleted file mode 100644 index e68f0fb..0000000 --- a/src/webui/public/stylesheets/cm2/theme/default.css +++ /dev/null @@ -1,19 +0,0 @@ -.cm-s-default span.cm-keyword {color: #708;} -.cm-s-default span.cm-atom {color: #219;} -.cm-s-default span.cm-number {color: #164;} -.cm-s-default span.cm-def {color: #00f;} -.cm-s-default span.cm-variable {color: black;} -.cm-s-default span.cm-variable-2 {color: #05a;} -.cm-s-default span.cm-variable-3 {color: #0a5;} -.cm-s-default span.cm-property {color: black;} -.cm-s-default span.cm-operator {color: black;} -.cm-s-default span.cm-comment {color: #a50;} -.cm-s-default span.cm-string {color: #a11;} -.cm-s-default span.cm-string-2 {color: #f50;} -.cm-s-default span.cm-meta {color: #555;} -.cm-s-default span.cm-error {color: #f00;} -.cm-s-default span.cm-qualifier {color: #555;} -.cm-s-default span.cm-builtin {color: #30a;} -.cm-s-default span.cm-bracket {color: #cc7;} -.cm-s-default span.cm-tag {color: #170;} -.cm-s-default span.cm-attribute {color: #00c;} diff --git a/src/webui/public/stylesheets/cm2/theme/eclipse.css b/src/webui/public/stylesheets/cm2/theme/eclipse.css deleted file mode 100644 index 0ec8d9a..0000000 --- a/src/webui/public/stylesheets/cm2/theme/eclipse.css +++ /dev/null @@ -1,24 +0,0 @@ -.cm-s-eclipse span.cm-meta {color: #FF1717;} -.cm-s-eclipse span.cm-keyword { font-weight: bold; color: #7F0055; } -.cm-s-eclipse span.cm-atom {color: #219;} -.cm-s-eclipse span.cm-number {color: #164;} -.cm-s-eclipse span.cm-def {color: #00f;} -.cm-s-eclipse span.cm-variable {color: black;} -.cm-s-eclipse span.cm-variable-2 {color: #0000C0;} -.cm-s-eclipse span.cm-variable-3 {color: #0000C0;} -.cm-s-eclipse span.cm-property {color: black;} -.cm-s-eclipse span.cm-operator {color: black;} -.cm-s-eclipse span.cm-comment {color: #3F7F5F;} -.cm-s-eclipse span.cm-string {color: #2A00FF;} -.cm-s-eclipse span.cm-string-2 {color: #f50;} -.cm-s-eclipse span.cm-error {color: #f00;} -.cm-s-eclipse span.cm-qualifier {color: #555;} -.cm-s-eclipse span.cm-builtin {color: #30a;} -.cm-s-eclipse span.cm-bracket {color: #cc7;} -.cm-s-eclipse span.cm-tag {color: #170;} -.cm-s-eclipse span.cm-attribute {color: #00c;} - -.CodeMirror-matchingbracket{ - border:1px solid grey; - color:black !important;; -} \ No newline at end of file diff --git a/src/webui/public/stylesheets/cm2/theme/elegant.css b/src/webui/public/stylesheets/cm2/theme/elegant.css deleted file mode 100644 index 171683f..0000000 --- a/src/webui/public/stylesheets/cm2/theme/elegant.css +++ /dev/null @@ -1,9 +0,0 @@ -.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;} -.cm-s-elegant span.cm-comment {color: #262;font-style: italic;} -.cm-s-elegant span.cm-meta {color: #555;font-style: italic;} -.cm-s-elegant span.cm-variable {color: black;} -.cm-s-elegant span.cm-variable-2 {color: #b11;} -.cm-s-elegant span.cm-qualifier {color: #555;} -.cm-s-elegant span.cm-keyword {color: #730;} -.cm-s-elegant span.cm-builtin {color: #30a;} -.cm-s-elegant span.cm-error {background-color: #fdd;} diff --git a/src/webui/public/stylesheets/cm2/theme/neat.css b/src/webui/public/stylesheets/cm2/theme/neat.css deleted file mode 100644 index 10d22c9..0000000 --- a/src/webui/public/stylesheets/cm2/theme/neat.css +++ /dev/null @@ -1,8 +0,0 @@ -.cm-s-neat span.cm-comment { color: #a86; } -.cm-s-neat span.cm-keyword { font-weight: bold; color: blue; } -.cm-s-neat span.cm-string { color: #a22; } -.cm-s-neat span.cm-builtin { font-weight: bold; color: #077; } -.cm-s-neat span.cm-special { font-weight: bold; color: #0aa; } -.cm-s-neat span.cm-variable { color: black; } -.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; } -.cm-s-neat span.cm-meta {color: #555;} diff --git a/src/webui/public/stylesheets/cm2/theme/night.css b/src/webui/public/stylesheets/cm2/theme/night.css deleted file mode 100644 index a84ec4f..0000000 --- a/src/webui/public/stylesheets/cm2/theme/night.css +++ /dev/null @@ -1,20 +0,0 @@ -/* Loosely based on the Midnight Textmate theme */ - -.cm-s-night { background: #0a001f; color: #f8f8f8; } -.cm-s-night span.CodeMirror-selected { background: #a8f !important; } -.cm-s-night .CodeMirror-gutter { background: #0a001f; border-right: 1px solid #aaa; } -.cm-s-night .CodeMirror-gutter-text { color: #f8f8f8; } -.cm-s-night .CodeMirror-cursor { border-left: 1px solid white !important; } - -.cm-s-night span.cm-comment { color: #6900a1; } -.cm-s-night span.cm-atom { color: #845dc4; } -.cm-s-night span.cm-number, .cm-s-night span.cm-attribute { color: #ffd500; } -.cm-s-night span.cm-keyword { color: #599eff; } -.cm-s-night span.cm-string { color: #37f14a; } -.cm-s-night span.cm-meta { color: #7678e2; } -.cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; } -.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; } -.cm-s-night span.cm-error { color: #9d1e15; } -.cm-s-night span.cm-bracket { color: #8da6ce; } -.cm-s-night span.cm-comment { color: #6900a1; } -.cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; } -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe@opensuse.org To contact the owner, e-mail: obs-commits+owner@opensuse.org