From 696533430fee5a92c32d5a2b95f14ce072b4264a Mon Sep 17 00:00:00 2001 From: Filip Zybała Date: Thu, 7 May 2020 09:38:00 +0200 Subject: Platform tag is created only if content has one platform. Adjusted css: deleted animation. Div should handle multiple signatures. --- .../out/html/root/[jvm root]/-fancy/index.html | 6 +-- .../out/html/root/[jvm root]/index.html | 4 +- .../out/html/scripts/pages.js | 6 +-- .../out/html/styles/style.css | 46 +++++++--------------- 4 files changed, 23 insertions(+), 39 deletions(-) (limited to 'plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html') diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html index f9f62321..6e63f9bd 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html @@ -37,7 +37,7 @@
-
+
open fun equals(other: Any): Boolean
@@ -53,7 +53,7 @@
-
+
open fun hashCode(): Int
@@ -69,7 +69,7 @@
-
+
open fun toString(): String
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html index ae5add43..34c24707 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html @@ -36,7 +36,7 @@
-
+
annotation class Fancy
@@ -55,7 +55,7 @@
-
+
final fun function(notInlined:
() -> Unit
)
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/pages.js index 45fc038f..5ed8d042 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/pages.js @@ -3,8 +3,8 @@ var pages = [ { "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, { "name": "function", "location": "root/[jvm root]/function.html" }, { "name": "Fancy", "class": "Fancy", "location": "root/[jvm root]/-fancy/index.html" }, -{ "name": "", "location": "root/[jvm root]/-fancy/-init-.html" }, { "name": "toString", "location": "root/[jvm root]/-fancy/to-string.html" }, -{ "name": "equals", "location": "root/[jvm root]/-fancy/equals.html" }, -{ "name": "hashCode", "location": "root/[jvm root]/-fancy/hash-code.html" } +{ "name": "", "location": "root/[jvm root]/-fancy/-init-.html" }, +{ "name": "hashCode", "location": "root/[jvm root]/-fancy/hash-code.html" }, +{ "name": "equals", "location": "root/[jvm root]/-fancy/equals.html" } ] diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/styles/style.css b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/styles/style.css index fc032e29..687a14e1 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/styles/style.css @@ -399,18 +399,12 @@ footer { } .platform-tag { - text-indent: 100%; - white-space: nowrap; - overflow: hidden; - width: 10px; - height: 10px; - max-width: 10px; - max-height: 10px; - border-radius: 8px; - transition: width 1s, height 1s; - margin-left: 14px; - margin-top: auto; - margin-bottom: auto; + display: flex; + flex-direction: row; + padding: 4px 8px; + height: 16px; + border-radius: 100px; + font-family: Inter, Arial, sans-serif; font-size: 12px; font-weight: 400; @@ -419,40 +413,25 @@ footer { line-height: normal; letter-spacing: normal; text-align: center; + color: #fff -} -.table-row:hover .platform-tag, -.table-row:hover > .platform-tag { - text-indent: 0; - white-space: nowrap; - padding: 0 7px; - border-radius: 9px; - margin-left: 8px; - width: auto; - height: 15px; - max-width: 500px; - max-height: 500px; - transition: max-width 1s, max-height 1s } .platform-tags { flex: auto; display: flex; flex-direction: row; - padding: 0px; - min-width: 230px; align-items: flex-start; justify-content: flex-end; } .platform-tags > .platform-tag { align-self: center; - margin: 10px; } .platform-tag:nth-child(1) { - background-color: blue; + background-color: #4DBB5F; color: white; } @@ -497,6 +476,7 @@ td.content { .platform-hinted { display: block; + margin-bottom: 5px; } .platform-hinted > .platform-bookmarks-row { @@ -518,7 +498,7 @@ td.content { } .platform-hinted > .platform-bookmarks-row > .platform-bookmark:nth-child(1):hover { - border-top: 2px solid blue; + border-top: 2px solid #4DBB5F; } .platform-hinted > .platform-bookmarks-row > .platform-bookmark:nth-child(2):hover { @@ -556,6 +536,7 @@ td.content { .table { display: flex; flex-direction: column; + flex-direction: column; } .table-row { @@ -593,8 +574,11 @@ td.content { order: 4; } -.signature-subrow > .signature { +.signature-subrow > .signatures { grid-column-start: 2; + display: flex; + flex-direction: column; + margin-top: 5px; } .signature-subrow > * { -- cgit