From: zuber Date: Fri, 11 Dec 2009 14:20:18 +0000 (+0100) Subject: Dodanie toolbara dla galerii X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/a08a59835fa7872c69ec1a662aa7945473eeaf2b?ds=sidebyside;hp=49d869f20275d40c814a0ac4279d75b9efc02ed5 Dodanie toolbara dla galerii --- diff --git a/platforma/static/css/html.css b/platforma/static/css/html.css index 3c168c12..cbf18745 100755 --- a/platforma/static/css/html.css +++ b/platforma/static/css/html.css @@ -523,4 +523,5 @@ .out-of-flow-text { border: 1px solid #C8B849; background-color: #D4CB9C; + white-space: pre; } \ No newline at end of file diff --git a/platforma/static/css/master.css b/platforma/static/css/master.css index e3d0b9c8..d7b6dc0b 100755 --- a/platforma/static/css/master.css +++ b/platforma/static/css/master.css @@ -28,7 +28,7 @@ body { #html-view { overflow: auto; position: absolute; - top: 27px; + top: 26px; bottom: 0; left: 0; right: 0; @@ -107,14 +107,6 @@ body { /* height: 22px;*/ } -.toolbar select { - float: left; - margin: 2px 5px 2px 0; - background: none; - border: 1px solid #999; - padding: 1px; -} - .toolbar button { display: block; float: left; @@ -124,6 +116,20 @@ body { background: none; } +.toolbar select { + float: left; + margin: 1px 5px 1px 0; + background: none; + border: 1px solid #999; + padding: 1px; +} + +.toolbar input { + font-size: 11px; + padding: 0; + margin: 2px 5px 0 5px; +} + .toolbar-end { clear: both; } diff --git a/platforma/templates/wiki/document_details.html b/platforma/templates/wiki/document_details.html index 742566d3..139ade53 100644 --- a/platforma/templates/wiki/document_details.html +++ b/platforma/templates/wiki/document_details.html @@ -42,6 +42,11 @@