Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

News page #153

Merged
merged 40 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
fa8b394
:sparkles: Content Development Page - Adding an empty HTML file named…
Ngaremaina Sep 28, 2023
23d7ad8
:sparkles: Consultancy Page - Adding an empty HTML file named consult…
Ngaremaina Sep 28, 2023
594ae04
:sparkles: Consultancy Page - Adding an empty HTML file named consult…
Ngaremaina Sep 28, 2023
8978aaf
:sparles: Create home page overview - Creating the overview section
Ngaremaina Sep 29, 2023
6bdc288
:sparles: Create home page overview - Creating the overview section #4
Ngaremaina Sep 29, 2023
69782d8
:sparkles: Conversational Learning Page - Adding the heading to the page
Ngaremaina Sep 29, 2023
83066d2
:sparkles: Conversational Learning Page - Adding the two eclipses #79
Ngaremaina Sep 29, 2023
791ae40
:sparkles: Conversational Learning Page - Adding the content #79
Ngaremaina Sep 29, 2023
2d10c07
:sparkles: Conversational Learning Page - Adding the button #79
Ngaremaina Sep 29, 2023
8d12ece
:sparkles: Conversational Learning Page - Adding the comments #79 #da…
Ngaremaina Sep 29, 2023
ffa8817
:sparkles: Conversational Learning Page - Adding the navigation bar #…
Ngaremaina Sep 30, 2023
9ce1a8d
:sparkles: Conversational Learning Page - Styling the navigation bar …
Ngaremaina Sep 30, 2023
db4b8d6
:sparkles: Conversational Learning Page - Styling the navigation bar …
Ngaremaina Sep 30, 2023
21315ff
:sparkles: Conversational Learning Page - Responsiveness for mobile d…
Ngaremaina Sep 30, 2023
9adce2b
:sparkles: Conversational Learning Page - Adding responsiveness for m…
Ngaremaina Sep 30, 2023
e8876c5
:sparkles:HomePage Partners Section - Adding a partners section in th…
Ngaremaina Oct 2, 2023
91a100c
:sparkles: HomePage Partners Section - Responsive Partners section fo…
Ngaremaina Oct 2, 2023
8a6dbf2
:sparkles: HomePage Partner Section - Adding comments #3 @danielsdgg…
Ngaremaina Oct 2, 2023
462735f
:sparkles: HomePage Partner Section - Adding comments #3 @danielsdgg…
Ngaremaina Oct 2, 2023
a4d78b8
:sparkles: News Page - Adding the news page
Ngaremaina Oct 3, 2023
bf66d7a
:sparkles: News Page - Adding and Styling the news page
Ngaremaina Oct 3, 2023
3adab10
:sparkles: News Page - Resolving conflicts
Ngaremaina Oct 3, 2023
3b0d201
Merge branch 'main' into news-page
Ngaremaina Oct 3, 2023
90a8b26
:bug: News Page - Updating the news page
Ngaremaina Oct 4, 2023
cb7ffdd
Merge branch 'news-page' of github.com:Ngaremaina/elewa-website-html …
Ngaremaina Oct 4, 2023
932fd01
:bug: News Page - Updating the news page
Ngaremaina Oct 4, 2023
bd71644
Merge branch 'main' into news-page
Ngaremaina Oct 6, 2023
3b7c375
Merge branch 'main' into news-page
Ngaremaina Oct 19, 2023
6552ec5
:lipstick: News page
Ngaremaina Oct 20, 2023
a7cfec5
Merge branch 'news-page' of github.com:Ngaremaina/elewa-website-html …
Ngaremaina Oct 20, 2023
d85ecb1
:lipstick: News page
Ngaremaina Oct 20, 2023
34dc86f
News page
Ngaremaina Oct 20, 2023
76c814f
Merge branch 'italanta:main' into news-page
Ngaremaina Oct 26, 2023
51ea74b
update on news page
Ngaremaina Oct 26, 2023
d78c208
💄Updates on the news page
Ngaremaina Oct 26, 2023
aa26e46
💄Updates on news page
Ngaremaina Oct 26, 2023
530d641
💄Updates on news page
Ngaremaina Oct 26, 2023
a72130a
:lipstick: Updates on the news page
Ngaremaina Oct 26, 2023
a61f1f0
:lipstick: news page updates
Ngaremaina Oct 26, 2023
3dbc37a
:lipstick: footer updates
Ngaremaina Oct 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ <h1>Welcome</h1>
<!-- google fonts end -->
<link href="https://fonts.googleapis.com/css2?family=Dancing+Script&family=Manrope:wght@200&family=Monoton&family=Roboto:wght@300&family=Tilt+Prism&family=Ysabeau+SC:wght@1;100&display=swap" rel="stylesheet">
<title>Collaboration and Contribution</title>
<link rel="stylesheet" href="./src/css/style.css">


</head>
Expand Down Expand Up @@ -82,8 +83,43 @@ <h1 id="about">Learning design</h1>

</div>
<!-- -->
</div>
</div>
<!-- end of education solutions -->



<!--news section-->
<div class="news-body">
<div class="news-header"><h3>News</h3></div>
<div class="news">

<p>Conversational learning ipsum dolar</p>
<p>Eos qui ratione voluptatem sequi nesciunt.</p>
<p>Read more</p>

</div>
<hr/>
<div class="news">

<p>Conversational learning ipsum dolar</p>
<p>Eos qui ratione voluptatem sequi nesciunt.</p>
<p>Read more</p>


</div>
<hr/>
<div class="news">

<p>Conversational learning ipsum dolar</p>
<p>Eos qui ratione voluptatem sequi nesciunt.</p>
<p>Read more</p>


</div>
<hr/>
</div>

<!--end of news section-->


</body>
Expand Down
Binary file added src/assets/gettyimages-98473330-2048x2048.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
78 changes: 75 additions & 3 deletions src/css/style.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/*{footer styling}*/

@import url('https://fonts.googleapis.com/css2?family=DM+Sans:[email protected]&display=swap');
@import url('https://fonts.googleapis.com/css2?family=DM+Sans:[email protected]&display=swap');

*{margin: 0;} *

Expand Down Expand Up @@ -376,7 +376,6 @@ body{
}
/* education solution design */
.education-solutions{
position: absolute;
/* background-color: white; */
width: 90%;
margin: 1% 0 0 5%;
Expand Down Expand Up @@ -824,4 +823,77 @@ body{
}
/* end section 2 */

}
}

/* Importing the DM Sans font */
@import url('https://fonts.googleapis.com/css2?family=DM+Sans:[email protected]&display=swap');

.news-body{
background-color: #F9F8F4;
margin: 0;
font-family: 'DM Sans', 'sans-serif';

}

/*Styling the header container*/
.news-header{
display: flex;
margin-left: 165px;
margin-top: 30px;
margin-bottom: 30px;
}

/*Styling the header*/
.news-header h3{
font-size: 30px;
letter-spacing: 3px;
}

/*Styling the news container*/
.news{
display: flex;
flex-direction:row;
justify-content: space-evenly;
}

/*Styling the link*/
.news a{
text-decoration: none;

}
/*Styling the paragraphs*/
.news p{
color: #404040;
font-weight: bold;
}
/*Styling the second child of the paragraph*/
.news p:nth-child(2){
font-weight: normal;
}

hr{
margin: 10px 165px 10px 165px;
}

@media screen and (max-width: 768px) {
hr{
margin: 10px 20px 10px 30px;
}
.news-header{
margin-left: 30px;
}

}

@media screen and (max-width: 360px) {
.news{
margin: 0 20px 0 20px;
}
hr{
margin: 0 20px 0 20px;
}
.news-header{
margin-left: 20px;
}
}

Loading