diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt index 6e239b0..df98633 100644 --- a/Builder/IISMainHandler/build.txt +++ b/Builder/IISMainHandler/build.txt @@ -1 +1 @@ -1633 \ No newline at end of file +1656 \ No newline at end of file diff --git a/static/css/modern/global.css b/static/css/modern/global.css index 0634e27..a525721 100644 --- a/static/css/modern/global.css +++ b/static/css/modern/global.css @@ -1,5 +1,12 @@ body { font-size:11pt; } +.signature { + max-height:3.5em; + overflow:hidden; + text-align:right; + font-size:0.8em; +} + .zerosize { width:0px;height:0px;max-width:0px;max-height:0px; } pre @@ -39,15 +46,12 @@ pre .avatar, .userbar_avatar { border:none; max-height:6em; - height:expression((this.scrollHeight >= 90) ? '90px' : 'auto'); max-width:6em; - width:expression((this.scrollHeight >= 90) ? '90px' : 'auto'); overflow:hidden; } .userbarcontainer { border:none; max-width:6em; - width:expression((this.scrollHeight >= 90) ? '90px' : 'auto'); margin:5pt; } .userbar_additionalcontainer { @@ -62,6 +66,7 @@ pre white-space:nowrap; padding:5pt; font-size:1.2em; + z-index:10; } .UG_Blondes { color:red !important; @@ -166,6 +171,7 @@ BLOCKQUOTE BR {FONT-SIZE:1px} padding:5pt; font-size:0.8em; width:16.25em; + z-index:10; } a.external { padding-right:13px; @@ -173,3 +179,44 @@ a.external { background-repeat:no-repeat; background-position:right center; } +.threadscontainer { + vertical-align:top; +} +.threadcontainer { + vertical-align:top; + display:inline-block; + width:17em; + height:4em; + font-size:1em; + margin:5pt; + position:relative; +} +.threadcontainer .avatar, .threadcontainer .userbar_avatar { + max-height:3em; + max-width:4em; +} +.threadcontainer .userbarcontainer { + max-width:4em; +} +.threadcontainer .userbar_additional { + font-size:1em; +} +.threadcontainer_title { + font-size:1.1em; + font-weight:normal; + margin:0px; + height:3.5em; + overflow:hidden; +} +.threadcontainer_additionalcontainer { + height:0px; + max-height:0px; + overflow:visible; + position:relative; +} +.threadcontainer_additional { + position:absolute; + padding:5pt; + width:15em; + z-index:10; +} diff --git a/static/css/modern/iefixes.css b/static/css/modern/iefixes.css index 730b247..93ecea7 100644 --- a/static/css/modern/iefixes.css +++ b/static/css/modern/iefixes.css @@ -1,3 +1,13 @@ +.signature { + height: expression( this.scrollHeight > 49 ? '50px' : 'auto' ); +} +.avatar, .userbar_avatar { + height:expression((this.scrollHeight >= 90) ? '90px' : 'auto'); + width:expression((this.scrollHeight >= 90) ? '90px' : 'auto'); +} +.userbarcontainer { + width:expression((this.scrollHeight >= 90) ? '90px' : 'auto'); +} .categorycontainer { display:inline; } @@ -7,4 +17,14 @@ .board_additionalcontainer { width:0px; max-width:0px; -} \ No newline at end of file +} +.threadcontainer { + display:inline; +} +.threadcontainer .avatar, .threadcontainer .userbar_avatar { + height:expression((this.scrollHeight >= 45) ? '45px' : 'auto'); + width:expression((this.scrollHeight >= 60) ? '60px' : 'auto'); +} +.threadcontainer .userbarcontainer { + width:expression((this.scrollHeight >= 60) ? '60px' : 'auto'); +} diff --git a/static/css/modern/penartur.css b/static/css/modern/penartur.css index fc7828a..8cbafd7 100644 --- a/static/css/modern/penartur.css +++ b/static/css/modern/penartur.css @@ -30,19 +30,19 @@ blockquote { .boardscontainer { background-color:#101010; } -.boardcontainer { +.boardcontainer, .threadcontainer { background-color:#202020; } -.boardcontainer:hover { +.boardcontainer:hover, .threadcontainer:hover { background-color:#303030; } -.boardcontainer.updated { +.boardcontainer.updated, .threadcontainer.updated { background-color:#502800; } -.boardcontainer.updated:hover { +.boardcontainer.updated:hover, .threadcontainer.updated:hover { background-color:#684000; } -.board_additional { +.board_additional, .threadcontainer_additional { background-color:#302010; } diff --git a/templates/Modern/AllThreads.xslt b/templates/Modern/AllThreads.xslt index 59dd4e8..cda72c6 100644 --- a/templates/Modern/AllThreads.xslt +++ b/templates/Modern/AllThreads.xslt @@ -7,32 +7,17 @@ true - - - - -
- - - - - - - - - - - - - - -
ТемаАвторПросмотровПостовПоследнее
- - страницы: - - -
-
+
+ страницы: + +
+
+ +
+
+ страницы: + +
\ No newline at end of file diff --git a/templates/Modern/Board.xslt b/templates/Modern/Board.xslt index c1e1d25..4f1d353 100644 --- a/templates/Modern/Board.xslt +++ b/templates/Modern/Board.xslt @@ -13,34 +13,22 @@
-
- - - - -
- - - - - - - - - - - - - - -
ТемаАвторПросмотровПостовПоследнее
- - страницы: - - -
-
+
+ страницы: + +
+
+ + +
+
+ +
+
+ страницы: + +
\ No newline at end of file diff --git a/templates/Modern/UserThreads.xslt b/templates/Modern/UserThreads.xslt index 1331321..d0cb793 100644 --- a/templates/Modern/UserThreads.xslt +++ b/templates/Modern/UserThreads.xslt @@ -8,30 +8,17 @@ true - - - - -
- - - - - - - - - - - - -
ТемаАвторПросмотровПостовПоследнее
- - страницы: - - -
-
+
+ страницы: + +
+
+ +
+
+ страницы: + +
diff --git a/templates/Modern/elems/Main.xslt b/templates/Modern/elems/Main.xslt index 28a1118..413ba8b 100644 --- a/templates/Modern/elems/Main.xslt +++ b/templates/Modern/elems/Main.xslt @@ -7,12 +7,12 @@ - + [if lte IE 7]> + ]]><![endif] - /static/css/modern/penartur.css?v3.3 + /static/css/modern/penartur.css?v3.4 diff --git a/templates/Modern/elems/PostInfo.xslt b/templates/Modern/elems/PostInfo.xslt index 97ed751..36b50ed 100644 --- a/templates/Modern/elems/PostInfo.xslt +++ b/templates/Modern/elems/PostInfo.xslt @@ -109,7 +109,7 @@
-
+
diff --git a/templates/Modern/elems/ThreadInfo.xslt b/templates/Modern/elems/ThreadInfo.xslt index a69daee..c78b711 100644 --- a/templates/Modern/elems/ThreadInfo.xslt +++ b/templates/Modern/elems/ThreadInfo.xslt @@ -1,37 +1,32 @@ + + - - - - lighttable - - - darktable - - - - +
+ + threadcontainer + + updated + + +
+ +
+
- + - + - * - - - /static/images/message--notread.gif - - - /static/images/message--read.gif - - - - + fill +
+

+ /Thread/ @@ -44,6 +39,59 @@ +

+
+ showChildren(this); + hideChildren(this); + + +
+
+