From 46a21be0eb66f244b82a03399151673ceb409e2c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 2 Jan 2012 00:32:32 +0000 Subject: updated to latest DokuWiki version (including mediamanager, etc) --- css/_diff.css | 6 +- css/_fileuploader.css | 116 ++++++++++++ css/_links.css | 4 +- css/_media_fullscreen.css | 459 ++++++++++++++++++++++++++++++++++++++++++++++ css/_media_popup.css | 205 +++++++++++++++++++++ css/_mediamanager.css | 219 ---------------------- css/_modal.css | 156 ++++------------ css/_recent.css | 6 + css/_tabs.css | 40 ++++ css/basic.css | 5 +- css/content.css | 4 +- 11 files changed, 869 insertions(+), 351 deletions(-) create mode 100644 css/_fileuploader.css create mode 100644 css/_media_fullscreen.css create mode 100644 css/_media_popup.css delete mode 100755 css/_mediamanager.css create mode 100644 css/_tabs.css (limited to 'css') diff --git a/css/_diff.css b/css/_diff.css index f2be4ae54..62f831213 100755 --- a/css/_diff.css +++ b/css/_diff.css @@ -40,16 +40,16 @@ /* table body */ .dokuwiki table.diff td { - font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; } .dokuwiki table.diff td.diff-blockheader { font-weight: bold; } -.dokuwiki table.diff td.diff-addedline { +.dokuwiki table.diff .diff-addedline { background-color: #cfc; color: inherit; } -.dokuwiki table.diff td.diff-deletedline { +.dokuwiki table.diff .diff-deletedline { background-color: #fdd; color: inherit; } diff --git a/css/_fileuploader.css b/css/_fileuploader.css new file mode 100644 index 000000000..0b7cc8b42 --- /dev/null +++ b/css/_fileuploader.css @@ -0,0 +1,116 @@ +/** + * This file provides the styles for the file uploader + * used in the media manager (both fullscreen and popup). + */ + +.qq-uploader { + position: relative; + width: 100%; +} + +.qq-uploader .error { + color: #f00; + background-color: #fff; +} + +/* select file button */ + +.qq-upload-button { + display: inline-block; + border: 1px solid __border__; + color: __text__; + background: __background__ url(images/buttonshadow.png) repeat-x bottom; + text-decoration: none; + font-size: 100%; + cursor: pointer; + margin: 1px 1px 5px; + padding: 0.125em 0.4em; +} + +* html .qq-upload-button, +*+html .qq-upload-button { + display: inline; +} + +.qq-upload-button-focus { + outline: 1px dotted; +} + +/* drop area */ + +.qq-upload-drop-area { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + min-height: 70px; + z-index: 2; + background: __background_neu__; + color: __text__; + text-align: center; +} + +.qq-upload-drop-area span { + display: block; + position: absolute; + top: 50%; + width: 100%; + margin-top: -8px; + font-size: 120%; +} + +.qq-upload-drop-area-active { + background: __background_alt__; +} + +/* list of files to upload */ + +div.qq-uploader ul { + margin: 0; + padding: 0; + list-style: none; +} + +.qq-uploader li { + margin: 0 0 5px; + color: __text__; +} + +.qq-uploader li span, +.qq-uploader li input, +.qq-uploader li a { + margin-right: 5px; +} + +.qq-upload-file { + display: block; + font-weight: bold; +} + +.qq-upload-spinner { + display: inline-block; + background: url("../../images/throbber.gif"); + width: 15px; + height: 15px; + vertical-align: text-bottom; +} + +.qq-upload-size, +.qq-upload-cancel { + font-size: 85%; +} + +.qq-upload-failed-text { + display: none; +} +.qq-upload-fail .qq-upload-failed-text { + display: inline; +} + +.qq-action-container * { + vertical-align: middle; +} +.qq-overwrite-check input { + margin-left: 10px; +} diff --git a/css/_links.css b/css/_links.css index 7e7f18268..6b19c3a24 100755 --- a/css/_links.css +++ b/css/_links.css @@ -39,11 +39,12 @@ .dokuwiki a.interwiki { background-repeat: no-repeat; background-position: 0 center; - padding: 0 0 0 17px; + padding: 0 0 0 20px; } /* external link */ .dokuwiki a.urlextern { background-image: url(images/link_icon.gif); + padding: 0 0 0 17px; } /* windows share */ .dokuwiki a.windows { @@ -60,4 +61,5 @@ } /* interwiki link */ .dokuwiki a.interwiki { + padding: 0 0 0 17px; } diff --git a/css/_media_fullscreen.css b/css/_media_fullscreen.css new file mode 100644 index 000000000..52c893c8b --- /dev/null +++ b/css/_media_fullscreen.css @@ -0,0 +1,459 @@ +/** + * This file provides the styles for the fullscreen media manager + * (?do=media). + * + * What most templates would probably need to change (depending on + * their site width) are the 4 min-width's (search for @change). + */ + + +/*____________ structure ____________*/ + +#mediamanager__page h1 { + margin: 0 0 .5em; +} + +#mediamanager__page { + /* min-width must be summary of all 3 panels' min-widths */ + min-width: 50em; /* @change */ + width: 100%; + text-align: left; +} + +#mediamanager__page .panel { + float: left; +} + +#mediamanager__page .namespaces { + width: 20%; + min-width: 10em; /* @change */ +} +#mediamanager__page .filelist { + width: 50%; + min-width: 25em; /* @change */ +} +#mediamanager__page .file { + width: 30%; + min-width: 15em; /* @change */ +} + +#mediamanager__page .panelHeader { + background-color: __background_alt__; + margin: 0 10px 10px 0; + padding: 10px 10px 8px; + text-align: left; + min-height: 20px; + overflow: hidden; +} + +#mediamanager__page .panelContent { + overflow-y: auto; + overflow-x: hidden; + padding: 0; + margin: 0 10px 10px 0; + position: relative; +} + +#mediamanager__page .file .panelHeader, +#mediamanager__page .file .panelContent { + margin-right: 0; +} + +#mediamanager__page .ui-resizable-e { + width: 6px; + right: 2px; + background: transparent url(images/resizecol.png) center center no-repeat; +} +#mediamanager__page .ui-resizable-e:hover { + background-color: __background_alt__; +} + + +#mediamanager__page dd { + margin: 0; +} + +#mediamanager__page .panelHeader h3 { + float: left; + font-weight: normal; + font-size: 1em; + padding: 0; + margin: 0 0 3px; +} + + +/*____________ namespaces panel ____________*/ + +#mediamanager__page .namespaces h2 { + font-size: 1em; + display: inline-block; + border-width: 0; + padding: .3em .8em; + margin: 0 .3em 0 0; + border-radius: .5em .5em 0 0; + font-weight: normal; + background-color: __background_alt__; + color: __text__; + line-height: 1.4em; +} +* html #mediamanager__page .namespaces h2, +*+html #mediamanager__page .namespaces h2 { + display: inline; +} + +#mediamanager__page .namespaces ul { + margin-left: .2em; + margin-bottom: 0; + padding: 0; + list-style: none; +} +#mediamanager__page .namespaces ul ul { + margin-left: 1em; +} +#mediamanager__page .namespaces ul ul li { + margin: 0; +} + +#mediamanager__page .namespaces ul .selected { + background-color: __highlight__; + font-weight: bold; +} + + +/*____________ file list panel ____________*/ + +/* file list header */ + +#mediamanager__page .panelHeader form.options { + float: right; + margin-top: -3px; +} + +#mediamanager__page .panelHeader ul { + list-style: none; + margin: 0; + padding: 0; +} +#mediamanager__page .panelHeader ul li { + color: __text__; + float: left; + line-height: 1; + padding-left: 3px; +} + +#mediamanager__page .panelHeader ul li.listType { + padding-left: 30px; + background: url('../../images/icon-list.png') 3px 1px no-repeat; +} +#mediamanager__page .panelHeader ul li.sortBy { + padding-left: 30px; + background: url('../../images/icon-sort.png') 3px 1px no-repeat; +} + +#mediamanager__page .panelHeader form.options .ui-buttonset label{ + font-size: 90%; + margin-right: -0.4em; +} +#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text { + padding: .3em .5em; + line-height: 1; +} + +/* file list content */ + +#mediamanager__page .filelist ul { + padding: 0; + margin: 0; +} + +#mediamanager__page .filelist .panelContent ul li:hover { + background-color: __background_alt__; +} + +#mediamanager__page .filelist li dt a { + vertical-align: middle; + display: table-cell; + overflow: hidden; +} +* html #mediamanager__page .filelist .thumbs li dt a, +*+html #mediamanager__page .filelist .thumbs li dt a { + display: block; +} +* html #mediamanager__page .filelist .rows li dt a, +*+html #mediamanager__page .filelist .rows li dt a { + display: inline; +} + +/* file list as thumbs */ + +#mediamanager__page .filelist .thumbs li { + width: 100px; + min-height: 130px; + display: inline-block; + display: -moz-inline-stack; + /* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */ + margin: 0 6px 10px 0; + background-color: __background_neu__; + color: __text__; + padding: 5px; + vertical-align: top; + text-align: center; + position: relative; + line-height: 1.2; +} +* html #mediamanager__page .filelist .thumbs li, +*+html #mediamanager__page .filelist .thumbs li { + display: inline; + zoom: 1; +} + +#mediamanager__page .filelist .thumbs li dt a { + width: 100px; + height: 90px; +} + +#mediamanager__page .filelist .thumbs li dt a img { + max-width: 90px; + max-height: 90px; +} + +#mediamanager__page .filelist .thumbs li .name, +#mediamanager__page .filelist .thumbs li .size, +#mediamanager__page .filelist .thumbs li .filesize, +#mediamanager__page .filelist .thumbs li .date { + display: block; + overflow: hidden; + text-overflow: ellipsis; + width: 90px; + white-space: nowrap; +} +#mediamanager__page .filelist .thumbs li .name { + padding: 5px 0; + font-weight: bold; +} +#mediamanager__page .filelist .thumbs li .date { + font-style: italic; + white-space: normal; +} + +/* file list as rows */ + +#mediamanager__page .filelist .rows li { + list-style: none; + display: block; + position: relative; + max-height: 50px; + margin: 0; + margin-bottom: 3px; + background-color: __background__; + color: __text__; + overflow: hidden; +} + +#mediamanager__page .filelist .rows li:nth-child(2n+1) { + background-color: __background_neu__; +} + +#mediamanager__page .filelist .rows li dt { + float: left; + width: 10%; + height: 40px; + text-align: center; +} + +#mediamanager__page .filelist .rows li dt a { + width: 100px; + height: 40px; +} + +#mediamanager__page .filelist .rows li dt a img { + max-width: 40px; + max-height: 40px; +} + +#mediamanager__page .filelist .rows li .name, +#mediamanager__page .filelist .rows li .size, +#mediamanager__page .filelist .rows li .filesize, +#mediamanager__page .filelist .rows li .date { + overflow: hidden; + text-overflow: ellipsis; + float: left; + margin-left: 1%; + white-space: nowrap; +} + +#mediamanager__page .filelist .rows li .name { + width: 30%; + font-weight: bold; +} +#mediamanager__page .filelist .rows li .size, +#mediamanager__page .filelist .rows li .filesize { + width: 15%; +} +#mediamanager__page .filelist .rows li .date { + width: 20%; + font-style: italic; + white-space: normal; +} + +/* upload form */ + +#mediamanager__page div.upload { + padding-bottom: 0.5em; +} + +/*____________ file panel ____________*/ + +#mediamanager__page .file ul.actions { + text-align: center; + margin: 0 0 5px; + padding: 0; + list-style: none; +} +#mediamanager__page .file ul.actions li { + display: inline; + margin: 0; +} + +#mediamanager__page .file div.image { + margin-bottom: 5px; + text-align: center; +} + +#mediamanager__page .file div.image img { + width: 100%; +} + +#mediamanager__page .file dl { + margin-bottom: 0; +} +#mediamanager__page .file dl dt { + font-weight: bold; + display: block; + background-color: __background_alt__; +} +#mediamanager__page .file dl dd { + display: block; + background-color: __background_neu__; +} + + +/* file meta data edit form */ + +#mediamanager__page form.meta div.row { + margin-bottom: 5px; +} + +#mediamanager__page form.meta label span { + display: block; +} + +#mediamanager__page form.meta input { + width: 50%; +} + +#mediamanager__page form.meta input.button { + width: auto; +} + +#mediamanager__page form.meta textarea.edit { + height: 6em; + width: 95%; + min-width: 95%; + max-width: 95%; +} + +/* file revisions form */ + +#mediamanager__page #page__revisions ul { + margin-left: 10px; + padding: 0; + list-style-type: none; +} + +#mediamanager__page #page__revisions ul li div.li div { + font-size: 90%; + color: __text_neu__; + padding-left: 18px; +} + +#mediamanager__page #page__revisions ul li div.li input { + position: relative; + top: 1px; +} + +/* file diff view */ + +#mediamanager__diff table { + table-layout: fixed; + border-width: 0; +} + +#mediamanager__diff td, +#mediamanager__diff th { + width: 48%; + margin: 0 5px 10px 0; + padding: 0; + vertical-align: top; + text-align: left; + border-color: __background__; +} + +#mediamanager__diff th { + font-weight: normal; + background-color: __background__; + line-height: 1.2; +} +#mediamanager__diff th a { + font-weight: bold; +} +#mediamanager__diff th span { + font-size: 90%; +} + +#mediamanager__diff dl dd strong{ + background-color: __highlight__; + color: __text__; + font-weight: normal; +} + +/* image diff views */ + +#mediamanager__page .file form.diffView { + margin-bottom: 10px; + display: block; +} + +#mediamanager__diff div.slider { + margin: 10px; + width: 95%; +} + +#mediamanager__diff .imageDiff { + position: relative; +} +#mediamanager__diff .imageDiff .image1, +#mediamanager__diff .imageDiff .image2 { + width: 97%; +} +#mediamanager__diff .imageDiff .image2 { + position: absolute; + top: 0; + left: 0; +} + +#mediamanager__diff .imageDiff.opacity .image2 { + -moz-opacity: 0.5; + -khtml-opacity: 0.5; + opacity: 0.5; +} + +#mediamanager__diff .imageDiff.portions .image2 { + border-right: 1px solid red; + overflow: hidden; +} + +#mediamanager__diff .imageDiff img { + width: 100%; +} + diff --git a/css/_media_popup.css b/css/_media_popup.css new file mode 100644 index 000000000..0469c8e60 --- /dev/null +++ b/css/_media_popup.css @@ -0,0 +1,205 @@ +/** + * This file provides styles for the media manager popup + * (mediamanager.php). + */ + +/*____________ structure ____________*/ + +html.popup { + overflow: auto; +} + +#media__manager { + height: 100%; + overflow: hidden; +} + +#mediamgr__aside { + width: 30%; + height: 100%; + overflow: auto; + position: absolute; + left: 0; + border-right: 1px solid __border__; +} +#mediamgr__aside .pad { + padding: .5em; +} + +#mediamgr__content { + width: 69.7%; + height: 100%; + overflow: auto; + position: absolute; + right: 0; +} +#mediamgr__content .pad { + padding: .5em; +} + +#media__manager h1, +#media__manager h2 { + font-size: 1.5em; + margin-bottom: .5em; + padding-bottom: .2em; + border-bottom: 1px solid __border__; +} + +/* left side +********************************************************************/ + +/*____________ options ____________*/ + +#media__opts { + margin-bottom: .5em; +} + +#media__opts input { + margin-right: .3em; +} +#media__opts label { +} + +/*____________ tree ____________*/ + +#media__tree ul { + padding-left: .2em; +} +#media__tree ul li { + clear: left; + list-style-type: none; + list-style-image: none; + margin-left: 0; +} +#media__tree ul li img { + float: left; + padding: .5em .3em 0 0; +} +#media__tree ul li div.li { + display: inline; +} +#media__tree ul li li { + margin-left: 1.5em; +} + +/* right side +********************************************************************/ + +/*____________ upload form ____________*/ + +/* upload info */ +#media__content div.upload { + font-size: .9em; + margin-bottom: .5em; +} + +#mediamanager__uploader { + margin-bottom: 1em; +} +#mediamanager__uploader p { + margin-bottom: .5em; +} + +/*____________ file list ____________*/ + +#media__content img.load { + margin: 1em auto; +} + +#media__content .odd, +#media__content .even { + padding: .5em; +} +#media__content .odd { + background-color: __background_alt__; +} +#media__content .even { +} +/* highlight newly uploaded or edited file */ +#media__content #scroll__here { + border: 1px dashed __border__; +} + +/* link which inserts media file */ +#media__content a.mediafile { + margin-right: 1.5em; + font-weight: bold; +} +#media__content span.info { +} +#media__content img.btn { + vertical-align: text-bottom; +} + +/* info how to insert media, if JS disabled */ +#media__content div.example { + color: __text_neu__; + margin-left: 1em; +} + +#media__content div.detail { + padding: .2em 0; +} +#media__content div.detail div.thumb { + float: left; + margin: 0 .5em 0 18px; +} +#media__content div.detail div.thumb a { + display: block; + cursor: pointer; +} +#media__content div.detail p { + margin-bottom: 0; +} + + +/*____________ media search ____________*/ + +form#dw__mediasearch { +} +form#dw__mediasearch p { +} +form#dw__mediasearch label { +} +form#dw__mediasearch label span { +} +form#dw__mediasearch input.edit { +} +form#dw__mediasearch input.button { +} + + +/* meta edit form +********************************************************************/ + +#media__content form.meta { +} + +#media__content form.meta div.metafield { + clear: left; + margin-bottom: .5em; + overflow: hidden; +} + +#media__content form.meta label { + display: block; + width: 25%; + float: left; + font-weight: bold; + clear: left; +} +#media__content form.meta .edit { + float: left; + width: 70%; + margin: 0; +} +#media__content form.meta textarea.edit { + /* needed because of IE8 hack in _edit.css for textarea.edit: */ + max-width: 70%; + min-width: 70%; +} + +#media__content form.meta div.buttons { + clear: left; + margin: .2em 0 0 25%; +} diff --git a/css/_mediamanager.css b/css/_mediamanager.css deleted file mode 100755 index d47e581ff..000000000 --- a/css/_mediamanager.css +++ /dev/null @@ -1,219 +0,0 @@ -/** - * This file provides styles for the media manager - * (mediamanager.php). - */ - -/*____________ structure ____________*/ - -html.popup { - overflow: auto; -} - -#media__manager { - height: 100%; - overflow: hidden; -} - -#mediamgr__aside { - width: 30%; - height: 100%; - overflow: auto; - position: absolute; - left: 0; - border-right: 1px solid __border__; -} -#mediamgr__aside .pad { - padding: .5em; -} - -#mediamgr__content { - width: 69.7%; - height: 100%; - overflow: auto; - position: absolute; - right: 0; -} -#mediamgr__content .pad { - padding: .5em; -} - -#media__manager h1, -#media__manager h2 { - font-size: 1.5em; - margin-bottom: .5em; - padding-bottom: .2em; - border-bottom: 1px solid __border__; -} - -/* left side -********************************************************************/ - -/*____________ options ____________*/ - -#media__opts { - margin-bottom: .5em; -} - -#media__opts input { - margin-right: .3em; -} -#media__opts label { -} - -/*____________ tree ____________*/ - -#media__tree ul { - padding-left: .2em; -} -#media__tree ul li { - clear: left; - list-style-type: none; - list-style-image: none; - margin-left: 0; -} -#media__tree ul li img { - float: left; - padding: .5em .3em 0 0; -} -#media__tree ul li div.li { - display: inline; -} -#media__tree ul li li { - margin-left: 1.5em; -} - -/* right side -********************************************************************/ - -/*____________ upload form ____________*/ - -/* upload info */ -#media__content div.upload { - font-size: .9em; - margin-bottom: .5em; -} - -#media__content form#dw__upload, -#media__content div#dw__flashupload { - display: block; - border-bottom: solid 1px __border__; - padding-bottom: 1em; - margin-bottom: 1em; -} -#media__content form#dw__upload p { - margin-bottom: .5em; -} - -#media__content form#dw__upload label { -} -#media__content form#dw__upload label.check { -} -#media__content form#dw__upload input.check { -} -#media__content form#dw__upload input.edit { -} -#media__content form#dw__upload img { -} - -/*____________ file list ____________*/ - -#media__content img.load { - margin: 1em auto; -} - -#media__content .odd, -#media__content .even { - padding: .5em; -} -#media__content .odd { - background-color: __background_alt__; -} -#media__content .even { -} -/* highlight newly uploaded or edited file */ -#media__content #scroll__here { - border: 1px dashed __border__; -} - -/* link which inserts media file */ -#media__content a.mediafile { - margin-right: 1.5em; - font-weight: bold; -} -#media__content span.info { -} -#media__content img.btn { - vertical-align: text-bottom; -} - -/* info how to insert media, if JS disabled */ -#media__content div.example { - color: __text_neu__; - margin-left: 1em; -} - -#media__content div.detail { - padding: .2em 0; -} -#media__content div.detail div.thumb { - float: left; - margin: 0 .5em 0 18px; -} -#media__content div.detail div.thumb a { - display: block; -} -#media__content div.detail p { - margin-bottom: 0; -} - - -/*____________ media search ____________*/ - -form#dw__mediasearch { -} -form#dw__mediasearch p { -} -form#dw__mediasearch label { -} -form#dw__mediasearch label span { -} -form#dw__mediasearch input.edit { -} -form#dw__mediasearch input.button { -} - - -/* meta edit form -********************************************************************/ - -#media__content form.meta { -} - -#media__content form.meta div.metafield { - clear: left; - margin-bottom: .5em; - overflow: hidden; -} - -#media__content form.meta label { - display: block; - width: 25%; - float: left; - font-weight: bold; - clear: left; -} -#media__content form.meta .edit { - float: left; - width: 70%; - margin: 0; -} -#media__content form.meta textarea.edit { - /* needed because of IE8 hack in _edit.css for textarea.edit: */ - max-width: 70%; - min-width: 70%; -} - -#media__content form.meta div.buttons { - clear: left; - margin: .2em 0 0 25%; -} diff --git a/css/_modal.css b/css/_modal.css index 89eb48dab..125f702a8 100755 --- a/css/_modal.css +++ b/css/_modal.css @@ -1,36 +1,16 @@ - -/* TODO */ - /** * This file provides styles for modal dialogues. */ +.dokuwiki .ui-widget { + font-size: 100%; +} + + /* link wizard (opens from the link button in the edit toolbar) ********************************************************************/ #link__wiz { - position: absolute; - display: block; - z-index: 99; - width: 300px; - height: 250px; - padding: 0; - margin: 0; - overflow: hidden; - border: 1px solid __border__; - background-color: __background_neu__; - text-align: center; -} - -#link__wiz_header { - background-color: __background_alt__; - height: 16px; - margin-bottom: 5px; -} - -#link__wiz_close { - cursor: pointer; - margin: 0; } #link__wiz_result { @@ -41,21 +21,28 @@ border: 1px solid __border__; margin: 3px auto; text-align: left; + line-height: 1; } -#link__wiz_result div.type_u { - padding: 3px 3px 3px 22px; - background: transparent url(../../images/up.png) 3px 3px no-repeat; +#link__wiz_result div { + padding: 3px 3px 3px 0; } -#link__wiz_result div.type_f { - padding: 3px 3px 3px 22px; - background: transparent url(../../images/page.png) 3px 3px no-repeat; +#link__wiz_result div a { + display: block; + padding-left: 22px; + min-height: 16px; + background: transparent 3px center no-repeat; } -#link__wiz_result div.type_d { - padding: 3px 3px 3px 22px; - background: transparent url(../../images/ns.png) 3px 3px no-repeat; +#link__wiz_result div.type_u a { + background-image: url(../../images/up.png); +} +#link__wiz_result div.type_f a { + background-image: url(../../images/page.png); +} +#link__wiz_result div.type_d a { + background-image: url(../../images/ns.png); } #link__wiz_result div.even { @@ -69,107 +56,28 @@ #link__wiz_result span { display: block; color: __text_neu__; -} - -/*FIXME maybe move to a more general style sheet*/ -.ondrag { - cursor: move; - opacity: 0.8; + margin-left: 22px; } /* media option wizard (opens when inserting media in the media popup) ********************************************************************/ -/* --- popup --- */ - #media__popup { - background-color:__background__; - display:none; - border: 1px solid __border__; - position: absolute; - width:270px; -} - -#media__popup h1 { - text-align:center; - font-weight:normal; - background-color: __background_alt__; - height: 16px; - margin-bottom: 5px; - font-size:12px; - border-bottom: 0; + /* for backwards compatibility (not needed since Rincewind) */ + display: none; } -#media__popup p { - display:block; - line-height:14pt; - margin:0.5em; +#media__popup_content p { + margin: 0 0 .5em; } -#media_nolink { - padding:4px 0; +#media__popup_content label { + margin-right: .5em; + cursor: default; } -#media__popup label { - float:left; - width:9em; -} - -#media__popup .button { - margin-left:auto; - margin-right:auto; -} - -#media__popup .btnlbl { - text-align:center; -} - -#media__popup .btnlbl input { - margin:0 1em; -} - -#media__closeimg { - float:right; -} - -/* --- display options --- */ - -#media__linkopts label, -#media__nolnk { - width: 80px; - float: left; - margin-left: 10px; -} - -#media__linkopts label{ - line-height: 20px; -} - -#media__nolnk, -#media__linkopts label.long{ - margin-bottom: 8px; - line-height: 12px; -} - -#media__linkopts label.long{ - width: 150px; - float: none; -} - -#media__linkopts br { - clear: both; -} - -#media__linkopts select { - width: 60px; - margin-left: 10px; -} - -#media__linkopts input.edit { - width:50px; - margin-left:10px; -} -#media__linkopts #media__title { - width:150px; +#media__popup_content .button { + margin-right: 1px; + cursor: pointer; } diff --git a/css/_recent.css b/css/_recent.css index 98646e057..0e3745cbd 100755 --- a/css/_recent.css +++ b/css/_recent.css @@ -5,6 +5,12 @@ /*____________ list of revisions / recent changes ____________*/ +/* select type of revisions (media/pages), should have a class on it's own, but hasn't */ +.dokuwiki #dw__recent label { + margin-bottom: .5em; + display: block; +} + .dokuwiki #dw__recent ul li, .dokuwiki #page__revisions ul li { list-style: none; diff --git a/css/_tabs.css b/css/_tabs.css new file mode 100644 index 000000000..de544fd2b --- /dev/null +++ b/css/_tabs.css @@ -0,0 +1,40 @@ +/** + * This file provides the styles for general tabs. + */ + +.dokuwiki ul.tabs { + padding: 0; + margin: 0; + overflow: hidden; +} +.dokuwiki ul.tabs li { + float: left; + padding: 0; + margin: 0; + list-style: none; +} + +.dokuwiki ul.tabs li strong, +.dokuwiki ul.tabs li a { + float: left; + padding: .3em .8em; + margin: 0 .3em 0 0; + background-color: __background_neu__; + color: __text__; + border-radius: .5em .5em 0 0; +} +.dokuwiki ul.tabs li strong { + font-weight: normal; +} + +.dokuwiki ul.tabs li a:link, +.dokuwiki ul.tabs li a:visited { +} +.dokuwiki ul.tabs li a:hover, +.dokuwiki ul.tabs li a:active, +.dokuwiki ul.tabs li a:focus, +.dokuwiki ul.tabs li strong { + background-color: __background_alt__; + color: __text__; + text-decoration: none; +} diff --git a/css/basic.css b/css/basic.css index 51d1ed7ed..1ceddc05d 100755 --- a/css/basic.css +++ b/css/basic.css @@ -45,6 +45,7 @@ caption, legend { color: #000;/* @todo: style.ini */ background-color: inherit; padding: 0; + line-height: 1.2; clear: left; /* ideally 'both', but problems with toc */ } @@ -189,7 +190,7 @@ acronym, abbr { } pre, code, samp, kbd { - font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */ font-size: 1em; direction: ltr; @@ -301,7 +302,7 @@ option { font-style: normal; font-weight: normal; } /*____________ general classes ____________*/ div.clearer { - /* additional to what's already in lib/styles/style.css: */ + /* additional to what's already in lib/styles/all.css: */ font-size: 1px; visibility: hidden; } diff --git a/css/content.css b/css/content.css index 60b1d6771..64adda388 100755 --- a/css/content.css +++ b/css/content.css @@ -25,7 +25,7 @@ /*____________ images ____________*/ -/* embedded images (styles are already partly set in lib/styles/style.css) */ +/* embedded images (styles are already partly set in lib/styles/all.css) */ .dokuwiki img.media { } .dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; } .dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; } @@ -64,7 +64,7 @@ .dokuwiki samp, .dokuwiki kbd { background-color: __background_alt__; - color: inherit; + color: __text__; } /* fix if background-color hides underlining */ .dokuwiki em.u code { -- cgit v1.2.3