Lepsze obsługiwanie nieudanych merge oraz podawanie w vstorage.all_pages() jedynie...

[redakcja.git] / platforma / static / css / master.css

diff --git a/platforma/static/css/master.css b/platforma/static/css/master.css
index 6239684..5c5587d 100755 (executable)
--- a/platforma/static/css/master.css
+++ b/platforma/static/css/master.css
@@ -6,20 +6,28 @@ body {
 }
 
 .vsplitbar {
 }
 
 .vsplitbar {

-    width: 14px;
-    background: #EEE url(/static/img/gallery.png) no-repeat scroll center center;
+    position: absolute;
+    top: 25px;
+    bottom: 0;
+    right: 0;;
+    width: 13px;
+    background: #C1C1C1 url(/static/img/gallery.png) no-repeat scroll center center;

     border-left: 1px solid #999;
     border-left: 1px solid #999;

-    cursor: col-resize;
+    border-right: 1px solid #999;
+    cursor: w-resize;

 }
 
 }
 

-.active {
-    background-color: #DDD;
+.vsplitbar.active {
+    cursor: e-resize;

 }
 
 }
 

-#simple-editor {
-    height: 100%;
+#source-editor, #simple-editor {
+    position: absolute;
+    top: 25px;
+    bottom: 0;
+    left: 0;
+    right: 15px;

     overflow: hidden;
     overflow: hidden;

-    position: relative;

 }
 
 #html-view {
 }
 
 #html-view {


@@ -32,7 +40,14 @@ body {
 }
 
 #sidebar {
 }
 
 #sidebar {

-    overflow: auto;
+    position: absolute;
+    overflow: hidden;
+    top: 25px;
+    right: 0;
+    bottom: 0;
+    width: 0;
+    display: none;
+    background-color: #FFF;

 }
 
 #header {
 }
 
 #header {


@@ -90,28 +105,37 @@ body {
 }
 
 .toolbar {
 }
 
 .toolbar {

+    width: 100%;

     border-bottom: 1px solid #777;
     background-color: #C1C1C1;
     margin: 0;
     padding: 2px;
     border-bottom: 1px solid #777;
     background-color: #C1C1C1;
     margin: 0;
     padding: 2px;

-    height: 22px;
+    z-index: 10;
+/*    height: 22px;*/
+}
+
+.toolbar button {
+    display: block;
+    float: left;
+    margin: 4px 0 2px 0;
+    padding: 0 5px 2px 5px;
+    border: none;
+    background: none;

 }
 
 .toolbar select {
     float: left;
 }
 
 .toolbar select {
     float: left;

-    margin: 2px 5px 2px 0;
+    margin: 1px 5px 1px 0;

     background: none;
     border: 1px solid #999;
     padding: 1px;
 }
 
     background: none;
     border: 1px solid #999;
     padding: 1px;
 }
 

-.toolbar button {
-    display: block;
+.toolbar input {

     float: left;
     float: left;

-    margin: 4px 0 2px 0;
-    padding: 0 5px 2px 5px;
-    border: none;
-    background: none;
+    font-size: 11px;
+    padding: 0;
+    margin: 2px 5px 0 5px;

 }
 
 .toolbar-end {
 }
 
 .toolbar-end {


@@ -132,4 +156,49 @@ button::-moz-focus-inner {
     padding: 0;
 }
 
     padding: 0;
 }
 

-p { margin: 0;}
\ No newline at end of file
+p { margin: 0;}
+
+.htmlview *[x-editable] {
+    background-color: white;
+}
+
+.htmlview .active[x-editable] {
+    background-color: #FAFAFA;
+    border: 1px solid #DDD;
+/*    -webkit-transition: all 1s linear;*/
+}
+
+
+/* =========== */
+/* = Gallery = */
+/* =========== */
+.change-gallery-panel {
+    width: 100%;
+    border-bottom: 1px solid #777;
+    background-color: #C1C1C1;
+    margin: 0;
+    padding: 2px;
+    z-index: 10;
+}
+
+.gallery-image {
+    position: absolute;
+    top: 27px;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    margin: 0;
+    border: none;
+    background-color: #000;
+    overflow: hidden;
+}
+
+img {
+    position: absolute;
+    -moz-drag: none;
+    user-select: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    cursor: pointer;
+}
\ No newline at end of file