Critical of automatic merging of stylesheets

[git.ikiwiki.info.git] / doc / style.css

diff --git a/doc/style.css b/doc/style.css
index 78756481e0c3ec787a70cc54117c1d61e801eb73..f0846c0d651ef63db8a5d6f73a286cb4603326d7 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -5,16 +5,14 @@
  */
 
 /* html5 compat */
-article,
-header,
-footer,
-nav {
+article,aside,details,figcaption,figure,
+footer,header,hgroup,menu,nav,section {
        display: block;
 }
 
 .header {
        margin: 0;
-       font-size: 22px;
+       font-size: 140%;
        font-weight: bold;
        line-height: 1em;
        display: block;
@@ -22,19 +20,20 @@ nav {
 
 .inlineheader .author {
        margin: 0;
-       font-size: 18px;
+       font-size: 112%;
        font-weight: bold;
        display: block;
 }
 
 .actions ul {
        margin: 0;
-       padding: 6px;
+       padding: 6px .4em;
+       height: 1em;
        list-style-type: none;
 }
 .actions li {
        display: inline;
-       padding: .2em .4em;
+       padding: .2em;
 }
 .pageheader .actions ul {
        border-bottom: 1px solid #000;
@@ -57,14 +56,14 @@ nav {
        border-bottom: 1px solid #000;
 }
 
-.inlinecontent {
+.inlinecontent,
+.inlineenclosure {
        margin-top: .4em;
 }
 
-.pagefooter {
-       clear: both;
-}
-.inlinefooter {
+.pagefooter,
+.inlinefooter,
+.comments {
        clear: both;
 }
 
@@ -91,6 +90,10 @@ nav {
        text-align: center;
 }
 
+img.img {
+       margin: 0.5ex;
+}
+
 .align-left {
        float:left;
 }
@@ -109,19 +112,28 @@ nav {
 }
 
 #editcontent {
-       width: 100%;
+       width: 98%;
+}
+
+.editcontentdiv {
+       width: auto;
+       overflow: auto;
 }
 
 img {
        border-style: none;
 }
 
+pre {
+       overflow: auto;
+}
+
 div.recentchanges {
        border-style: solid;
        border-width: 1px;
        overflow: auto;
-       clear: both;
-       width: 100%;
+       width: auto;
+       clear: none;
        background: #eee;
        color: black !important;
 }
@@ -159,22 +171,26 @@ div.recentchanges {
        width: 35%;
        font-size: small;
 }
-.recentchanges .pagelinks {
+.recentchanges .pagelinks,
+.recentchanges .revert {
        float: right;
        margin: 0;
        width: 60%;
 }
 
-#blogform {
+.blogform, #blogform {
        padding: 10px 10px;
        border: 1px solid #aaa;
        background: #eee;
        color: black !important;
+       width: auto;
+       overflow: auto;
 }
 
 .inlinepage {
        padding: 10px 10px;
        border: 1px solid #aaa;
+       overflow: auto;
 }
 
 .pagedate,
@@ -185,12 +201,19 @@ div.recentchanges {
        margin-top: 1em;
 }
 
+.archivepagedate {
+       font-style: italic;
+}
+.archivepage {
+       margin-bottom: 1em;
+}
+
 .error {
        color: #C00;
 }
 
 .sidebar {
-       width: 30ex;
+       width: 20ex;
        float: right;
        margin-left: 4px;
        margin-bottom: 4px;
@@ -230,6 +253,9 @@ span.color {
 .comment-subject {
        font-weight: bold;
 }
+.comment-avatar {
+       float: right;
+}
 .comment {
        border: 1px solid #aaa;
        padding: 3px;
@@ -255,9 +281,10 @@ div.progress-done {
 @media print {
        .actions { display: none; }
        .tags { display: none; }
+       .trails { display: none; }
        .feedbutton { display: none; }
        #searchform { display: none; }
-       #blogform { display: none; }
+       .blogform, #blogform { display: none; }
        #backlinks { display: none; }
 }
 
@@ -295,6 +322,7 @@ div.progress-done {
 .popup .paren,
 .popup .expand {
        display: none;
+       text-align: left;
 }
 .popup:hover .balloon,
 .popup:focus .balloon {
@@ -325,12 +353,12 @@ label.block {
 label.inline {    
        display: inline;
 }
-ol.form {
-       list-style: none;
-       padding: 0;
-}
-li.form {
-       padding-bottom: 1em;
+input#openid_identifier {
+       background: url(wikiicons/openidlogin-bg.gif) no-repeat;
+       background-color: #fff;
+       background-position: 0 50%;
+       color: #000;
+       padding-left: 18px;
 }
 input#searchbox {
        background: url(wikiicons/search-bg.gif) no-repeat;
@@ -367,8 +395,17 @@ pre.hl { color:#000000; background-color:#ffffff; }
 .hl.kwd { color:#010181; }
 
 /* calendar plugin */
-.month-calendar-day-this-day { background-color: #eee; }
-.year-calendar-this-month { background-color: #eee; }
+.month-calendar-day-this-day,
+.year-calendar-this-month {
+       background-color: #eee;
+}
+.month-calendar-day-head,
+.month-calendar-day-nolink,
+.month-calendar-day-link,
+.month-calendar-day-this-day,
+.month-calendar-day-future {
+       text-align: right;
+}
 .month-calendar-arrow A:link,
 .year-calendar-arrow A:link,
 .month-calendar-arrow A:visited,
@@ -424,40 +461,135 @@ li.L8 { list-style: upper-alpha; }
        background: #ff9900;
 }
 
-/* openid selector */
-#openid_choice {
+.FlattrButton {
+       display: none;
+}
+
+/* login selector */
+#login_choice {
        display: none;
 }
-#openid_input_area {
+#login_input_area {
        clear: both;
        padding: 10px;
 }
-#openid_btns, #openid_btns br {
+#login_btns, #login_btns br {
        clear: both;
 }
-#openid_highlight {
-       padding: 3px;
-       background-color: #FFFCC9;
+#login_highlight {
+       background-color: black;
        float: left;
 }
-.openid_large_btn {
-       padding: 1em 1em;
+.login_large_btn {
+       padding: 1em 1.5em;
        border: 1px solid #DDD;
        margin: 3px;
        float: left;
 }
-.openid_small_btn {
+.login_small_btn {
        padding: 4px 4px;
        border: 1px solid #DDD;
        margin: 3px;
        float: left;
 }
-a.openid_large_btn:focus {
+a.login_large_btn:focus {
        outline: none;
 }
-a.openid_large_btn:focus {
-       -moz-outline-style: none;
+a.login_large_btn:focus {
+       outline-style: none;
 }
-.openid_selected {
+.login_selected {
        border: 4px solid #DDD;
 }
+
+.fileupload-content .ui-progressbar {
+       width: 200px;
+       height: 20px;
+}
+.fileupload-content .ui-progressbar-value {
+       background: url(ikiwiki/images/pbar-ani.gif);
+}
+
+.trails {
+       margin-top: 1em;
+       margin-bottom: 1em;
+}
+.trail {
+       display: block;
+       clear: both;
+       position: relative;
+}
+
+.trailprev {
+       display: block;
+       text-align: left;
+       position: absolute;
+       top: 0%;
+       left: 3%;
+       width: 30%;
+}
+
+.trailup {
+       display: block;
+       text-align: center;
+       margin-left: 35%;
+       margin-right: 35%;
+}
+
+.trailnext {
+       display: block;
+       text-align: right;
+       position: absolute;
+       top: 0%;
+       width: 30%;
+       right: 3%;
+}
+
+.trailsep {
+       display: none;
+}
+
+/* mobile/small-screen-friendly layout */
+@media (max-width: 600px) {
+       .sidebar {
+               width: auto;
+               float: none;
+               margin-top: 0;
+               border: none;
+       }
+
+       /* if the mobile browser is new enough, use flex layout to shuffle
+        * the sidebar to the end */
+       .page {
+               display: -webkit-box;
+               display: -webkit-flexbox;
+               display: -webkit-flex;
+               display: -moz-box;
+               display: -ms-flexbox;
+               display: flex;
+               -webkit-box-orient: vertical;
+               -webkit-flex-direction: tb;
+               -webkit-flex-direction: column;
+               -webkit-flex-flow: column;
+               -ms-flex-direction: column;
+               flex-direction: column;
+       }
+       #pageheader {
+               -webkit-box-ordinal-group: -1;
+               -webkit-order: -1;
+               -ms-box-ordinal-group: -1;
+               -ms-flex-order: -1;
+               order: -1;
+       }
+       .sidebar, #footer {
+               -webkit-box-ordinal-group: 1;
+               -webkit-order: 1;
+               -ms-box-ordinal-group: 1;
+               -ms-flex-order: 1;
+               order: 1;
+       }
+
+       .blogform, #blogform {
+               padding: 4px 4px;
+       }
+}