Merge pull request #246 from AndrewCS149/fixFormatting

add formatting
The-DevBlog · May 1, 2024 · 8c80247 · 8c80247
2 parents c0c70c1 + ee44fae
commit 8c80247
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 20 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -149,7 +149,6 @@ jobs:
         run: |
           ssh -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "\
           cd ${{ secrets.DEVBLOG_ROOT_PATH }} && \
-          docker container rm -f ${{ secrets.DEVBLOG_CLIENT_CONTAINER }} || true && \
-          docker container rm -f ${{ secrets.DEVBLOG_SERVER_CONTAINER }} || true && \
-          docker container rm -f ${{ secrets.DEVBLOG_PROXY_CONTAINER }} || true && \
-          docker compose up -d"
+          docker container restart ${{ secrets.DEVBLOG_CLIENT_CONTAINER }} || true && \
+          docker container restart ${{ secrets.DEVBLOG_SERVER_CONTAINER }} || true && \
+          docker container restart ${{ secrets.DEVBLOG_PROXY_CONTAINER }}"
diff --git a/client/assets/styles/media.css b/client/assets/styles/media.css
@@ -27,6 +27,14 @@
 
 /* post */
 @media (max-width: 800px) {
+    main {
+        width: 100%;
+    }
+
+    .posts {
+        margin-left: 0px !important;
+        margin-right: 0px !important;
+    }
 
     .description,
     .post {

diff --git a/client/src/components/styles/carousel.css b/client/src/components/styles/carousel.css
@@ -8,16 +8,14 @@
     background-color: inherit;
     font-size: 2em;
     opacity: .8;
+    border: 1px solid red;
 }
 
-/* .img-container>button:first {
-    margin-left: 30;
+.img-container img {
+    border-radius: .5em;
+    width: 100%;
 }
 
-.img-container>button:last {
-    margin-right: 30;
-} */
-
 .img-container>.inactive-btn {
     opacity: .3;
 }

diff --git a/client/src/components/styles/post.css b/client/src/components/styles/post.css
@@ -1,14 +1,16 @@
+:root {
+    width: 100%;
+}
+
 .post {
     border-radius: .5em;
     margin: auto;
     margin-bottom: 1.5em;
-    padding: 1em;
-    width: 70%;
+    padding: 25px;
 }
 
 .post>div {
     margin: auto;
-    width: 95%;
 }
 
 .hide-comment:nth-child(n + 6) {
@@ -34,12 +36,6 @@
     width: 100%;
 }
 
-img {
-    border-radius: .5em;
-    width: 100%;
-    max-width: 900px;
-}
-
 .description {
     margin: auto;
 }
diff --git a/client/src/main.rs b/client/src/main.rs
@@ -32,7 +32,9 @@ pub fn app() -> Html {
             <Global css={STYLE} />
             <BrowserRouter>
                 <Navbar />
-                <Switch<Route> render={switch} />
+                    <main>
+                        <Switch<Route> render={switch} />
+                    </main>
                 <Footer />
             </BrowserRouter>
         </>

diff --git a/client/src/pages/styles/home.css b/client/src/pages/styles/home.css
@@ -6,6 +6,10 @@ section:root {
     margin: 100px 20px 0px 20px;
 }
 
+.home {
+    width: 100%;
+}
+
 .signup-prompt {
     font-size: 20px;
     margin: 100px auto 100px auto;

diff --git a/client/src/theme.css b/client/src/theme.css
@@ -14,6 +14,11 @@
     font-family: 'Silkscreen', cursive;
 }
 
+main {
+    margin: auto;
+    width: 80%;
+}
+
 a {
     color: var(--text);
 }