From e42c8b5b63a637eae7863285f342938fad6adc18 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 14 Oct 2015 14:19:11 +0100 Subject: [PATCH 01/25] Add search API --- api/client-server/v1/search.yaml | 126 +++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 api/client-server/v1/search.yaml diff --git a/api/client-server/v1/search.yaml b/api/client-server/v1/search.yaml new file mode 100644 index 00000000..c9e9b14b --- /dev/null +++ b/api/client-server/v1/search.yaml @@ -0,0 +1,126 @@ +swagger: '2.0' +info: + title: "Matrix Client-Server v1 Search API" + version: "1.0.0" +host: localhost:8008 +schemes: + - https + - http +basePath: /_matrix/client/api/v1 +consumes: + - application/json +produces: + - application/json +securityDefinitions: + accessToken: + type: apiKey + description: The user_id or application service access_token + name: access_token + in: query +paths: + "/search": + post: + summary: Search server side for things. + description: |- + Performs a full text search across different categories. + security: + - accessToken: [] + parameters: + - in: body + name: body + schema: + type: object + example: |- + { + "search_categories": { + "room_events": { + "keys": [ + "content.body" + ], + "search_term": "martians and men" + } + } + } + properties: + search_categories: + type: object + description: Describes which categories to search in and + their creteria. + properties: + room_events: + type: object + description: Mapping of category name to search criteria. + properties: + search_term: + type: string + description: The string to search events for + keys: + type: array + items: + type: string + enum: ["content.body", "content.name", "content.topic"] + description: The keys to search. Defaults to all. + required: ["search_term"] + required: ["search_categories"] + responses: + 200: + description: Results of the search. + schema: + type: object + required: ["search_categories"] + properties: + search_categories: + type: object + description: Describes which categories to search in and + their creteria. + properties: + room_events: + type: object + description: Mapping of category name to search criteria. + properties: + count: + type: number + description: Total number of results found + results: + type: object + description: Mapping of event_id to result. + additionalProperties: + type: object + desciption: The result object. + properties: + rank: + type: number + description: A number that describes how closely + this result matches the search. Higher is + closer. + result: + type: object + description: The event that matched. + allOf: + - "$ref": "core-event-schema/room_event.json" + examples: + application/json: |- + { + "search_categories": { + "room_events": { + "count": 24, + "results": { + "$144429830826TWwbB:localhost": { + "rank": 0.00424866, + "result": { + "age": 526228296, + "content": { + "body": "Test content", + "msgtype": "m.text" + }, + "event_id": "$144429830826TWwbB:localhost", + "origin_server_ts": 1444298308034, + "room_id": "!qPewotXpIctQySfjSy:localhost", + "type": "m.room.message", + "user_id": "@test:localhost" + } + } + } + } + } + } From a7a5cb088b8b84d93d46f83b10fdf5d222c8987c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 14 Oct 2015 14:35:08 +0100 Subject: [PATCH 02/25] Add titles --- api/client-server/v1/search.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/client-server/v1/search.yaml b/api/client-server/v1/search.yaml index c9e9b14b..fa6ab2a6 100644 --- a/api/client-server/v1/search.yaml +++ b/api/client-server/v1/search.yaml @@ -67,15 +67,18 @@ paths: description: Results of the search. schema: type: object + title: Results required: ["search_categories"] properties: search_categories: type: object + title: Categories description: Describes which categories to search in and their creteria. properties: room_events: type: object + title: Room Event Results description: Mapping of category name to search criteria. properties: count: @@ -83,9 +86,11 @@ paths: description: Total number of results found results: type: object + title: Results description: Mapping of event_id to result. additionalProperties: type: object + title: Result desciption: The result object. properties: rank: From ca9e44baaca52882fc9b661edf1ee71428f3713c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 14 Oct 2015 15:01:21 +0100 Subject: [PATCH 03/25] Moar titles --- api/client-server/v1/search.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/client-server/v1/search.yaml b/api/client-server/v1/search.yaml index fa6ab2a6..e62f2e8e 100644 --- a/api/client-server/v1/search.yaml +++ b/api/client-server/v1/search.yaml @@ -44,11 +44,13 @@ paths: properties: search_categories: type: object + title: "Categories" description: Describes which categories to search in and their creteria. properties: room_events: type: object + title: "Room Events" description: Mapping of category name to search criteria. properties: search_term: From 392a1c5ad821941ccedac27052b7022a62fd2b2c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 14 Oct 2015 15:06:16 +0100 Subject: [PATCH 04/25] Another title --- api/client-server/v1/search.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/api/client-server/v1/search.yaml b/api/client-server/v1/search.yaml index e62f2e8e..3efef9f5 100644 --- a/api/client-server/v1/search.yaml +++ b/api/client-server/v1/search.yaml @@ -102,6 +102,7 @@ paths: closer. result: type: object + title: Event description: The event that matched. allOf: - "$ref": "core-event-schema/room_event.json" From 2b9484cf48249a4c34e1487ddb11863ad1f00bdf Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 14 Oct 2015 15:35:39 +0100 Subject: [PATCH 05/25] Spell things correctly --- api/client-server/v1/search.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/client-server/v1/search.yaml b/api/client-server/v1/search.yaml index 3efef9f5..a40d49c0 100644 --- a/api/client-server/v1/search.yaml +++ b/api/client-server/v1/search.yaml @@ -93,7 +93,7 @@ paths: additionalProperties: type: object title: Result - desciption: The result object. + description: The result object. properties: rank: type: number From d8bc0c9315f1dcddb4a819d2249bdae7ee0c494a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 14 Oct 2015 16:13:43 +0100 Subject: [PATCH 06/25] Add search module --- specification/modules/search.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 specification/modules/search.rst diff --git a/specification/modules/search.rst b/specification/modules/search.rst new file mode 100644 index 00000000..c571d68d --- /dev/null +++ b/specification/modules/search.rst @@ -0,0 +1,14 @@ +Server Side Search +================== + +.. _module:search: + +TODO: Add summary. + +Client behaviour +---------------- +{{search_http_api}} + +Security considerations +----------------------- +The server must only return results that the user has permission to see. From 0efa3fd98128d9e7657a884cb59d5dc987de2245 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 14 Oct 2015 16:17:04 +0100 Subject: [PATCH 07/25] Add module --- specification/0-feature_profiles.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/0-feature_profiles.rst b/specification/0-feature_profiles.rst index b9f12b74..ec234a0e 100644 --- a/specification/0-feature_profiles.rst +++ b/specification/0-feature_profiles.rst @@ -26,6 +26,7 @@ Summary `Content Repository`_ Required Required Required Optional Optional `Managing History Visibility`_ Required Required Required Required Optional `End-to-End Encryption`_ Optional Optional Optional Optional Optional + `Search`_ Optional Optional Optional Optional Optional ===================================== ========== ========== ========== ========== ========== *Please see each module for more details on what clients need to implement.* @@ -39,6 +40,7 @@ Summary .. _VoIP: `module:voip`_ .. _Content Repository: `module:content`_ .. _Managing History Visibility: `module:history-visibility`_ +.. _Search: `module:search`_ Clients ------- From 38fcc563dac266b782c296363d3e62f75fe3767b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 14 Oct 2015 16:20:08 +0100 Subject: [PATCH 08/25] Spell out full title --- specification/0-feature_profiles.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/0-feature_profiles.rst b/specification/0-feature_profiles.rst index ec234a0e..128dc9b4 100644 --- a/specification/0-feature_profiles.rst +++ b/specification/0-feature_profiles.rst @@ -26,7 +26,7 @@ Summary `Content Repository`_ Required Required Required Optional Optional `Managing History Visibility`_ Required Required Required Required Optional `End-to-End Encryption`_ Optional Optional Optional Optional Optional - `Search`_ Optional Optional Optional Optional Optional + `Server Side Search`_ Optional Optional Optional Optional Optional ===================================== ========== ========== ========== ========== ========== *Please see each module for more details on what clients need to implement.* @@ -40,7 +40,7 @@ Summary .. _VoIP: `module:voip`_ .. _Content Repository: `module:content`_ .. _Managing History Visibility: `module:history-visibility`_ -.. _Search: `module:search`_ +.. _Server Side Search: `module:search`_ Clients ------- From 5e48b0b79a5f7263a54fd27962da4f08616e8fa4 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 14 Oct 2015 16:21:12 +0100 Subject: [PATCH 09/25] Add search to targets --- specification/targets.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/targets.yaml b/specification/targets.yaml index c2b6eeda..1cccf648 100644 --- a/specification/targets.yaml +++ b/specification/targets.yaml @@ -24,6 +24,7 @@ groups: # reusable blobs of files when prefixed with 'group:' - modules/history_visibility.rst - modules/push.rst - modules/third_party_invites.rst + - modules/search.rst title_styles: ["=", "-", "~", "+", "^", "`"] From 007bb1a69a6d528acfb0f743ac8599592290c403 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 14 Oct 2015 16:26:14 +0100 Subject: [PATCH 10/25] Add extra new line --- specification/modules/search.rst | 1 + specification/targets.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/specification/modules/search.rst b/specification/modules/search.rst index c571d68d..05471959 100644 --- a/specification/modules/search.rst +++ b/specification/modules/search.rst @@ -12,3 +12,4 @@ Client behaviour Security considerations ----------------------- The server must only return results that the user has permission to see. + diff --git a/specification/targets.yaml b/specification/targets.yaml index 1cccf648..b549ca53 100644 --- a/specification/targets.yaml +++ b/specification/targets.yaml @@ -26,6 +26,7 @@ groups: # reusable blobs of files when prefixed with 'group:' - modules/third_party_invites.rst - modules/search.rst + title_styles: ["=", "-", "~", "+", "^", "`"] # The templating system doesn't know the right title style to use when generating From 728b5a79512c1f3c35d3c2f54f50f60eeb009d50 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 14 Oct 2015 17:20:00 +0100 Subject: [PATCH 11/25] Add very short summary --- specification/modules/search.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/modules/search.rst b/specification/modules/search.rst index 05471959..d6bfd391 100644 --- a/specification/modules/search.rst +++ b/specification/modules/search.rst @@ -3,7 +3,8 @@ Server Side Search .. _module:search: -TODO: Add summary. +The search API allows clients to perform full text search across events in +their rooms without having to download the entire histories. Client behaviour ---------------- From 96a4996c767fe4dc8337c248296d1e7789511079 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 15 Oct 2015 11:02:37 +0100 Subject: [PATCH 12/25] Mention search categories --- specification/modules/search.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/specification/modules/search.rst b/specification/modules/search.rst index d6bfd391..9fee097c 100644 --- a/specification/modules/search.rst +++ b/specification/modules/search.rst @@ -10,6 +10,13 @@ Client behaviour ---------------- {{search_http_api}} +Search Categories +~~~~~~~~~~~~~~~~~ + +The search API allows clients to search in different categories of items. +Currently, the only specified category is ``room_events``, which searches for +events in rooms the user had joined. + Security considerations ----------------------- The server must only return results that the user has permission to see. From af347baa686b069fa7d77668506d96a66a0fb388 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 15 Oct 2015 11:06:15 +0100 Subject: [PATCH 13/25] Better phrasing --- specification/modules/search.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/modules/search.rst b/specification/modules/search.rst index 9fee097c..87116c2c 100644 --- a/specification/modules/search.rst +++ b/specification/modules/search.rst @@ -14,7 +14,7 @@ Search Categories ~~~~~~~~~~~~~~~~~ The search API allows clients to search in different categories of items. -Currently, the only specified category is ``room_events``, which searches for +Currently the only specified category is ``room_events``, which include events in rooms the user had joined. Security considerations From c47a94658ae0701e52ea912861697460784f7638 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 15 Oct 2015 11:12:00 +0100 Subject: [PATCH 14/25] Mention supported keys --- specification/modules/search.rst | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/specification/modules/search.rst b/specification/modules/search.rst index 87116c2c..665709c8 100644 --- a/specification/modules/search.rst +++ b/specification/modules/search.rst @@ -11,11 +11,22 @@ Client behaviour {{search_http_api}} Search Categories -~~~~~~~~~~~~~~~~~ +----------------- The search API allows clients to search in different categories of items. -Currently the only specified category is ``room_events``, which include -events in rooms the user had joined. +Currently the only specified category is ``room_events``. + +``room_events`` +~~~~~~~~~~~~~~~ + +This category covers all events in rooms that the user had joined. The search +is performed on certain keys of certain event types. + +The supported keys to search over are: + +- ``content.body`` in ``m.room.message`` +- ``content.name`` in ``m.room.name`` +- ``content.topic`` in ``m.room.topic`` Security considerations ----------------------- From 906c59385f19b7fab34135146663872e3d0ce15a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 15 Oct 2015 15:49:58 +0100 Subject: [PATCH 15/25] s/had/has/ --- specification/modules/search.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/modules/search.rst b/specification/modules/search.rst index 665709c8..785ce26a 100644 --- a/specification/modules/search.rst +++ b/specification/modules/search.rst @@ -19,7 +19,7 @@ Currently the only specified category is ``room_events``. ``room_events`` ~~~~~~~~~~~~~~~ -This category covers all events in rooms that the user had joined. The search +This category covers all events in rooms that the user has joined. The search is performed on certain keys of certain event types. The supported keys to search over are: From cfca4a6c09a5ea31fb8193c70f61c6fa9ca055ec Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 15 Oct 2015 15:51:02 +0100 Subject: [PATCH 16/25] s/creteria/criteria/ --- api/client-server/v1/search.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/client-server/v1/search.yaml b/api/client-server/v1/search.yaml index a40d49c0..cdb53cf2 100644 --- a/api/client-server/v1/search.yaml +++ b/api/client-server/v1/search.yaml @@ -46,7 +46,7 @@ paths: type: object title: "Categories" description: Describes which categories to search in and - their creteria. + their criteria. properties: room_events: type: object @@ -76,7 +76,7 @@ paths: type: object title: Categories description: Describes which categories to search in and - their creteria. + their criteria. properties: room_events: type: object From 770cfbc5dee292498a2aaffc5144f70cc7f2f456 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 15 Oct 2015 16:08:24 +0100 Subject: [PATCH 17/25] Be explicit about the events the search is performed over --- specification/modules/search.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/specification/modules/search.rst b/specification/modules/search.rst index 785ce26a..9b88cc69 100644 --- a/specification/modules/search.rst +++ b/specification/modules/search.rst @@ -3,8 +3,9 @@ Server Side Search .. _module:search: -The search API allows clients to perform full text search across events in -their rooms without having to download the entire histories. +The search API allows clients to perform full text search across events in all +rooms that the user has been in, including those that they have left. Only +events that the user is allowed to see will be searched. Client behaviour ---------------- @@ -19,8 +20,9 @@ Currently the only specified category is ``room_events``. ``room_events`` ~~~~~~~~~~~~~~~ -This category covers all events in rooms that the user has joined. The search -is performed on certain keys of certain event types. +This category covers all events that the user is allowed to see, including +events in rooms that they have left. The search is performed on certain keys of +certain event types. The supported keys to search over are: From 24e36adbe3da45f35113d5712f9ee9fa71ccefb4 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 15 Oct 2015 16:09:11 +0100 Subject: [PATCH 18/25] Mention e2e encryption --- specification/modules/search.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/modules/search.rst b/specification/modules/search.rst index 9b88cc69..62c78e8f 100644 --- a/specification/modules/search.rst +++ b/specification/modules/search.rst @@ -30,6 +30,8 @@ The supported keys to search over are: - ``content.name`` in ``m.room.name`` - ``content.topic`` in ``m.room.topic`` +The search will *not* include rooms that are end to end encrypted. + Security considerations ----------------------- The server must only return results that the user has permission to see. From a6cb2e4339a9661dc822057666f92edc4adc5008 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 15 Oct 2015 16:40:21 +0100 Subject: [PATCH 19/25] Mention rank --- specification/modules/search.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/modules/search.rst b/specification/modules/search.rst index 62c78e8f..493c2b7c 100644 --- a/specification/modules/search.rst +++ b/specification/modules/search.rst @@ -32,6 +32,9 @@ The supported keys to search over are: The search will *not* include rooms that are end to end encrypted. +The results include a ``rank`` key that can be used to sort the results by +revelancy. The higher the ``rank`` the more relevant the result is. + Security considerations ----------------------- The server must only return results that the user has permission to see. From eb59b8e9d1ac096865bf433c803b69d1e25c9419 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 16 Oct 2015 10:16:40 +0100 Subject: [PATCH 20/25] Mention count --- specification/modules/search.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/modules/search.rst b/specification/modules/search.rst index 493c2b7c..03d2475f 100644 --- a/specification/modules/search.rst +++ b/specification/modules/search.rst @@ -35,6 +35,10 @@ The search will *not* include rooms that are end to end encrypted. The results include a ``rank`` key that can be used to sort the results by revelancy. The higher the ``rank`` the more relevant the result is. +The value of ``count`` may not match the number of results. For example due to +the search query matching 1000s of results and the server truncating the +response. + Security considerations ----------------------- The server must only return results that the user has permission to see. From 716c5b7a8b6d4a4109e0fee16929a88fae04bda4 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 16 Oct 2015 10:26:14 +0100 Subject: [PATCH 21/25] Add 400 and 429 response codes --- api/client-server/v1/search.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/api/client-server/v1/search.yaml b/api/client-server/v1/search.yaml index cdb53cf2..885e62b3 100644 --- a/api/client-server/v1/search.yaml +++ b/api/client-server/v1/search.yaml @@ -132,3 +132,9 @@ paths: } } } + 400: + description: Part of the request was invalid. + 429: + description: This request was rate-limited. + schema: + "$ref": "definitions/error.yaml" From 111ca99519a32ba0412aed423517774250184567 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 19 Oct 2015 13:46:30 +0100 Subject: [PATCH 22/25] Clarify that this doesn't include events that occurred after you left the room. --- specification/modules/search.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/modules/search.rst b/specification/modules/search.rst index 03d2475f..6a545aa0 100644 --- a/specification/modules/search.rst +++ b/specification/modules/search.rst @@ -5,7 +5,8 @@ Server Side Search The search API allows clients to perform full text search across events in all rooms that the user has been in, including those that they have left. Only -events that the user is allowed to see will be searched. +events that the user is allowed to see will be searched, e.g. it won't include +evnets in rooms that happened after you left. Client behaviour ---------------- From 82d4ea199f507e7dbdc9a960d50ab831e69f26b9 Mon Sep 17 00:00:00 2001 From: Daniel Wagner-Hall Date: Thu, 22 Oct 2015 16:09:01 +0100 Subject: [PATCH 23/25] Trust Leo --- scripts/speculator/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/speculator/main.go b/scripts/speculator/main.go index dab624df..e6992d4a 100644 --- a/scripts/speculator/main.go +++ b/scripts/speculator/main.go @@ -365,6 +365,7 @@ func main() { "Kegsay": true, "NegativeMjark": true, "richvdh": true, + "leonerd": true, } rand.Seed(time.Now().Unix()) masterCloneDir, err := gitClone(matrixDocCloneURL, false) From 4a558ad63b0724a3b4f715df864cf698fbbcb1b3 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 23 Oct 2015 10:19:25 +0100 Subject: [PATCH 24/25] Typo --- specification/modules/search.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/modules/search.rst b/specification/modules/search.rst index 6a545aa0..089953d2 100644 --- a/specification/modules/search.rst +++ b/specification/modules/search.rst @@ -6,7 +6,7 @@ Server Side Search The search API allows clients to perform full text search across events in all rooms that the user has been in, including those that they have left. Only events that the user is allowed to see will be searched, e.g. it won't include -evnets in rooms that happened after you left. +events in rooms that happened after you left. Client behaviour ---------------- From df443c10ac973686a57f302629d5b8151f4aa324 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Fri, 23 Oct 2015 11:58:06 +0100 Subject: [PATCH 25/25] Move css into a css subdirectory. Add css to put a bar next to blockquotes. --- scripts/{ => css}/basic.css | 0 scripts/css/blockquote.css | 5 +++++ scripts/{ => css}/codehighlight.css | 0 scripts/{ => css}/nature.css | 0 scripts/gendoc.py | 2 +- 5 files changed, 6 insertions(+), 1 deletion(-) rename scripts/{ => css}/basic.css (100%) create mode 100644 scripts/css/blockquote.css rename scripts/{ => css}/codehighlight.css (100%) rename scripts/{ => css}/nature.css (100%) diff --git a/scripts/basic.css b/scripts/css/basic.css similarity index 100% rename from scripts/basic.css rename to scripts/css/basic.css diff --git a/scripts/css/blockquote.css b/scripts/css/blockquote.css new file mode 100644 index 00000000..151d3bce --- /dev/null +++ b/scripts/css/blockquote.css @@ -0,0 +1,5 @@ +blockquote { + margin: 20px 0 30px; + border-left: 5px solid; + padding-left: 20px; +} diff --git a/scripts/codehighlight.css b/scripts/css/codehighlight.css similarity index 100% rename from scripts/codehighlight.css rename to scripts/css/codehighlight.css diff --git a/scripts/nature.css b/scripts/css/nature.css similarity index 100% rename from scripts/nature.css rename to scripts/css/nature.css diff --git a/scripts/gendoc.py b/scripts/gendoc.py index 74a6c1da..ed36a5a7 100755 --- a/scripts/gendoc.py +++ b/scripts/gendoc.py @@ -15,7 +15,7 @@ import yaml os.chdir(os.path.dirname(os.path.abspath(__file__))) stylesheets = { - "stylesheet_path": ["basic.css", "nature.css", "codehighlight.css"] + "stylesheet_path": glob.glob("css/*.css"), } VERBOSE = False