From e203b96d58a45bef74ba25e47067c2b5aa595e9e Mon Sep 17 00:00:00 2001 From: chapoi <101828855+chapoi@users.noreply.github.com> Date: Thu, 16 Nov 2023 13:28:30 +0200 Subject: [PATCH] github onebox template + css for chat --- .../common/chat-github-onebox.scss | 106 ++++++++++++++++++ .../chat/assets/stylesheets/common/index.scss | 1 + .../desktop/chat-github-onebox.scss | 5 + .../assets/stylesheets/desktop/index.scss | 1 + .../discourse/templates/styleguide.hbs | 42 +++++++ 5 files changed, 155 insertions(+) create mode 100644 plugins/chat/assets/stylesheets/common/chat-github-onebox.scss create mode 100644 plugins/chat/assets/stylesheets/desktop/chat-github-onebox.scss diff --git a/plugins/chat/assets/stylesheets/common/chat-github-onebox.scss b/plugins/chat/assets/stylesheets/common/chat-github-onebox.scss new file mode 100644 index 00000000000..be79d67bb32 --- /dev/null +++ b/plugins/chat/assets/stylesheets/common/chat-github-onebox.scss @@ -0,0 +1,106 @@ +.github-onebox { + //add this line when implementing, will scope to chat while not restricting the component to be used elsewhere later on + // .main-chat-outlet & { + border: 2px solid var(--primary-low); + padding: 0.75rem 1rem; + box-sizing: border-box; + + &__repo-info { + display: flex; + justify-content: space-between; + } + + &__repo-details { + display: flex; + gap: 0.25rem; + flex-wrap: wrap; + white-space: nowrap; + } + &__author-name { + font-weight: bold; + } + &__text { + color: var(--primary-high); + } + + .d-icon-fab-github { + color: var(--github); + } + + &__repo-status { + display: flex; + align-items: flex-end; + justify-content: flex-end; + flex-wrap: wrap-reverse; + gap: 0.5rem; + flex-shrink: 1; + } + + &__repo_tag { + border-radius: 1rem; + padding: 0.15rem 0.5rem; + color: #fff; + font-size: var(--font-down-1-rem); + + &.--open { + background-color: #1f883d; + } + + &.--draft { + background-color: #6e7781; + } + + &.--closed { + background-color: #cf222e; + } + + &.--merged { + background-color: #7f32da; + } + } + + &__repo-changes { + font-size: var(--font-down-1-rem); + } + + &__repo-added { + color: #1f883d; + font-weight: bold; + } + &__repo-removed { + color: #cf222e; + font-weight: bold; + } + + &__repo-change-divider { + color: var(--primary-medium); + } + + &__title { + display: flex; + align-items: baseline; + gap: 0.5rem; + } + + &__link { + font-size: var(--font-up-1-rem); + font-weight: bold; + display: -webkit-inline-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + } + + &__expand-button { + height: var(--font-up-2-rem); + } + + &__description { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + } + + // } +} diff --git a/plugins/chat/assets/stylesheets/common/index.scss b/plugins/chat/assets/stylesheets/common/index.scss index 220f88a4cbf..ce32158333d 100644 --- a/plugins/chat/assets/stylesheets/common/index.scss +++ b/plugins/chat/assets/stylesheets/common/index.scss @@ -18,6 +18,7 @@ @import "chat-emoji-picker"; @import "chat-form"; @import "chat-index"; +@import "chat-github-onebox"; @import "chat-mention-warnings"; @import "chat-message-actions"; @import "chat-message-collapser"; diff --git a/plugins/chat/assets/stylesheets/desktop/chat-github-onebox.scss b/plugins/chat/assets/stylesheets/desktop/chat-github-onebox.scss new file mode 100644 index 00000000000..6f53a8c918f --- /dev/null +++ b/plugins/chat/assets/stylesheets/desktop/chat-github-onebox.scss @@ -0,0 +1,5 @@ +.github-onebox { + &__repo-details { + flex-shrink: 0; + } +} diff --git a/plugins/chat/assets/stylesheets/desktop/index.scss b/plugins/chat/assets/stylesheets/desktop/index.scss index dcc9e2f6c84..4b5b29aad4f 100644 --- a/plugins/chat/assets/stylesheets/desktop/index.scss +++ b/plugins/chat/assets/stylesheets/desktop/index.scss @@ -3,6 +3,7 @@ @import "chat-composer-uploads"; @import "chat-index-drawer"; @import "chat-index-full-page"; +@import "chat-github-onebox"; @import "chat-message-actions"; @import "chat-message"; @import "chat-channel-info"; diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide.hbs index ee4dd54db9e..e442c1d291c 100644 --- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide.hbs +++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide.hbs @@ -15,6 +15,48 @@
+
+
+
+
+ {{d-icon "user"}} + Charlie +
+
contributed to
+
+ {{d-icon "fab-github"}} + discourse/discourse +
+
+
+ + +400 + / + -212 + + merged +
+
+
+ +
In addition, the code syntax + highlighting and copy buttons were broken in fullscreen because of + modal changes over time. It is not the things themselves that disturb + people but the judgements they make about these things.
+
+
{{outlet}}
\ No newline at end of file