From 905b0f7cb5282c419534e7686675735bf70f5611 Mon Sep 17 00:00:00 2001 From: Aleksey Chichenkov Date: Wed, 10 Oct 2018 14:00:35 +0300 Subject: [PATCH] some restyle --- .../providers/interface/providers_system.js | 10 ++ templates/initi/static/styles/common.css | 162 ++++++++++++++++++ templates/initi/static/styles/full-method.css | 4 - .../initi/static/styles/jsdoc-default.css | 51 +----- templates/initi/static/styles/mainpage.css | 49 ------ templates/initi/static/styles/min-method.css | 78 --------- templates/initi/tmpl/container.tmpl | 12 +- templates/initi/tmpl/details.tmpl | 7 - templates/initi/tmpl/full_method/main.tmpl | 8 +- .../initi/tmpl/full_method/param_full.tmpl | 6 +- .../tmpl/full_method/params_compact.tmpl | 8 +- .../initi/tmpl/full_method/return_full.tmpl | 6 +- templates/initi/tmpl/layout.tmpl | 3 + templates/initi/tmpl/mainpage/part.tmpl | 2 +- templates/initi/tmpl/members.tmpl | 4 +- templates/initi/tmpl/members/main.tmpl | 6 +- templates/initi/tmpl/method.tmpl | 6 +- templates/initi/tmpl/method_compact.tmpl | 16 +- templates/initi/tmpl/params.tmpl | 2 +- templates/initi/tmpl/properties.tmpl | 2 +- 20 files changed, 218 insertions(+), 224 deletions(-) create mode 100644 templates/initi/static/styles/common.css diff --git a/docfiles/providers/interface/providers_system.js b/docfiles/providers/interface/providers_system.js index d95d8d1..bb17348 100644 --- a/docfiles/providers/interface/providers_system.js +++ b/docfiles/providers/interface/providers_system.js @@ -82,4 +82,14 @@ function ProvidersSystem() { * @type {number} */ this.s_platform_broken = -1; + + /** + * + * + * @name s_wait_login + * @public + * @memberof ProvidersSystem + * @type {number} + */ + this.s_wait_login = -1; } \ No newline at end of file diff --git a/templates/initi/static/styles/common.css b/templates/initi/static/styles/common.css new file mode 100644 index 0000000..05bda8b --- /dev/null +++ b/templates/initi/static/styles/common.css @@ -0,0 +1,162 @@ +div.min-methods{ + padding-bottom: 20px; +} + +.bold { + font-weight: bold; +} + +div.compact-method > .name, +div.compact-method > .name a, +div.container-overview > span.name, +div.container-overview > span.name a, +div.min-methods > .title, +div.full-method > .title span +{ + font-size: 24px; +} + +.name, .signature { + font-family: Consolas, Monaco, 'Andale Mono', monospace; + color: #d85a00; +} + +* { + font-size: 15px; +} + +div.type > span.name, +div.type > span.name a, +div.returns > span.name, +div.returns > span.name a, +div.short > span.name, +div.short > span.name a, +span.access, +div.params span, +div.returns span, +dl.article-sub-classes a, +ul.extends li a +{ + font-size: 20px; +} + +.ib { + display: inline-block; +} + +.bs { + box-sizing: border-box; +} + +.container-overview, +.mainpage { + margin-bottom: 10px; +} + +div.container-overview > div.desc, +div.mainpage > div.desc { + font-size: 15px; +} + +div.desc p { + margin: 0; + padding: 0; +} + +div.container-overview > .desc, +div.part > div.desc { + font-size: 15px; + box-sizing: border-box; + padding: 5px; +} + +div.container-overview > .desc > pre, +div.part > pre { + margin: 0px; + margin-left: 10px; + margin-top: 5px; + margin-bottom: 5px; +} + +div.container-overview > div.desc, +div.mainpage > div.part +{ + background: #f3f3f3; +} + +div.container-overview ul, +div.mainpage ul, +h3, +h4, +h5 { + margin: 0; +} +div.container-overview h5, +div.mainpage h5{ + font-size: initial; + font-weight: initial; + letter-spacing: initial; +} + +div.container-overview li, +div.mainpage li { + list-style: none; +} + +div.container-overview ul, +div.mainpage ul { + box-sizing: border-box; + padding-left: 25px; +} + +div.container-overview, +.part { + margin-top: 3px; + padding: 3px; +} + +.bdotted { + border-radius: 4px; + border-width: 1px; + border-color: #c7c7c7; + border-style: dotted; +} + +.desc blockquote { + margin-top: 0; + margin-bottom: 0; +} + +div.off-font { + font-size: 0; +} + +h2 span, +h2 a, +h2, h3.subsection-title +{ + font-size: 30px; + font-weight: 700; + letter-spacing: -1px; + margin-bottom: 12px; + margin-top: 22px; +} + +h3, h3 a +{ + font-size: 24px; + letter-spacing: -0.5px; + margin-bottom: 12px; +} + +h4, h4 a +{ + font-size: 18px; + letter-spacing: -0.33px; + color: #4d4e53; +} +.compact-method .param > .name:before { + content: " "; + width: 4px; + display: inline-block; +} diff --git a/templates/initi/static/styles/full-method.css b/templates/initi/static/styles/full-method.css index b150820..f379859 100644 --- a/templates/initi/static/styles/full-method.css +++ b/templates/initi/static/styles/full-method.css @@ -1,7 +1,3 @@ -.part { - margin-top: 3px; - padding: 3px; -} .full-methods > .title { font-size: 28px; diff --git a/templates/initi/static/styles/jsdoc-default.css b/templates/initi/static/styles/jsdoc-default.css index 8342ff7..131fd05 100644 --- a/templates/initi/static/styles/jsdoc-default.css +++ b/templates/initi/static/styles/jsdoc-default.css @@ -186,30 +186,6 @@ h1 margin: 12px 24px 20px; } -h2, h3.subsection-title -{ - font-size: 30px; - font-weight: 700; - letter-spacing: -1px; - margin-bottom: 12px; - margin-top: 22px; -} - -h3 -{ - font-size: 24px; - letter-spacing: -0.5px; - margin-bottom: 12px; -} - -h4 -{ - font-size: 18px; - letter-spacing: -0.33px; - /*margin-bottom: 12px;*/ - color: #4d4e53; - margin-top: 45px; -} h5, .container-overview .subsection-title { @@ -297,11 +273,6 @@ tr > th:last-child { border-right: 1px solid #ddd; } color: rgba(52, 109, 0, 0.71); } -.name, .signature { - font-family: Consolas, Monaco, 'Andale Mono', monospace; - color: #d85a00; - font-weight: bold; -} article ul { padding: 0px 0px 0px 31px; @@ -338,16 +309,6 @@ article ul { .details pre.prettyprint { margin: 0 } .details .object-value { padding-top: 0; } -.description { - font-size: 17px; - border-radius: 7px; - color: #000000; - border: 1px solid #e2e2e2; - background: rgb(245, 245, 245); - box-sizing: border-box; - padding: 5px; -} - .code-caption { font-style: italic; @@ -416,9 +377,9 @@ article ul { } .params .name, .props .name, .name code { - color: #4D4E53; - font-family: Consolas, Monaco, 'Andale Mono', monospace; - font-size: 100%; + /*color: #4D4E53;*/ + /*font-family: Consolas, Monaco, 'Andale Mono', monospace;*/ + /*font-size: 100%;*/ } .params td.description > p:first-child, @@ -449,9 +410,3 @@ article ul { font-size: 17px; } -.bdotted { - border-radius: 4px; - border-width: 1px; - border-color: #c7c7c7; - border-style: dotted; -} \ No newline at end of file diff --git a/templates/initi/static/styles/mainpage.css b/templates/initi/static/styles/mainpage.css index 8b4911e..e69de29 100644 --- a/templates/initi/static/styles/mainpage.css +++ b/templates/initi/static/styles/mainpage.css @@ -1,49 +0,0 @@ -.mainpage { - margin-bottom: 10px; -} - -div.mainpage > div.desc { - font-size: 15px; -} - -div.desc p { - margin: 0; - padding: 0; -} - -div.part > div.desc { - font-size: 15px; - box-sizing: border-box; - padding: 5px; - /*padding-bottom: 0px;*/ -} - -div.part > pre { - margin: 0px; - margin-left: 10px; - margin-top: 5px; - margin-bottom: 5px; -} - -div.mainpage > div.part { - background: #f3f3f3; -} - -div.mainpage ul, h3, h4, h5 { - margin: 0; -} - -div.mainpage h5{ - font-size: initial; - font-weight: initial; - letter-spacing: initial; -} - -div.mainpage li { - list-style: none; -} - -div.mainpage ul { - box-sizing: border-box; - padding-left: 25px; -} \ No newline at end of file diff --git a/templates/initi/static/styles/min-method.css b/templates/initi/static/styles/min-method.css index 7e3e324..e69de29 100644 --- a/templates/initi/static/styles/min-method.css +++ b/templates/initi/static/styles/min-method.css @@ -1,78 +0,0 @@ -.min-methods{ - padding-bottom: 20px; -} - -.min-methods .title { - font-size: 28px; - font-weight: bold; - margin-top: 20px; -} -.min-methods .list { - padding-left: 20px; - padding-top: 10px; -} - -.min-methods .list .compact-method { - font-size: 20px; - font-weight: normal; - font-family: 'Open Sans', sans-serif !important; -} -.min-methods .list .compact-method .access{ - padding-right: 10px; - display: inline-block; - width: 50px; -} -.min-methods .list .compact-method .name{ - color: #0137ff; - font-size: 24px; - font-weight: normal; - display: inline-block; - min-width: 70px; -} - - - -.min-methods .list .compact-method .params { -} - -.min-methods .list .compact-method .param { - font-weight: normal; -} - -.min-methods .list .compact-method .param .left-circle-bracket{} -.min-methods .list .compact-method .param .right-circle-bracket{} - -.min-methods .list .compact-method .param .type{} -.min-methods .list .compact-method .param .type .left-quad-bracket{} -.min-methods .list .compact-method .param .type .name{ - color: #3d7700; - font-size: 19px; - min-width: initial; -} -.min-methods .list .compact-method .param .type .right-quad-bracket{} -.min-methods .list .compact-method .param .name{ - color: #a7a7a7; - font-size: 20px; - min-width: initial; -} - -.min-methods .list .compact-method .returns{} -.min-methods .list .compact-method .returns .arrow{} -.min-methods .list .compact-method .returns .left-figure-bracket{} -.min-methods .list .compact-method .returns .right-figure-bracket{} -.min-methods .list .compact-method .returns .name{ - color: #5aa30e; - font-size: 20px; - font-weight: normal; - min-width: initial; -} - -.full-method > .description > p { - margin-top: 0; - margin-bottom: 0; -} - -.parameter > .description > p { - margin-top: 0; - margin-bottom: 0; -} \ No newline at end of file diff --git a/templates/initi/tmpl/container.tmpl b/templates/initi/tmpl/container.tmpl index d173492..19519b6 100644 --- a/templates/initi/tmpl/container.tmpl +++ b/templates/initi/tmpl/container.tmpl @@ -37,13 +37,13 @@ -
+
-
+
@@ -53,7 +53,7 @@
-
+
@@ -63,7 +63,7 @@ -
+
@@ -159,8 +159,10 @@ var methods = self.find({kind: 'function', memberof: isGlobalPage ? {isUndefined: true} : doc.longname}); if (methods && methods.length && methods.forEach) { ?> + +
-
Methods:
+
Methods:
diff --git a/templates/initi/tmpl/details.tmpl b/templates/initi/tmpl/details.tmpl index 4a5bd49..5a82790 100644 --- a/templates/initi/tmpl/details.tmpl +++ b/templates/initi/tmpl/details.tmpl @@ -107,13 +107,6 @@ if (data.defaultvalue && (data.defaultvaluetype === 'object' || data.defaultvalu - -
Source:
-
  • - , -
- -
Tutorials:
diff --git a/templates/initi/tmpl/full_method/main.tmpl b/templates/initi/tmpl/full_method/main.tmpl index 027ff3b..0ee2f52 100644 --- a/templates/initi/tmpl/full_method/main.tmpl +++ b/templates/initi/tmpl/full_method/main.tmpl @@ -11,7 +11,7 @@ var ryba = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eius
-
+
@@ -22,21 +22,21 @@ var ryba = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eius
-
+
Examples:
-
+
Params
-
+
Returns
diff --git a/templates/initi/tmpl/full_method/param_full.tmpl b/templates/initi/tmpl/full_method/param_full.tmpl index 7a0bb4f..713a3c1 100644 --- a/templates/initi/tmpl/full_method/param_full.tmpl +++ b/templates/initi/tmpl/full_method/param_full.tmpl @@ -13,17 +13,17 @@ var self = this; - +
( ) - +
-
+
\ No newline at end of file diff --git a/templates/initi/tmpl/full_method/params_compact.tmpl b/templates/initi/tmpl/full_method/params_compact.tmpl index 024414c..62a2df6 100644 --- a/templates/initi/tmpl/full_method/params_compact.tmpl +++ b/templates/initi/tmpl/full_method/params_compact.tmpl @@ -7,7 +7,7 @@ var ryba = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eius ?> - +
( - +
, - +
) - \ No newline at end of file +
\ No newline at end of file diff --git a/templates/initi/tmpl/full_method/return_full.tmpl b/templates/initi/tmpl/full_method/return_full.tmpl index 9177a85..55f9f94 100644 --- a/templates/initi/tmpl/full_method/return_full.tmpl +++ b/templates/initi/tmpl/full_method/return_full.tmpl @@ -11,17 +11,17 @@ var self = this;
- +
- +
-
+
\ No newline at end of file diff --git a/templates/initi/tmpl/layout.tmpl b/templates/initi/tmpl/layout.tmpl index d883d21..197a8e2 100644 --- a/templates/initi/tmpl/layout.tmpl +++ b/templates/initi/tmpl/layout.tmpl @@ -10,6 +10,9 @@ + + + diff --git a/templates/initi/tmpl/mainpage/part.tmpl b/templates/initi/tmpl/mainpage/part.tmpl index 29a673c..8c5f579 100644 --- a/templates/initi/tmpl/mainpage/part.tmpl +++ b/templates/initi/tmpl/mainpage/part.tmpl @@ -16,7 +16,7 @@ var self = this; -
+
Examples:
diff --git a/templates/initi/tmpl/members.tmpl b/templates/initi/tmpl/members.tmpl index 154c17b..a3a5269 100644 --- a/templates/initi/tmpl/members.tmpl +++ b/templates/initi/tmpl/members.tmpl @@ -2,14 +2,14 @@ var data = obj; var self = this; ?> -

+

-
+
diff --git a/templates/initi/tmpl/members/main.tmpl b/templates/initi/tmpl/members/main.tmpl index cfe40c8..83a3631 100644 --- a/templates/initi/tmpl/members/main.tmpl +++ b/templates/initi/tmpl/members/main.tmpl @@ -7,7 +7,7 @@ var self = this;
-
+
@@ -17,11 +17,11 @@ var self = this; - +
( ) - +
diff --git a/templates/initi/tmpl/method.tmpl b/templates/initi/tmpl/method.tmpl index efccb24..9041449 100644 --- a/templates/initi/tmpl/method.tmpl +++ b/templates/initi/tmpl/method.tmpl @@ -8,7 +8,7 @@ var self = this; -

">" + name + "" + (data.signature || '') ?>

@@ -18,7 +18,7 @@ var self = this; -
+
@@ -43,7 +43,7 @@ var self = this; -
+
Params
diff --git a/templates/initi/tmpl/method_compact.tmpl b/templates/initi/tmpl/method_compact.tmpl index 5efa050..18e882b 100644 --- a/templates/initi/tmpl/method_compact.tmpl +++ b/templates/initi/tmpl/method_compact.tmpl @@ -9,7 +9,7 @@ var self = this; - +
( - - +
+
[ ] - +
, - +
) - +
- +
→ { } - +
\ No newline at end of file diff --git a/templates/initi/tmpl/params.tmpl b/templates/initi/tmpl/params.tmpl index 1fb4049..3d897a0 100644 --- a/templates/initi/tmpl/params.tmpl +++ b/templates/initi/tmpl/params.tmpl @@ -120,7 +120,7 @@ - +
Properties
diff --git a/templates/initi/tmpl/properties.tmpl b/templates/initi/tmpl/properties.tmpl index 40e0909..9e2225b 100644 --- a/templates/initi/tmpl/properties.tmpl +++ b/templates/initi/tmpl/properties.tmpl @@ -98,7 +98,7 @@ - +
Properties