From d7a1294b593b36428f39a749d6adb2bd70b00e63 Mon Sep 17 00:00:00 2001 From: Azel Alyne Tan Date: Tue, 31 Dec 2019 20:53:47 +0800 Subject: [PATCH 1/4] Rename Sidebar Titles --- _sidebar.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/_sidebar.md b/_sidebar.md index 857c7a5..cceab72 100644 --- a/_sidebar.md +++ b/_sidebar.md @@ -12,15 +12,13 @@ - [About WWCode Manila](wwcodemanila/about.md) - [Study Groups](wwcodemanila/study_groups.md) -- Starter Kit +- Getting Started - [About the Study Group](README.md) - - [Install Tools](getting_started/install_tools.md) - - [Welcome to the Web](getting_started/starter_pack.md) + - [Tools](getting_started/install_tools.md) + - [Creating your first blog site](getting_started/starter_pack.md) - Basic Concepts - [Guide in Learning HTML & CSS](getting_started/guide.md) - - [Introduction to HTML & CSS - Creating your first Web Page - Page under development](basic_concepts/#) - - [More discussion about CSS Box Model, CSS Selectors and CSS Position Property](basic_concepts/#) - Advanced HTML & CSS From 979f9b0953fb241be8ebdaa29b7782a2b65eb50e Mon Sep 17 00:00:00 2001 From: Azel Alyne Tan Date: Tue, 31 Dec 2019 20:59:32 +0800 Subject: [PATCH 2/4] Move files in directories --- _sidebar.md | 3 ++- {getting_started => basic_concepts}/guide.md | 0 .../creating_your_first_webpage.md | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename {getting_started => basic_concepts}/guide.md (100%) rename {basic_concepts => getting_started}/creating_your_first_webpage.md (100%) diff --git a/_sidebar.md b/_sidebar.md index cceab72..8fb3c3f 100644 --- a/_sidebar.md +++ b/_sidebar.md @@ -15,10 +15,11 @@ - Getting Started - [About the Study Group](README.md) - [Tools](getting_started/install_tools.md) + - [Creating your first Web Page](getting_started/creating_your_first_webpage.md) - [Creating your first blog site](getting_started/starter_pack.md) - Basic Concepts - - [Guide in Learning HTML & CSS](getting_started/guide.md) + - [Guide in Learning HTML & CSS](basic_concepts/guide.md) - Advanced HTML & CSS diff --git a/getting_started/guide.md b/basic_concepts/guide.md similarity index 100% rename from getting_started/guide.md rename to basic_concepts/guide.md diff --git a/basic_concepts/creating_your_first_webpage.md b/getting_started/creating_your_first_webpage.md similarity index 100% rename from basic_concepts/creating_your_first_webpage.md rename to getting_started/creating_your_first_webpage.md From 5d00e2572d5877626d458c64c0b9c9d3bf3f0a30 Mon Sep 17 00:00:00 2001 From: Azel Alyne Tan Date: Tue, 31 Dec 2019 21:20:05 +0800 Subject: [PATCH 3/4] Update Study group topic lists --- basic_concepts/guide.md | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/basic_concepts/guide.md b/basic_concepts/guide.md index 22deb13..eb738fe 100644 --- a/basic_concepts/guide.md +++ b/basic_concepts/guide.md @@ -1,17 +1,19 @@ Here are the possible topics that we will cover in our study groups: -| Study Group | Topic -|--------------|------------------------------------------------------------------------------------------------ -| 1 | [Introduction to HTML and CSS, Creating your first website.](http://bit.ly/HTMLCSS_SG01) -| 2 | [More discussion about HTML Box Model and CSS Selectors](http://bit.ly/HTMLCSS_SG02) -| 3 | [Links, Images, and Backgrounds](http://bit.ly/HTMLCSS_SG03) -| 4 | [Typography](http://bit.ly/HTMLCSS_SG04) -| 5 | [Layout your site using CSS Positioning, CSS Floats, CSS Grid and CSS Flexbox](http://bit.ly/HTMLCSS_SG05) -| 6 | CSS3 Transitions, Transforms, Animations and Filters -| 7 | CSS Frameworks -| 8 | CSS Pre-processors -| 9 | Implementing JavaScript Libraries -| 10 | CSS Methodologies -| 11 | Deploying your website +| Topics +|------------------------------------------------------------------------------------------------ +| [Introduction to HTML and CSS, Creating your first website.](http://bit.ly/HTMLCSS_SG01) +| [HTML Blocks; CSS Box Model and Display property](http://bit.ly/HTMLCSS19_SG02) +| [More discussion about HTML Box Model and CSS Selectors](http://bit.ly/HTMLCSS_SG02) +| [Links, Images, and Backgrounds](http://bit.ly/HTMLCSS_SG03) +| [Typography](http://bit.ly/HTMLCSS_SG04) +| [Layout your site using CSS Positioning, CSS Floats, CSS Grid and CSS Flexbox](http://bit.ly/HTMLCSS_SG05) +| [CSS Pseudo-Classes And CSS Pseudo-Elements](https://docs.google.com/presentation/d/1CQcZTzSgAFtWa1OKliT-oXt3EbDvyrTT2cXizfQU9dE/edit?usp=sharing) +| CSS3 Transitions, Transforms, Animations and Filters :soon: +| CSS Frameworks :soon: +| CSS Pre-processors :soon: +| Implementing JavaScript Libraries :soon: +| CSS Methodologies :soon: +| Deploying your website :soon: !> Note: Please feel free to checkout our slides that are linked in each topics. From 10cd089a872a87ca2d93ff135c3491d9f0558756 Mon Sep 17 00:00:00 2001 From: Azel Alyne Tan Date: Tue, 31 Dec 2019 21:38:17 +0800 Subject: [PATCH 4/4] Rename directories, Add Links to sidebar --- _sidebar.md | 10 +++++++++- .../{sg8_190817 => Responsive Web Design}/README.md | 0 .../webdevtool.png | Bin .../README.md | 0 .../color-codes.txt | 0 .../content-about-us.txt | 0 .../design.png | Bin .../font/Quicksand-Bold.ttf | Bin .../font/Quicksand-Light.ttf | Bin .../font/Quicksand-Medium.ttf | Bin .../font/Quicksand-Regular.ttf | Bin .../images/bg-img.png | Bin .../images/fb.png | Bin .../images/home.png | Bin .../images/mu.png | Bin .../images/twitter.png | Bin .../index.html | 0 .../style.css | 0 .../2017/{sg9_020917 => css_frameworks}/README.md | 0 .../{sg10_160917 => css_preprocessor}/README.md | 0 .../README.md | 0 .../README.md | 0 .../README.md | 0 23 files changed, 9 insertions(+), 1 deletion(-) rename study_group/2017/{sg8_190817 => Responsive Web Design}/README.md (100%) rename study_group/2017/{sg8_190817 => Responsive Web Design}/webdevtool.png (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/README.md (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/color-codes.txt (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/content-about-us.txt (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/design.png (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/font/Quicksand-Bold.ttf (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/font/Quicksand-Light.ttf (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/font/Quicksand-Medium.ttf (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/font/Quicksand-Regular.ttf (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/images/bg-img.png (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/images/fb.png (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/images/home.png (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/images/mu.png (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/images/twitter.png (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/index.html (100%) rename study_group/2017/{sg4_030617 => css_box_model_and_display_property}/style.css (100%) rename study_group/2017/{sg9_020917 => css_frameworks}/README.md (100%) rename study_group/2017/{sg10_160917 => css_preprocessor}/README.md (100%) rename study_group/2017/{sg5_170617 => html_form_and_css_position_property}/README.md (100%) rename study_group/2017/{sg6_010717 => html_table_and_css_typography_colors_and_float}/README.md (100%) rename study_group/2017/{sg7_150717 => multi_page_website_css_typography_float_and_best_practices}/README.md (100%) diff --git a/_sidebar.md b/_sidebar.md index 8fb3c3f..f06ba79 100644 --- a/_sidebar.md +++ b/_sidebar.md @@ -21,7 +21,15 @@ - Basic Concepts - [Guide in Learning HTML & CSS](basic_concepts/guide.md) -- Advanced HTML & CSS +- Activities + - [CSS Box Model and Display Property](study_group/2017/css_box_model_and_display_property/readme.md) + - [HTML Table and CSS Typography, Colors and Float](study_group/2017/html_table_and_css_typography_colors_and_float/readme.md) + - [HTML Form and CSS Position Property](study_group/2017/html_form_and_css_position_property/readme.md) + - [CSS Frameworks](study_group/2017/css_frameworks/readme.md) + - [CSS Preprocessor](study_group/2017/css_preprocessor/readme.md) + - [Responsive Web Design](study_group/2017/responsive_web_design/readme.md) + - [Multi Page Website, CSS Typography, Float and Best Practices](study_group/2017/multi_page_website_css_typography_float_and_best_practices/readme.md) + - Resources - [References](resources/references.md) diff --git a/study_group/2017/sg8_190817/README.md b/study_group/2017/Responsive Web Design/README.md similarity index 100% rename from study_group/2017/sg8_190817/README.md rename to study_group/2017/Responsive Web Design/README.md diff --git a/study_group/2017/sg8_190817/webdevtool.png b/study_group/2017/Responsive Web Design/webdevtool.png similarity index 100% rename from study_group/2017/sg8_190817/webdevtool.png rename to study_group/2017/Responsive Web Design/webdevtool.png diff --git a/study_group/2017/sg4_030617/README.md b/study_group/2017/css_box_model_and_display_property/README.md similarity index 100% rename from study_group/2017/sg4_030617/README.md rename to study_group/2017/css_box_model_and_display_property/README.md diff --git a/study_group/2017/sg4_030617/color-codes.txt b/study_group/2017/css_box_model_and_display_property/color-codes.txt similarity index 100% rename from study_group/2017/sg4_030617/color-codes.txt rename to study_group/2017/css_box_model_and_display_property/color-codes.txt diff --git a/study_group/2017/sg4_030617/content-about-us.txt b/study_group/2017/css_box_model_and_display_property/content-about-us.txt similarity index 100% rename from study_group/2017/sg4_030617/content-about-us.txt rename to study_group/2017/css_box_model_and_display_property/content-about-us.txt diff --git a/study_group/2017/sg4_030617/design.png b/study_group/2017/css_box_model_and_display_property/design.png similarity index 100% rename from study_group/2017/sg4_030617/design.png rename to study_group/2017/css_box_model_and_display_property/design.png diff --git a/study_group/2017/sg4_030617/font/Quicksand-Bold.ttf b/study_group/2017/css_box_model_and_display_property/font/Quicksand-Bold.ttf similarity index 100% rename from study_group/2017/sg4_030617/font/Quicksand-Bold.ttf rename to study_group/2017/css_box_model_and_display_property/font/Quicksand-Bold.ttf diff --git a/study_group/2017/sg4_030617/font/Quicksand-Light.ttf b/study_group/2017/css_box_model_and_display_property/font/Quicksand-Light.ttf similarity index 100% rename from study_group/2017/sg4_030617/font/Quicksand-Light.ttf rename to study_group/2017/css_box_model_and_display_property/font/Quicksand-Light.ttf diff --git a/study_group/2017/sg4_030617/font/Quicksand-Medium.ttf b/study_group/2017/css_box_model_and_display_property/font/Quicksand-Medium.ttf similarity index 100% rename from study_group/2017/sg4_030617/font/Quicksand-Medium.ttf rename to study_group/2017/css_box_model_and_display_property/font/Quicksand-Medium.ttf diff --git a/study_group/2017/sg4_030617/font/Quicksand-Regular.ttf b/study_group/2017/css_box_model_and_display_property/font/Quicksand-Regular.ttf similarity index 100% rename from study_group/2017/sg4_030617/font/Quicksand-Regular.ttf rename to study_group/2017/css_box_model_and_display_property/font/Quicksand-Regular.ttf diff --git a/study_group/2017/sg4_030617/images/bg-img.png b/study_group/2017/css_box_model_and_display_property/images/bg-img.png similarity index 100% rename from study_group/2017/sg4_030617/images/bg-img.png rename to study_group/2017/css_box_model_and_display_property/images/bg-img.png diff --git a/study_group/2017/sg4_030617/images/fb.png b/study_group/2017/css_box_model_and_display_property/images/fb.png similarity index 100% rename from study_group/2017/sg4_030617/images/fb.png rename to study_group/2017/css_box_model_and_display_property/images/fb.png diff --git a/study_group/2017/sg4_030617/images/home.png b/study_group/2017/css_box_model_and_display_property/images/home.png similarity index 100% rename from study_group/2017/sg4_030617/images/home.png rename to study_group/2017/css_box_model_and_display_property/images/home.png diff --git a/study_group/2017/sg4_030617/images/mu.png b/study_group/2017/css_box_model_and_display_property/images/mu.png similarity index 100% rename from study_group/2017/sg4_030617/images/mu.png rename to study_group/2017/css_box_model_and_display_property/images/mu.png diff --git a/study_group/2017/sg4_030617/images/twitter.png b/study_group/2017/css_box_model_and_display_property/images/twitter.png similarity index 100% rename from study_group/2017/sg4_030617/images/twitter.png rename to study_group/2017/css_box_model_and_display_property/images/twitter.png diff --git a/study_group/2017/sg4_030617/index.html b/study_group/2017/css_box_model_and_display_property/index.html similarity index 100% rename from study_group/2017/sg4_030617/index.html rename to study_group/2017/css_box_model_and_display_property/index.html diff --git a/study_group/2017/sg4_030617/style.css b/study_group/2017/css_box_model_and_display_property/style.css similarity index 100% rename from study_group/2017/sg4_030617/style.css rename to study_group/2017/css_box_model_and_display_property/style.css diff --git a/study_group/2017/sg9_020917/README.md b/study_group/2017/css_frameworks/README.md similarity index 100% rename from study_group/2017/sg9_020917/README.md rename to study_group/2017/css_frameworks/README.md diff --git a/study_group/2017/sg10_160917/README.md b/study_group/2017/css_preprocessor/README.md similarity index 100% rename from study_group/2017/sg10_160917/README.md rename to study_group/2017/css_preprocessor/README.md diff --git a/study_group/2017/sg5_170617/README.md b/study_group/2017/html_form_and_css_position_property/README.md similarity index 100% rename from study_group/2017/sg5_170617/README.md rename to study_group/2017/html_form_and_css_position_property/README.md diff --git a/study_group/2017/sg6_010717/README.md b/study_group/2017/html_table_and_css_typography_colors_and_float/README.md similarity index 100% rename from study_group/2017/sg6_010717/README.md rename to study_group/2017/html_table_and_css_typography_colors_and_float/README.md diff --git a/study_group/2017/sg7_150717/README.md b/study_group/2017/multi_page_website_css_typography_float_and_best_practices/README.md similarity index 100% rename from study_group/2017/sg7_150717/README.md rename to study_group/2017/multi_page_website_css_typography_float_and_best_practices/README.md