From 5dbe650e62c2743b22b6cd707c88f4ed0f6d2028 Mon Sep 17 00:00:00 2001 From: Tigojiang Date: Sun, 10 Dec 2023 19:22:17 -0800 Subject: [PATCH 01/19] Update secret.css --- public/css/secret.css | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/public/css/secret.css b/public/css/secret.css index 3b7ff55..36d0f7c 100644 --- a/public/css/secret.css +++ b/public/css/secret.css @@ -733,6 +733,9 @@ button.bigfollow.active .inactive { #emojis input { font-size: 2rem; } +#emojis .emoji-setting { + border-bottom: 2px solid #d3d3d3; +} .profileHeader { height: 150px; @@ -904,6 +907,18 @@ details#bio { margin-bottom: 10px; } +.preferences-settings { + border: 2px solid #2c3e50; + padding: 10px 20px; + margin-bottom: 20px; + border-radius: 8px; + color: black; + box-shadow: 0 0 15px rgba(44, 62, 80, 0.2); + background-color: white; + padding: 20px; + max-width: 40rem; +} + label { width: 100px; margin-right: 10px; @@ -933,7 +948,10 @@ input::placeholder { input:hover { border-color: #888; } - +.preferences-form legend { + font-weight: bold; + color: #00018c; +} .preferences-form button { background-color: #3cb4c7; color: #333344; @@ -967,6 +985,9 @@ input:hover { font-family: monospace; font-size: 1.2em; } +.preferences-form .form-group { + border-bottom: 2px solid #d3d3d3; +} .queue-status header { background: -webkit-linear-gradient(left, #d3d3d3, #d3d3d3, #d3d3d3); -webkit-background-clip: text; @@ -981,25 +1002,11 @@ input:hover { padding: 10px 20px; margin-bottom: 20px; border-radius: 8px; + color: black; box-shadow: 0 0 15px rgba(44, 62, 80, 0.2); - border: none; - position: relative; + background-color: white; padding: 20px; - border-radius: 8px; -} - -.queue-status .queue-details::after { - content: ''; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - border-radius: 8px; - background: linear-gradient(to right, #8e44ad, #3498db); - z-index: -1; - padding: 3px; - border-radius: 5px; + max-width: 40rem; } #composer_form { From e1d3a3e4a6b3a3d3a9f00485d6ca23d4b0cd8de0 Mon Sep 17 00:00:00 2001 From: Tigojiang Date: Sun, 10 Dec 2023 16:06:15 -0800 Subject: [PATCH 02/19] mock my post --- design/feeds.handlebars | 12 +++++++++ design/partials/note.handlebars | 45 ++++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/design/feeds.handlebars b/design/feeds.handlebars index 7c48688..b2324c9 100644 --- a/design/feeds.handlebars +++ b/design/feeds.handlebars @@ -7,6 +7,18 @@ {{#if feed}} {{> profileHeader actor=feed nobio=true}} {{/if}} + {{!-- mock data begins --}} +
+ {{!-- {{#if boost}} --}} +
+ 🚀 boosted by booster_name +
+ {{> note note=note}} + {{!-- {{else}} + {{> note note=note hidebyline=true}} + {{/if}} --}} +
+ {{!-- mock data ends --}} {{#if activitystream}} {{#each activitystream}} {{#with this}} diff --git a/design/partials/note.handlebars b/design/partials/note.handlebars index e270b5f..123352d 100644 --- a/design/partials/note.handlebars +++ b/design/partials/note.handlebars @@ -1,4 +1,4 @@ - {{#unless hidebyline}} + {{!-- {{#unless hidebyline}} {{> byline actor=actor}} {{/unless}} {{#if note.summary}} @@ -45,4 +45,47 @@ + --}} + +{{!-- mock the data starting from below!!! --}} +
+ ⚠️ summary of the notes here: ......... aka content warning +
+ Toggle +
+
+
+ The content of the post is here. Hi CSE 210, the code freeze is coming soon.. +{{!-- + {{#if note.inReplyTo}} +

Show Thread

+ {{/if}} --}} +{{!-- + {{#each note.attachment}} +
+ {{#isImage mediaType}} + {{../name}} + {{/isImage}} + {{#isVideo mediaType}} + + {{/isVideo}} +
+ {{/each}} --}} +
+
+ + + + +
+ +
From f0da2adad26847590db8b85ff1258154a9cdbb99 Mon Sep 17 00:00:00 2001 From: Tigojiang Date: Sun, 10 Dec 2023 18:53:55 -0800 Subject: [PATCH 03/19] notification style --- design/feeds.handlebars | 12 --------- design/notifications.handlebars | 34 ++++++++++++++++++++++-- design/partials/note.handlebars | 47 ++------------------------------- public/css/secret.css | 8 ++++++ 4 files changed, 42 insertions(+), 59 deletions(-) diff --git a/design/feeds.handlebars b/design/feeds.handlebars index b2324c9..7c48688 100644 --- a/design/feeds.handlebars +++ b/design/feeds.handlebars @@ -7,18 +7,6 @@ {{#if feed}} {{> profileHeader actor=feed nobio=true}} {{/if}} - {{!-- mock data begins --}} -
- {{!-- {{#if boost}} --}} -
- 🚀 boosted by booster_name -
- {{> note note=note}} - {{!-- {{else}} - {{> note note=note hidebyline=true}} - {{/if}} --}} -
- {{!-- mock data ends --}} {{#if activitystream}} {{#each activitystream}} {{#with this}} diff --git a/design/notifications.handlebars b/design/notifications.handlebars index ecb1610..19e44a3 100644 --- a/design/notifications.handlebars +++ b/design/notifications.handlebars @@ -3,11 +3,41 @@ {{prefs.icons.notifications}} Notifications +{{!-- mock notification starts --}} + {{!--
+
🚀 username boosted your post at time
+
+ note content +
+
+
+ {{> note actor=../actor note=../note}} +
+ +
+
💬 username mentioned you at time
+ {{> note actor=../actor note=../note}} +
+ + +
+
⭐️ username liked your post at time
+
+ note content +
+
+ +
+
🤷🏽‍♂️ username followed you at time
+ {{> byline actor=../actor}} +
--}} + +{{!-- mock notification ends --}} {{#each notifications}} -
+
{{#with this}} {{#isEq notification.type "Announce"}} -
🚀 {{or ../actor.name ../actor.preferredUsername}} boosted your post {{timesince ../time}}
+
🚀 {{or ../actor.name ../actor.preferredUsername}} boosted your post {{timesince ../time}}
{{{...note.content}}}
diff --git a/design/partials/note.handlebars b/design/partials/note.handlebars index 123352d..1691472 100644 --- a/design/partials/note.handlebars +++ b/design/partials/note.handlebars @@ -1,4 +1,4 @@ - {{!-- {{#unless hidebyline}} + {{#unless hidebyline}} {{> byline actor=actor}} {{/unless}} {{#if note.summary}} @@ -45,47 +45,4 @@
-
--}} - -{{!-- mock the data starting from below!!! --}} -
- ⚠️ summary of the notes here: ......... aka content warning -
- Toggle -
-
-
- The content of the post is here. Hi CSE 210, the code freeze is coming soon.. -{{!-- - {{#if note.inReplyTo}} -

Show Thread

- {{/if}} --}} -{{!-- - {{#each note.attachment}} -
- {{#isImage mediaType}} - {{../name}} - {{/isImage}} - {{#isVideo mediaType}} - - {{/isVideo}} -
- {{/each}} --}} -
-
- - - - -
- -
-
+ \ No newline at end of file diff --git a/public/css/secret.css b/public/css/secret.css index 36d0f7c..1b7443c 100644 --- a/public/css/secret.css +++ b/public/css/secret.css @@ -1038,3 +1038,11 @@ input:hover { #composer_form button:hover { background-color: #e6b800; } + +.notification-activity { + background-color: white; + border-radius: 4px; + padding: 20px; + margin-top: 15px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); +} From 5d45b53b2574497da20ed57b2135b39c67711e6c Mon Sep 17 00:00:00 2001 From: Tigojiang Date: Sun, 10 Dec 2023 18:56:46 -0800 Subject: [PATCH 04/19] Update notifications.handlebars --- design/notifications.handlebars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design/notifications.handlebars b/design/notifications.handlebars index 19e44a3..3325285 100644 --- a/design/notifications.handlebars +++ b/design/notifications.handlebars @@ -37,7 +37,7 @@
{{#with this}} {{#isEq notification.type "Announce"}} -
🚀 {{or ../actor.name ../actor.preferredUsername}} boosted your post {{timesince ../time}}
+
🚀 {{or ../actor.name ../actor.preferredUsername}} boosted your post {{timesince ../time}}
{{{...note.content}}}
From 31ac04635da53557cde02917f12cc52cfff7cc87 Mon Sep 17 00:00:00 2001 From: Tigojiang Date: Sun, 10 Dec 2023 19:00:02 -0800 Subject: [PATCH 05/19] Update notifications.handlebars --- design/notifications.handlebars | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/design/notifications.handlebars b/design/notifications.handlebars index 3325285..27f92f5 100644 --- a/design/notifications.handlebars +++ b/design/notifications.handlebars @@ -3,36 +3,6 @@ {{prefs.icons.notifications}} Notifications -{{!-- mock notification starts --}} - {{!--
-
🚀 username boosted your post at time
-
- note content -
-
-
- {{> note actor=../actor note=../note}} -
- -
-
💬 username mentioned you at time
- {{> note actor=../actor note=../note}} -
- - -
-
⭐️ username liked your post at time
-
- note content -
-
- -
-
🤷🏽‍♂️ username followed you at time
- {{> byline actor=../actor}} -
--}} - -{{!-- mock notification ends --}} {{#each notifications}}
{{#with this}} From 87ab1e38dbf2ba2e869ebc43dc1f5b6b3f91c729 Mon Sep 17 00:00:00 2001 From: Aditya Mandke <40426312+ekdnam@users.noreply.github.com> Date: Sun, 10 Dec 2023 19:29:56 -0800 Subject: [PATCH 06/19] make the ui more twitter like --- design/dashboard.handlebars | 4 +- public/css/secret.css | 190 +++++++++++++++++------------------- 2 files changed, 90 insertions(+), 104 deletions(-) diff --git a/design/dashboard.handlebars b/design/dashboard.handlebars index f1674ba..4938657 100644 --- a/design/dashboard.handlebars +++ b/design/dashboard.handlebars @@ -20,8 +20,8 @@ {{else}}

Follow some people to fill your feed with posts.

-

I suggest following me! - I'm benbrown@hackers.town +

We suggest following our Professor Thomas Powell! You can find him at + thomasapowell@fosstodon.org

{{/if}} diff --git a/public/css/secret.css b/public/css/secret.css index 1b7443c..ba7e181 100644 --- a/public/css/secret.css +++ b/public/css/secret.css @@ -1,15 +1,6 @@ -:root { - --background: #ccc; - --text: #333333; - --link: #00018c; - --secondary: #ccc; - --tertiary: #f0f0f0; - --contrast: #414141; - --separator: #7777bb; - --shade: rgba(255, 255, 255, 0.25); - --highlight: rgba(0, 0, 0, 0.25); - --accent: rgb(250, 4, 197); -} +@import url('./posts.css'); +@import url('./constants.css'); +@import url('./content.css'); body { background: var(--background); @@ -17,7 +8,8 @@ body { font-size: 15px; padding: 0; margin: 0; - font-family: Arial, Helvetica, sans-serif; + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + /* position: relative; */ } * { @@ -105,7 +97,7 @@ nav ul { border-top: 1px solid var(--secondary); font-size: 1.5rem; - background: var(--tertiary); + background: white; } #nav ul { @@ -145,7 +137,7 @@ nav ul { overflow-y: auto; background: var(--tertiary); - border-right: 1px solid var(--separator); + border-right: 1px solid #000000; flex-grow: 0; font-size: 14px; letter-spacing: 0.04rem; @@ -176,14 +168,6 @@ nav ul { background: var(--highlight); } -#content { - padding-bottom: 3rem; -} - -#content.nonav { - padding-bottom: 0; -} - #top_nav { margin-top: 1rem; display: none; @@ -207,7 +191,8 @@ nav ul { } #menu li.current a { - background-color: var(--secondary); + background-color: navy; + color: #fff; } #top_feeds li a { display: flex; @@ -265,15 +250,9 @@ nav ul { font-size: 0.75rem; } - #content { - flex-grow: 1; - flex-shrink: 1; - overflow-y: auto; - } - - #content .stream { + /* #content .stream { margin: 1rem; - } + } */ .toolbar { position: relative; @@ -333,7 +312,7 @@ nav ul { #header { width: 100%; - font-family: 'Courier New', Courier, monospace; + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 0.5rem; background: var(--separator); position: relative; @@ -373,10 +352,11 @@ a { } header { - color: var(--text); + color: #fff; font-weight: bold; padding: 0.5rem 1rem; background: var(--separator); + font-size: large; } header.back { @@ -401,12 +381,12 @@ header a { .empty { padding: 1rem; - color: var(--highlight); + color: #000080; } .activity { border-bottom: 1px solid var(--secondary); - background: var(--tertiary); + background: var(--background); padding: 1rem 1rem; line-height: 1.25rem; } @@ -460,28 +440,12 @@ header a { gap: 0; } -.activity .content { - padding-left: calc(50px + 1rem); -} - -.content_warning { - background: var(--shade); - padding: 0.5rem 1rem; - display: flex; -} - -.content_warning .tools { - flex-grow: 1; - text-align: right; - /* padding-right: 1rem; */ -} - -.content_warning .tools a { - margin: 0px auto; - padding: 0.25rem 1rem; +.note-activity { + background-color: white; border-radius: 4px; - background: var(--shade); - text-decoration: none; + padding: 20px; + margin-top: 15px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); } @media screen and (min-width: 769px) { @@ -498,9 +462,10 @@ header a { } .activity .boost { - background: var(--shade); - padding: 0.25rem 0.5rem; - margin-bottom: 1rem; + /* background: var(--background); */ + /* padding: 0.1; */ + font-size: smaller; + margin-bottom: 0.25rem; } .avatar { @@ -517,6 +482,7 @@ header a { .permalink { color: var(--secondary); text-decoration: none; + margin-top: 2rem; } .permalink:hover { @@ -587,30 +553,6 @@ input#cw { float: right; } -.content .tools { - flex-grow: 1; -} -.content .tools div { - display: inline-block; -} -.content .tools button { - font-size: 1rem; - background: none; - border: none; - padding: 0; - margin-right: 0.5rem; -} -/* .content .tools button.active { background: var(--highlight); } */ -.content .tools button .active { - display: none; -} -.content .tools button.active .active { - display: block; -} -.content .tools button.active .inactive { - display: none; -} - button.follow { background: none; border: none; @@ -730,6 +672,10 @@ button.bigfollow.active .inactive { font-weight: bold; } +#emojis { + display: block; +} + #emojis input { font-size: 2rem; } @@ -809,8 +755,9 @@ button.bigfollow.active .inactive { } .message_text { - background: var(--highlight); + background: white; border-radius: 0.5rem; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); padding: 1rem; max-width: 75%; display: inline-block; @@ -837,7 +784,8 @@ button.bigfollow.active .inactive { } .inbox .message.outgoing .message_text { - background: var(--shade); + background: var(--separator); + color: white; } .feeds { @@ -862,7 +810,7 @@ button.bigfollow.active .inactive { .feeds .feed { position: relative; padding: 0.5rem 1rem; - padding-right: 4rem; + padding-right: 1rem; border-bottom: 1px solid var(--secondary); display: flex; align-items: center; @@ -884,6 +832,10 @@ button.bigfollow.active .inactive { /* background: var(--secondary); */ } +.current { + color: #fff; +} + .feeds .current { /* font-weight: bold; */ background: var(--secondary); @@ -908,15 +860,15 @@ details#bio { } .preferences-settings { - border: 2px solid #2c3e50; - padding: 10px 20px; + padding: 20px; margin-bottom: 20px; - border-radius: 8px; + border-radius: 4px; color: black; - box-shadow: 0 0 15px rgba(44, 62, 80, 0.2); background-color: white; padding: 20px; max-width: 40rem; + margin-top: 15px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); } label { @@ -967,13 +919,18 @@ input:hover { border-radius: 5px; } -.preferences-form button:hover { - background-color: #e6b800; +.preferences-header { + color: black; +} + +.preferences-settings legend { + color: black; + font-size: small; + font-weight: bold; } -#content { - padding-left: 50px; - padding-top: 10px; +.preferences-form button:hover { + background-color: #e6b800; } .preferences-form header { @@ -982,7 +939,7 @@ input:hover { width: 20ch; white-space: nowrap; overflow: hidden; - font-family: monospace; + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 1.2em; } .preferences-form .form-group { @@ -994,19 +951,20 @@ input:hover { width: 20ch; white-space: nowrap; overflow: hidden; - font-family: monospace; + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + color: black; font-size: 1.2em; } .queue-status .queue-details { - border: 2px solid #2c3e50; - padding: 10px 20px; + padding: 20px; margin-bottom: 20px; - border-radius: 8px; + border-radius: 4px; color: black; - box-shadow: 0 0 15px rgba(44, 62, 80, 0.2); background-color: white; padding: 20px; max-width: 40rem; + margin-top: 15px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); } #composer_form { @@ -1046,3 +1004,31 @@ input:hover { margin-top: 15px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); } + +.form-group { + font-size: smaller; +} + +.emoji-setting { + font-size: smaller; +} + +.stream header a { + color: white; +} + +.outgoing .u-url { + color: white; +} + +.inReplyTo { + display: none; +} + +.to { + display: none; +} + +.mini-cw { + display: none; +} \ No newline at end of file From f9930c80ebf7b422b8c1a0c12b6832bdb7c078c9 Mon Sep 17 00:00:00 2001 From: Aditya Mandke <40426312+ekdnam@users.noreply.github.com> Date: Sun, 10 Dec 2023 19:32:03 -0800 Subject: [PATCH 07/19] remove mock data --- design/partials/note.handlebars | 92 +++++++++++++++++---------------- 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/design/partials/note.handlebars b/design/partials/note.handlebars index 1691472..7bc0cee 100644 --- a/design/partials/note.handlebars +++ b/design/partials/note.handlebars @@ -1,48 +1,50 @@ - {{#unless hidebyline}} - {{> byline actor=actor}} - {{/unless}} - {{#if note.summary}} -
- ⚠️ {{note.summary}} -
- Toggle -
+
+ {{#unless hidebyline}} + {{> byline actor=actor}} + {{/unless}} + {{#if note.summary}} +
+ ⚠️ {{note.summary}} +
+ Toggle
- {{/if}} -
- {{{note.content}}} +
+ {{/if}} +
+ {{{note.content}}} - {{#if note.inReplyTo}} -

Show Thread

- {{/if}} + {{#if note.inReplyTo}} +

Show Thread

+ {{/if}} - {{#each note.attachment}} -
- {{#isImage mediaType}} - {{../name}} - {{/isImage}} - {{#isVideo mediaType}} - - {{/isVideo}} -
- {{/each}} -
-
- - - - {{#isEq note.attributedTo @root.me.id}} - - {{/isEq}} -
- -
-
\ No newline at end of file + {{#each note.attachment}} +
+ {{#isImage mediaType}} + {{../name}} + {{/isImage}} + {{#isVideo mediaType}} + + {{/isVideo}} +
+ {{/each}} +
+
+ + + + {{#isEq note.attributedTo @root.me.id}} + + {{/isEq}} +
+ +
+
+
From a5bf3671b69f97ad3c5c3924c9f3535c5a1e595e Mon Sep 17 00:00:00 2001 From: Aditya Mandke <40426312+ekdnam@users.noreply.github.com> Date: Sun, 10 Dec 2023 20:56:44 -0800 Subject: [PATCH 08/19] change background color and text color for dm received --- public/css/secret.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/css/secret.css b/public/css/secret.css index ba7e181..4debf68 100644 --- a/public/css/secret.css +++ b/public/css/secret.css @@ -781,6 +781,8 @@ button.bigfollow.active .inactive { display: flex; flex-direction: column; align-items: flex-end; + background-color: var(--separator); + color: white; } .inbox .message.outgoing .message_text { From a3ce40ff33d032a73e06d4ce61f7b9086e290d11 Mon Sep 17 00:00:00 2001 From: Aditya Mandke <40426312+ekdnam@users.noreply.github.com> Date: Sun, 10 Dec 2023 20:59:47 -0800 Subject: [PATCH 09/19] the earlier commit changed design for the parent container, now testing for the specific message_text component --- public/css/secret.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/css/secret.css b/public/css/secret.css index 4debf68..ba7e181 100644 --- a/public/css/secret.css +++ b/public/css/secret.css @@ -781,8 +781,6 @@ button.bigfollow.active .inactive { display: flex; flex-direction: column; align-items: flex-end; - background-color: var(--separator); - color: white; } .inbox .message.outgoing .message_text { From ec887b487170d52e7e00ddb69f213f41d2f7c2be Mon Sep 17 00:00:00 2001 From: Aditya Mandke <40426312+ekdnam@users.noreply.github.com> Date: Mon, 11 Dec 2023 01:07:58 -0800 Subject: [PATCH 10/19] delete content warning and reply to fields from composer --- design/partials/minicomposer.handlebars | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/design/partials/minicomposer.handlebars b/design/partials/minicomposer.handlebars index 13b8329..35a51f6 100644 --- a/design/partials/minicomposer.handlebars +++ b/design/partials/minicomposer.handlebars @@ -2,9 +2,9 @@
- + {{!-- - + --}}
From 58f1f35071ba192e999043e406d2c627941b0b44 Mon Sep 17 00:00:00 2001 From: Aditya Mandke <40426312+ekdnam@users.noreply.github.com> Date: Mon, 11 Dec 2023 01:34:40 -0800 Subject: [PATCH 11/19] break into files --- public/css/constants.css | 13 ++++++++ public/css/content.css | 72 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 public/css/constants.css create mode 100644 public/css/content.css diff --git a/public/css/constants.css b/public/css/constants.css new file mode 100644 index 0000000..c46d5a8 --- /dev/null +++ b/public/css/constants.css @@ -0,0 +1,13 @@ +:root { + --background: #f9f9f9; /* Light gray background */ + --text: #333; /* Dark text color */ + --link: #1da1f2; /* Twitter blue */ + --secondary: #666; /* Dimmed secondary text */ + --tertiary: #e5e5e5; /* Light gray for tertiary elements */ + --contrast: #555; /* Dark gray for contrast */ + --separator: #1da1f2; /* Twitter blue for separators */ + --header: #e0e0e0; + --shade: rgba(249, 249, 249, 0.25); /* Slight shade for depth */ + --highlight: #888; /* Medium gray for highlights */ + --accent: #e50b76; /* Pink accent */ + } \ No newline at end of file diff --git a/public/css/content.css b/public/css/content.css new file mode 100644 index 0000000..38dfa77 --- /dev/null +++ b/public/css/content.css @@ -0,0 +1,72 @@ +@import url('./constants.css'); + +#content { + padding-bottom: 3rem; +} + +#content.nonav { + padding-bottom: 0; +} + +#content { + flex-grow: 1; + flex-shrink: 1; + overflow-y: auto; +} + +.content { + font-size: medium; + padding-bottom: 2px; +} +.activity .content { + padding-left: calc(50px + 1rem); +} + +.content_warning { + /* padding: 0.5rem 1rem; */ + font-size: smaller; +} + +.content_warning .tools { + flex-grow: 1; + text-align: right; + /* padding-right: 1rem; */ +} + +.content_warning .tools a { + margin: 0px auto; + padding: 0.25rem 1rem; + border-radius: 4px; + background: var(--shade); + text-decoration: none; +} + +.content .tools { + flex-grow: 1; +} +.content .tools div { + display: inline-block; +} +.content .tools button { + font-size: 1rem; + background: none; + border: none; + padding: 0; + margin-top: 2rem; + margin-right: 0.5rem; +} +/* .content .tools button.active { background: var(--highlight); } */ +.content .tools button .active { + display: none; +} +.content .tools button.active .active { + display: block; +} +.content .tools button.active .inactive { + display: none; +} + +#content { + padding-left: 50px; + padding-top: 10px; + } \ No newline at end of file From 86f4b182d7e2aa00f477518c2ec9da5d4ab26063 Mon Sep 17 00:00:00 2001 From: Aditya Mandke <40426312+ekdnam@users.noreply.github.com> Date: Mon, 11 Dec 2023 17:09:57 -0800 Subject: [PATCH 12/19] center the content container so that the website looks better on devices with smaller screen sizes --- public/css/content.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/css/content.css b/public/css/content.css index 38dfa77..f29af0b 100644 --- a/public/css/content.css +++ b/public/css/content.css @@ -67,6 +67,9 @@ } #content { - padding-left: 50px; - padding-top: 10px; + width: 75%; /* Set the width of your child container */ + position: relative; + left: 50%; + transform: translateX(-50%); + padding-top: 1rem; } \ No newline at end of file From d700129be71fcfbd443a82a015882dd95c8f2cdd Mon Sep 17 00:00:00 2001 From: Aditya Mandke <40426312+ekdnam@users.noreply.github.com> Date: Mon, 11 Dec 2023 20:00:25 -0800 Subject: [PATCH 13/19] remove border of composer --- public/css/secret.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/css/secret.css b/public/css/secret.css index ba7e181..1b68fb1 100644 --- a/public/css/secret.css +++ b/public/css/secret.css @@ -516,7 +516,7 @@ header a { #composer.mini { margin-bottom: 0; background-color: var(--tertiary); - border-bottom: 1px solid var(--secondary); + /* border-bottom: 1px solid var(--secondary); */ position: fixed; bottom: 50px; left: 0; @@ -975,7 +975,7 @@ input:hover { border: 1px solid #ddd; padding: 20px; border-radius: 8px; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); + /* box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); */ } #composer_form button { From 534d01eff7460d15cf32d89412115da288623252 Mon Sep 17 00:00:00 2001 From: Tigojiang Date: Mon, 11 Dec 2023 22:19:54 -0800 Subject: [PATCH 14/19] fix the composer form style --- public/css/secret.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/css/secret.css b/public/css/secret.css index 1b68fb1..ba7e181 100644 --- a/public/css/secret.css +++ b/public/css/secret.css @@ -516,7 +516,7 @@ header a { #composer.mini { margin-bottom: 0; background-color: var(--tertiary); - /* border-bottom: 1px solid var(--secondary); */ + border-bottom: 1px solid var(--secondary); position: fixed; bottom: 50px; left: 0; @@ -975,7 +975,7 @@ input:hover { border: 1px solid #ddd; padding: 20px; border-radius: 8px; - /* box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); */ + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); } #composer_form button { From 5c3c0b53118202e9c8765edbf52de92d06b55cbe Mon Sep 17 00:00:00 2001 From: Tigojiang Date: Mon, 11 Dec 2023 22:27:25 -0800 Subject: [PATCH 15/19] update composer --- design/partials/composer.handlebars | 4 ++-- design/partials/minicomposer.handlebars | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/design/partials/composer.handlebars b/design/partials/composer.handlebars index 9647e90..3747929 100644 --- a/design/partials/composer.handlebars +++ b/design/partials/composer.handlebars @@ -18,14 +18,14 @@ - - -
-
- - {{!-- - - --}} - -
-
+
+
+
+ + + + + +
+
\ No newline at end of file From b8d7d0dd38b1f74fa87bee0f06f5e44862e3e87a Mon Sep 17 00:00:00 2001 From: Tigojiang Date: Mon, 11 Dec 2023 23:10:43 -0800 Subject: [PATCH 16/19] remove ct warning --- design/partials/minicomposer.handlebars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design/partials/minicomposer.handlebars b/design/partials/minicomposer.handlebars index da6ba0c..341cd9f 100644 --- a/design/partials/minicomposer.handlebars +++ b/design/partials/minicomposer.handlebars @@ -2,7 +2,7 @@
- + From 71ed492b0b58b10f207b6488132accc4a757790e Mon Sep 17 00:00:00 2001 From: Aditya Mandke <40426312+ekdnam@users.noreply.github.com> Date: Mon, 11 Dec 2023 23:17:17 -0800 Subject: [PATCH 17/19] Make the navbar stick to the bottom part of the screen and not get overlapped by the posts --- public/css/content.css | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/public/css/content.css b/public/css/content.css index f29af0b..6cd8a99 100644 --- a/public/css/content.css +++ b/public/css/content.css @@ -66,10 +66,8 @@ display: none; } + #content { - width: 75%; /* Set the width of your child container */ - position: relative; - left: 50%; - transform: translateX(-50%); - padding-top: 1rem; - } \ No newline at end of file + padding-left: 50px; + padding-top: 10px; + } From 85ee96d07f2b5b342ee371aaa99a148a35c2e4b9 Mon Sep 17 00:00:00 2001 From: Aditya Mandke <40426312+ekdnam@users.noreply.github.com> Date: Mon, 11 Dec 2023 23:40:53 -0800 Subject: [PATCH 18/19] rebase with glitch instance #1 center align the components when rendered on a mobile (small screen) --- public/css/content.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/css/content.css b/public/css/content.css index 6cd8a99..186eb66 100644 --- a/public/css/content.css +++ b/public/css/content.css @@ -68,6 +68,7 @@ #content { - padding-left: 50px; - padding-top: 10px; + padding-left: 5%; + padding-right: 5%; + padding-top: 10px; } From 99bd89d7e33810e7aad9b35451d8e67dda299407 Mon Sep 17 00:00:00 2001 From: Aditya Mandke <40426312+ekdnam@users.noreply.github.com> Date: Mon, 11 Dec 2023 23:42:05 -0800 Subject: [PATCH 19/19] format file - make the indentation correct --- public/css/content.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/css/content.css b/public/css/content.css index 186eb66..6694a57 100644 --- a/public/css/content.css +++ b/public/css/content.css @@ -68,7 +68,7 @@ #content { - padding-left: 5%; - padding-right: 5%; + padding-left: 5%; + padding-right: 5%; padding-top: 10px; - } +}