From: zuber <marek@stepniowski.com>
Date: Mon, 28 Sep 2009 14:22:41 +0000 (+0200)
Subject: Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma into view-refactor
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/8ad03264f1a47afe5108b1252ec3ec139dc16d9a?ds=inline;hp=-c

Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma into view-refactor
---

8ad03264f1a47afe5108b1252ec3ec139dc16d9a
diff --combined project/static/css/master.css
index 8bccbcc7,44bd62ec..a3857e6e
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@@ -1,6 -1,6 +1,6 @@@
  body {
      margin: 0;
 -    font: 10pt Helvetica, Verdana, sans-serif;
 +    font: 12px Helvetica, Verdana, sans-serif;
      overflow: hidden;
      background: #AAA;
  }
@@@ -35,8 -35,10 +35,9 @@@
      top: 2.4em; left: 0px; right: 0px; bottom: 0px;
      overflow: auto;    
      background-color: white;
 -    padding: 0.2em 1em;
  }
  
+ /*
  ul {
      margin: 20px;
      padding: 0;
@@@ -46,7 -48,7 +47,7 @@@ li 
      margin: 0;
      padding: 0;
      list-style: none;
- }
+ } */
  
  a {
      text-decoration: none;
@@@ -106,8 -108,8 +107,8 @@@ label 
  /* ========== */
  
  #panels {
 -    position: absolute;
 -    bottom: 0px; left: 0px; right: 0px; top: 0px;
 +    height: 100%;
 +    width: 100%;
  }
  
  .panel-wrap {
@@@ -342,75 -344,13 +343,75 @@@ 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;
 +}
 +
 +.panel-container select {
 +    z-index: 1100;
 +}
 +
 +.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;
 +}
 +
 +.buttontoolbarview {
 +    display: block;
 +    background-color: #CCC;
 +}
 +
 +.buttontoolbarview a {
 +    color: #000;
 +    text-decoration: none;
 +}