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
old mode 100644 (file)
new mode 100755 (executable)
index ae51e47..5c5587d
--- a/platforma/static/css/master.css
+++ b/platforma/static/css/master.css
@@ -1,415 +1,204 @@
 body {
 body {

-    margin: 0;    
-
-    font: 12px Helvetica, Verdana, sans-serif;
+    margin: 0;

     overflow: hidden;
     overflow: hidden;

-    background: #AAA;
-}
-
-/*  fix icon buttons */
-
-button img {
-    vertical-align: middle;
-    margin: 0px;
-}
-
-/* default form style hacks */
-select {
-    border: none;
-    margin-left: 0.1em;    
-}
-
-#body-wrap {
-    margin: 0px;
-    padding: 0px;    
-}
-
-#header { 
-    position: absolute;
-    padding: 2px 0.5em;
-    background-color: #CDCDCD; /* !unused */
-    border-bottom: 2px solid black;
-
-    font-size: 14px;
-
-    line-height: 26px;
-    vertical-align: middle;
-
-    /* height: 30px; */
-    top: 0px; left: 0px; right: 0px; 
-    z-index: 300;
+    padding: 0;
+    min-width: 960px;

 }
 
 }
 

-#content {
+.vsplitbar {

     position: absolute;
     position: absolute;

-    top: 32px; left: 0px; right: 0px; bottom: 0px;
-    overflow: auto;
-    background-color: white;
+    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-right: 1px solid #999;
+    cursor: w-resize;

 }
 
 }
 

-#header #breadcrumbs {
+.vsplitbar.active {
+    cursor: e-resize;

 }
 
 }
 

-#header-right-toolbar {
+#source-editor, #simple-editor {

     position: absolute;
     position: absolute;

-    right: 1em;
-}
-
-#header button {
-    vertical-align: middle;
-}
-
-/* ========== */
-/* = Panels = */
-/* ========== */
-
-/* #panels {
-    height: 100%;
-    width: 100%;
-}
-
-.panel-wrap {
+    top: 25px;
+    bottom: 0;
+    left: 0;
+    right: 15px;

     overflow: hidden;
     overflow: hidden;

-    position: absolute; 
-    top: 0px;
-    bottom: 0px;
-}
-
-#left-panel-wrap {
-    left: 0px;
-    width: 8px; 
-}
-
-#right-panel-wrap {
-    right: 0px;
-    width: auto;
-    left: 8px; 

 }
 
 }
 

-.panel-content {
-    position: absolute;
+#html-view {

     overflow: auto;
     overflow: auto;

-    overflow-x: hidden;
-    top: 25px; left: 0px; bottom:0px; right: 0px;
+    position: absolute;
+    top: 27px;
+    bottom: 0;
+    left: 0;
+    right: 0;

 }
 
 }
 

-.panel-overlay {
+#sidebar {

     position: absolute;
     position: absolute;

-    top: 0px; bottom: 0px; left: 0px; right: 0px;
-    z-index: 100;
-    background: gray;
-    opacity: 0.8;
-    text-align: center;

     overflow: hidden;
     overflow: hidden;

+    top: 25px;
+    right: 0;
+    bottom: 0;
+    width: 0;

     display: none;
     display: none;

-    cursor: col-resize;
-}
-
-.panel-content-overlay {
-}
-
-.panel-wrap.last-panel .panel-content {
-    right: 0px;
-}
-
-.panel-wrap.last-panel .panel-slider {
-    display: none;
-}
-
-.panel-wrap .panel-toolbar {
-    position: absolute;
-    top: 0px; left:0px; right: 0px; height: 26px;
-    padding: 0px;
-
-    border-bottom: 1px solid #AAA;
-    z-index: 80;
-}
-.panel-wrap .panel-slider {
-    position: absolute;
-    background-color: #DDD;
-
-    top: 0px; bottom: 0px; right: 0px; width: 4px;
-
-    border-left: 1px solid #999;
-    border-right: 1px solid #999;
-    border-top: none;
-    border-bottom: none;
-
-    z-index: 90;
-    cursor: col-resize;
+    background-color: #FFF;

 }
 
 }
 

-.panel-wrap .panel-slider:hover {
-    background-color: #999;
-}
-
-.panel-content-overlay.panel-wrap .panel-slider {
-    background-color: #DDD;
+#header {
+    margin: 0;
+    padding: 0;
+    background-color: #C1C1C1;
+    background-image: -webkit-gradient(linear, left top, left bottom, from(#C1C1C1), color-stop(0.9, #A2A2A2));
+    font: 11px Helvetica, Verdana, sans-serif;
+    font-weight: bold;

 }
 
 }
 

-*/
-
-/* OLD STUFF AGAIN */
-
-/* Commit dialog */
-#commit-dialog-error-empty-message {
-    color: red;
-    display: none;
+#header h1 {
+    margin: 0;
+    padding: 0;
+    font: 17px Helvetica, Verdana, sans-serif;

     font-weight: bold;
     font-weight: bold;

+    float: left;
+    padding: 3px 6px 2px 6px;
+    color: #222;
+    line-height: 20px;

 }
 
 }
 

-text#commit-dialog-message {
-    width: 80%;
-    margin: auto;
+#tabs {
+    margin: 0;
+    padding: 0;
+    
+    width: 100%;
+    height: 22px;
+    padding-top: 2px;
+    border-bottom: 1px solid #999;

 }
 
 }
 

-#split-dialog .container-box form {
-    margin: 0.2em 1em;
+#tabs li {
+    -webkit-user-select: none;
+    cursor: default;
+    display: block;
+    float: left;
+    padding: 5px 12px 3px 12px;
+    border: 1px solid #999;
+    -webkit-border-radius: 4px;
+    -webkit-border-bottom-left-radius: 0;
+    -webkit-border-bottom-right-radius: 0;
+    font-weight: bold;
+    color: #222;
+    height: 13px;
+    -webkit-box-shadow: 1px -1px 2px rgba(127, 127, 127, 0.25);
+    margin-left: 4px;
+    margin-bottom: -1px;
+    background-color: #A2A2A2;

 }
 
 }
 

-#split-dialog .container-box fieldset {
-    margin: 0.5em;
+#tabs li.active {
+    background-color: #C1C1C1;
+    border-bottom: 1px solid #C1C1C1;

 }
 
 }
 

-
-
-
-/* ======= */
-/* = New = */
-/* ======= */
-#splitview {
+.toolbar {

     width: 100%;
     width: 100%;

-    height: 100%;
-    padding: 0;
+    border-bottom: 1px solid #777;
+    background-color: #C1C1C1;

     margin: 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: 25px;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    overflow: hidden;
-}
-
-.panel-main-toolbar {
-    z-index: 1100;    
-    position: absolute;
-
-    top: 0px;
-    right: 0px;
-    left: 0px;
-    height: 24px;
-
-    border-bottom: 1px solid black;
-    background: gray;
-
-    padding: 0px;
-}
-
-.panel-main-toolbar p {
-    margin: 0px;

     padding: 2px;
     padding: 2px;

-    line-height: 20px;
-    font-size: 13px;    
-}
-
-.xmlview {
-    height: 100%;
+    z-index: 10;
+/*    height: 22px;*/

 }
 
 }
 

-.view-overlay {
-    z-index: 1000;
-    background: #FFF;
-    opacity: 0.8;
-    text-align: center;
-    text-valign: center;
-}
-
-.view-overlay p {
+.toolbar button {

     display: block;
     display: block;

-    position: relative;
-    top: auto;
-    bottom: auto;
-    height: 40px;
+    float: left;
+    margin: 4px 0 2px 0;
+    padding: 0 5px 2px 5px;
+    border: none;
+    background: none;

 }
 
 }
 

-/* .buttontoolbarview {
-    display: block;
-    background-color: #CCC;
+.toolbar select {
+    float: left;
+    margin: 1px 5px 1px 0;
+    background: none;
+    border: 1px solid #999;
+    padding: 1px;

 }
 
 }
 

-.buttontoolbarview a {
-    color: #000;
-    text-decoration: none;
-} */ /* Similar classes already exist in toolbar.css */
-
-
-/* ================= */
-/* = Gallery panel = */
-/* ================= */
-.image-gallery-view-template {
-    position: absolute;
-    top: 0px; left: 0px; right: 0px; bottom: 0px;
-    overflow: hidden;
+.toolbar input {
+    float: left;
+    font-size: 11px;
+    padding: 0;
+    margin: 2px 5px 0 5px;

 }
 
 }
 

-.image-gallery-header {
-    position: absolute;
-    bottom: 0px;
-    left: 0px;
-    right: 0px;
-    height: 30px;
-
-    background: gray;
-    border-top: 1px solid #780000;
-    z-index: 100;
+.toolbar-end {
+    clear: both;

 }
 
 }
 

-input.image-gallery-current-page {
-    text-align: center;
+.toolbar button:hover, .toolbar button:active {
+    background: #777;
+    color: #FFF;
+    -webkit-border-radius: 10px;
+    -moz-border-radius: 10px;
+    border-radius: 10px;

 }
 
 }
 

-.image-gallery-header p {
-    margin: 0px;
-    padding: 3px 1em;
-    height: 30px;
-    line-height: 24px;
-    text-align: center;
-    white-space: nowrap;
+/* Remove extra padding in Firefox */
+button::-moz-focus-inner { 
+    border: 0;
+    padding: 0;

 }
 
 }
 

-.image-gallery-page-list {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    right: 0px;
-    bottom: 31px;
-    background: black;
-    z-index: 0;
+p { margin: 0;}

 
 

-    overflow: hidden;
+.htmlview *[x-editable] {
+    background-color: white;

 }
 
 }
 

-.image-gallery-page-container {
-    display: none;
-    border: none;
+.htmlview .active[x-editable] {
+    background-color: #FAFAFA;
+    border: 1px solid #DDD;
+/*    -webkit-transition: all 1s linear;*/
+}

 
 

-    position: absolute;
-    top: 0px; left: 0px;

 
 

-    text-align: center;
-    padding: 0px;
+/* =========== */
+/* = Gallery = */
+/* =========== */
+.change-gallery-panel {
+    width: 100%;
+    border-bottom: 1px solid #777;
+    background-color: #C1C1C1;
+    margin: 0;
+    padding: 2px;
+    z-index: 10;

 }
 
 }
 

-.htmlview {
+.gallery-image {

     position: absolute;
     position: absolute;

-    top: 25px;
+    top: 27px;

     right: 0;
     bottom: 0;
     left: 0;
     right: 0;
     bottom: 0;
     left: 0;

-    overflow: auto;

     margin: 0;
     margin: 0;

+    border: none;
+    background-color: #000;
+    overflow: hidden;

 }
 
 }
 

-.image-gallery-page-container img {
-    /* border: 2px solid green; */
-    margin: 0px;
-}
-
-body#base button {
-    background-color: #DDD;
-    border-width: 1px;
-    padding: 0px 0.5em;    
-    font-family: Sans-Serif;
-    /* color: #000; */
-    margin: 2px 4px;
-}
-
-body#base button:hover {
-    background-color: #EEE;
-}
-
-/* HTML editor interactive elements */
-
-.html-editarea {
-    border: 2px solid black;
-    background-color: gray;
-    padding: 1px;
-
-    z-index: 2000;
-}
-
-.html-editarea textarea
-{   
-   
-    border: 0px;
-    margin: 0px;    
-    padding: 0px;
-    
-    width: 100%;
-    height: 100%;
-    
-    z-index: 0;
-    font-size: 10pt;
-    background-color: ivory;
-}
-
-.html-editarea p.html-editarea-toolbar {
+img {

     position: absolute;
     position: absolute;

-    background: gray;
-
-    bottom: -26px;
-    height: 24px;
-    
-    left: 0px;
-    right: 0px;    
-        
-    border: 2px solid black;
-
-    margin: 0px;
-    padding: 0px;
-
-    z-index: 100;
-}
-
-/* ================= */
-/* = Message boxes = */
-/* ================= */
-.info {
-    background-color: gray;
-}
-
-.success {
-    background-color: green;
-}
-
-.error {
-    background-color: yellow;
-}
-
-.critical {
-    background-color: red;
-}
-
+    -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