Merge branch 'master' into view-refactor

Conflicts:
	project/static/css/master.css

diff --cc project/static/css/master.css
index d554a5f,b413b2c..6ba367b
--- 1/project/static/css/master.css
--- 2/project/static/css/master.css
+++ b/project/static/css/master.css
@@@ -342,61 -343,13 +342,60 @@@ text#commit-dialog-message 
      margin: 0.5em;
  }
  
 -.CodeMirror-line-numbers
 -{
 -    text-align: right;
 -    padding-top: 0.4em;
 -    padding-right: 2px;
 -    width: 28px;
 -    font-size: 10pt;
 -    background: black;
 -    color: white;
 -}
 +/* ======= */
 +/* = New = */
 +/* ======= */
 +#splitview {
 +    width: 100%;
 +    height: 100%;
 +    padding: 0;
 +    margin: 0;
 +}
 +
 +.splitview-splitbar {
 +    width: 5px;
 +    border-left: 1px solid #999;
 +    border-right: 1px solid #999;
 +    height: 100%;
 +    background-color: #CCC;
 +    z-index: 100;
 +}
 +
 +.splitview-overlay {
 +    z-index: 90;
 +    background: #FFF;
 +    opacity: 0.5;
 +}
 +
 +.panel-container {
 +    height: 100%;
 +    position: relative;
 +}
 +
 +.content-view {
 +    position: absolute;
 +    top: 20px;
 +    right: 0;
 +    bottom: 0;
 +    left: 0;
 +    overflow: none;
 +}
 +
 +.xmlview {
 +    height: 100%;
 +}
 +
 +.view-overlay {
 +    z-index: 1000;
 +    background: #FFF;
 +    opacity: 0.8;
 +    text-align: center;
 +    text-valign: center;
 +}
 +
 +.view-overlay p {
 +    display: block;
 +    position: relative;
 +    top: auto;
 +    bottom: auto;
 +    height: 40px;
- }

diff --cc project/static/js/editor.js
Simple merge