From b3b3ea6765c7fd95c2b505e305b00c7b1d7d2d11 Mon Sep 17 00:00:00 2001 From: melissab1238 Date: Wed, 9 Jan 2019 00:07:04 -0800 Subject: [PATCH 01/16] CH-35: made 3 cards, added picture, background color of text --- README.md | 4 ---- index.php | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 96606db..17c25d8 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,6 @@ WordPress custom theme for the Climate Hub at UBC. 1. Download and install 2. Create a new WordPress website 3. Navigate to the themes folder and clone the repo into the themes folder -<<<<<<< HEAD -4. Start up the website and use the new cloned theme as the default theme -======= 4. Install `pre-commit` Mac Users -->\ @@ -29,7 +26,6 @@ WordPress custom theme for the Climate Hub at UBC. Run `pip install pre-commit`\ Run `pre-commit install` 5. Start up the website and use the new cloned theme as the default theme ->>>>>>> b95cfc27340c25bfe7ae62af77b293db82ae1b0e ## License This project is licensed under the MIT License. diff --git a/index.php b/index.php index d40265e..cc6563c 100644 --- a/index.php +++ b/index.php @@ -25,4 +25,44 @@ + + +
+
+
+
+
+
Special title treatment
+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+ Card image cap +
+
+
+
+
+
Special title treatment
+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+ Card image cap +
+
+
+
+
+
Special title treatment
+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+ Card image cap +
+
+
+ +
+ + + From 52b7413a5dd9acd885ad8a43dd033106cd4a73db Mon Sep 17 00:00:00 2001 From: melissab1238 Date: Wed, 16 Jan 2019 18:34:28 -0800 Subject: [PATCH 02/16] CH-35: carousel working with 3 cards per slide --- assets/css/climatehub.css | 6 + index.php | 39 +------ template-parts/projects-page-carousel.php | 130 ++++++++++++++++++++++ 3 files changed, 138 insertions(+), 37 deletions(-) create mode 100644 template-parts/projects-page-carousel.php diff --git a/assets/css/climatehub.css b/assets/css/climatehub.css index b055185..dc1b217 100644 --- a/assets/css/climatehub.css +++ b/assets/css/climatehub.css @@ -57,4 +57,10 @@ .home-page-banner-width-paragraph{ width: 58%; +} + +/*projects page carousel*/ +.image-carousel{ + height: auto !important; + max-width: 30% !important; } \ No newline at end of file diff --git a/index.php b/index.php index cc6563c..ce8fbcc 100644 --- a/index.php +++ b/index.php @@ -25,44 +25,9 @@ - - -
-
-
-
-
-
Special title treatment
-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
- Card image cap -
-
-
-
-
-
Special title treatment
-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
- Card image cap -
-
-
-
-
-
Special title treatment
-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
- Card image cap -
+
+
-
- -
- diff --git a/template-parts/projects-page-carousel.php b/template-parts/projects-page-carousel.php new file mode 100644 index 0000000..b495347 --- /dev/null +++ b/template-parts/projects-page-carousel.php @@ -0,0 +1,130 @@ + + + + From 89a13f6ba0d7f641cb4dd9924e4b325e07f4df6a Mon Sep 17 00:00:00 2001 From: melissab1238 Date: Wed, 16 Jan 2019 19:50:20 -0800 Subject: [PATCH 03/16] CH-35:bottom view bar, card as link --- assets/css/climatehub.css | 10 ++++++++++ template-parts/projects-page-carousel.php | 14 ++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/assets/css/climatehub.css b/assets/css/climatehub.css index dc1b217..46bd236 100644 --- a/assets/css/climatehub.css +++ b/assets/css/climatehub.css @@ -63,4 +63,14 @@ .image-carousel{ height: auto !important; max-width: 30% !important; +} +.carousel-indicators-active .active { + background-color: black !important; +} +.carousel-indicators-dark li { + background-color: grey !important; +} + +.no-text-decoration{ + text-decoration: none !important; } \ No newline at end of file diff --git a/template-parts/projects-page-carousel.php b/template-parts/projects-page-carousel.php index b495347..02c8501 100644 --- a/template-parts/projects-page-carousel.php +++ b/template-parts/projects-page-carousel.php @@ -4,7 +4,7 @@ diff --git a/template-parts/updates-carousel.php b/template-parts/updates-carousel.php new file mode 100644 index 0000000..5a50896 --- /dev/null +++ b/template-parts/updates-carousel.php @@ -0,0 +1,66 @@ + + + + + From 715c32ffc893c60a55bf640e72ca82ed7c588f87 Mon Sep 17 00:00:00 2001 From: melissab1238 Date: Wed, 6 Feb 2019 18:48:47 -0800 Subject: [PATCH 10/16] CH-35: added featured, past, upcoming carousels. see todo (index) --- assets/css/climatehub.css | 3 + index.php | 41 +++++++++++- ...php => projects-page-carousel-current.php} | 11 ++-- .../projects-page-carousel-featured.php | 64 +++++++++++++++++++ .../projects-page-carousel-past.php | 64 +++++++++++++++++++ .../projects-page-carousel-upcoming.php | 64 +++++++++++++++++++ 6 files changed, 240 insertions(+), 7 deletions(-) rename template-parts/{projects-page-carousel.php => projects-page-carousel-current.php} (86%) create mode 100644 template-parts/projects-page-carousel-featured.php create mode 100644 template-parts/projects-page-carousel-past.php create mode 100644 template-parts/projects-page-carousel-upcoming.php diff --git a/assets/css/climatehub.css b/assets/css/climatehub.css index 0a5f9e7..bc58904 100644 --- a/assets/css/climatehub.css +++ b/assets/css/climatehub.css @@ -1,4 +1,7 @@ /*projects page carousel*/ +.carousel-card-no-border{ + border: none !important; +} .carousel-no-text-decoration{ text-decoration: none !important; } diff --git a/index.php b/index.php index c3ab6be..a70bd4c 100644 --- a/index.php +++ b/index.php @@ -25,8 +25,45 @@ -
- +
+ + + +

current

past

+ + +
+ +
+

featured projects from the community

+ +
+ +
+ +

upcoming events in the community

+
diff --git a/template-parts/projects-page-carousel.php b/template-parts/projects-page-carousel-current.php similarity index 86% rename from template-parts/projects-page-carousel.php rename to template-parts/projects-page-carousel-current.php index 8d486fd..146aa78 100644 --- a/template-parts/projects-page-carousel.php +++ b/template-parts/projects-page-carousel-current.php @@ -18,8 +18,8 @@ $link = $current_row['project_link']; $image = $current_row['project_image']; ?> -
-
+