X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/afdb8fd05511c5280e8ee251389cb893786eb810..cb50c78e7f77e5416fa405db18d142c96d16a543:/platforma/static/css/master.css?ds=inline diff --git a/platforma/static/css/master.css b/platforma/static/css/master.css index d2768be9..d41a73c8 100644 --- a/platforma/static/css/master.css +++ b/platforma/static/css/master.css @@ -1,3 +1,13 @@ +a, a:visited, a:active { + color: blue; + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} + + body { margin: 0; overflow: hidden; @@ -9,23 +19,29 @@ body { .vsplitbar { position: absolute; - top: 25px; + top: 0px; bottom: 0; right: 0;; width: 13px; background: #C1C1C1 url(../img/gallery.png) no-repeat scroll center center; + text- border-left: 1px solid #999; border-right: 1px solid #999; - cursor: w-resize; + cursor: pointer; +} + +.vsplitbar:hover { + background-color: #e6e6fa; } .vsplitbar.active { - cursor: e-resize; + background- + } #source-editor, #simple-editor, #history-viewer { position: absolute; - top: 25px; + top: 0px; bottom: 0; left: 0; right: 15px; @@ -35,16 +51,17 @@ body { #html-view, #history-view { overflow: auto; position: absolute; - top: 27px; + top: 30px; bottom: 0; left: 0; right: 0; + z-index: 1; } #sidebar { position: absolute; overflow: hidden; - top: 25px; + top: 0px; right: 0; bottom: 0; width: 0; @@ -52,11 +69,33 @@ body { background-color: #FFF; } + +#splitter { + position: fixed; + top: 31px; + left: 0px; + right: 0px; + bottom: 0px; + overflow: hidden; +} + + #header { + position: fixed; + top: 0px; + right: 0px; + left: 0px; + height: 30px; + border-bottom: 1px solid #999; + margin: 0; padding: 0; background-color: #C1C1C1; background-image: -webkit-gradient(linear, left top, left bottom, from(#C1C1C1), color-stop(0.9, #A2A2A2)); + + /* Firefox 3.6 */ + background-image: -moz-linear-gradient(top left, #C1C1C1, #A2A2A2, 90%); + font: 11px Helvetica, Verdana, sans-serif; font-weight: bold; } @@ -78,46 +117,70 @@ body { } #tabs { + overflow: hidden; margin: 0; - padding: 0; - - width: 100%; - height: 22px; - padding-top: 2px; - border-bottom: 1px solid #999; + height: 30px; + padding-left: 1em; } #tabs li { - -webkit-user-select: none; - cursor: default; + height: 24px; + margin-top: 6px; + + -webkit-user-select: none; + cursor: pointer; 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; + + padding-left: 12px; + padding-right: 12px; + padding-top: 5px; + 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; + margin-left: 4px; + background-color: #A2A2A2; + + -moz-box-shadow: 1px -1px 2px rgba(127, 127, 127, 0.25); + -webkit-box-shadow: 1px -1px 2px rgba(127, 127, 127, 0.25); + + border: 1px solid #999; + -moz-border-radius: 4px 4px 0px 0px; + -webkit-border-radius: 4px; + -webkit-border-bottom-left-radius: 0px; + -webkit-border-bottom-right-radius: 0px; } #tabs li.active { - background-color: #C1C1C1; - border-bottom: 1px solid #C1C1C1; + background-color: #C1C1C1; +} + +#tools { + float: right; + clear: right; + overflow: hidden; + margin: 0; + padding: 0; + height: 30px; + margin-right: 5px; + line-height: 30px; + font-size: 10px; + vertical-align: middle; } + +/* + * Toolbars + */ + .toolbar { width: 100%; border-bottom: 1px solid #777; background-color: #C1C1C1; margin: 0; padding: 2px; - z-index: 10; + z-index: 100; /* height: 22px;*/ } @@ -162,7 +225,6 @@ body { color: #FFF; -webkit-border-radius: 10px; -moz-border-radius: 10px; - border-radius: 10px; } /* Remove extra padding in Firefox */ @@ -173,17 +235,6 @@ button::-moz-focus-inner { 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 = */ /* =========== */ @@ -257,60 +308,109 @@ p { margin: 0;} } -.xml-iframe { - margin-left: 40px; -} + /* * CodeMirror */ + .CodeMirror-line-numbers { - background: #e6ddd5; - padding-top: 0.35em; + padding: 0px; + padding-top: 5px; + text-align: right; + overflow: hidden; + width: 40px; + border-right: 1px solid black; + background-color: #e6e6fa; } .CodeMirror-line-numbers div { - padding: 0; - padding-right: 4px; - - font-size: 8pt; - line-height: 17px; - text-align: right; - - width: 40px; -} + display: block; + font-family:"Lucida Console", monospace; + font-size: 13px; + line-height: 18px; + padding-right: 5px; +} + +#history-view table { + width: 80%; + margin: 1em auto; +} + +#history-view .diff_table { + width: 90%; +} /* DIFFS */ - #history-view table { - width: 75%; - margin: 1em auto; - max-height: 400px; - overflow-y: auto; - } - - #diff-view { - border: 2px solid black; - background: #fafafa; - margin: 1em auto; - width: 90%; - } - - td.diff_header { - display: none; - } - - td.diff_next { - display: none; - } + .diff_table { + border-width: 1px; + border-style: solid; + border-color: black; + empty-cells: show; + border-spacing: 0px; +} + +.diff_table td { + border-width: 0px 1px 1px 0px; + border-style: dotted; + border-color: grey; + + font-size: 10px; + line-height: 20px; + font-family: monospace; + padding: 0px; + white-space:pre-line; + /*word-wrap:break-word; + word-break:break-all; */ +} - .diff_sub { - background-color: #ef4040; - } +.diff_table th { + border-width: 0px 1px 1px 0px; + border-style: solid; + border-color: black; + background: #e5ffe5; +} - .diff_chg { - background-color: #efef40; - } +/* .diff_table td.left, .diff_table td.right { + width: 50%; +}*/ + +.diff_table tr.change { + background-color: #dcdcdc; + +} + +.diff_mark { + display: inline-block; + padding: 2px; +} + +.diff_mark_removed { + background-color: #ff9c94; +} + +.diff_mark_added { + background-color: #90ee90; +} + +.diff_mark_changed { + background-color: yellow; +} +/* + * HTML Editor view + */ - .diff_add { - background-color: #40ef40; - } +.htmlview { + z-index: 1; + overflow: hidden; +} + +.htmlview *[x-editable] { + background-color: white; + +} +.htmlview .active[x-editable] { + background-color: #FAFAFA; + border: 1px solid #DDD; +/* -webkit-transition: all 1s linear;*/ +} \ No newline at end of file