Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kelvinkamau/Vibranium
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: DSC-kimathi/Vibranium
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 8 commits
  • 9 files changed
  • 4 contributors

Commits on Sep 9, 2018

  1. dsc kimathi template

    @kamwanasamwel
    kamwanasamwel committed Sep 9, 2018
    Copy the full SHA
    c6ba844 View commit details

Commits on Sep 15, 2018

  1. Made a few changes to the original index file

    @abedyngash
    abedyngash committed Sep 15, 2018
    Copy the full SHA
    4781b2f View commit details

  2. Changed the Logo

    @abedyngash
    abedyngash committed Sep 15, 2018
    Copy the full SHA
    649dde4 View commit details

  3. Changes to the logo

    @abedyngash
    abedyngash committed Sep 15, 2018
    Copy the full SHA
    9e22d05 View commit details

Commits on Sep 16, 2018

  1. modified: images/assets/logo.svg

    @abedyngash
    abedyngash committed Sep 16, 2018
    Copy the full SHA
    8aca453 View commit details

  2. Merge pull request #2 from abedyngash/master 

    Changed the Logo.
    DSCKimathi authored Sep 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    04775ee View commit details

  3. added pics team

    @JobGetabu
    JobGetabu committed Sep 16, 2018
    Copy the full SHA
    c8bf991 View commit details

  4. edited lead profile info

    @JobGetabu
    JobGetabu committed Sep 16, 2018
    Copy the full SHA
    60ed093 View commit details
Binary file removed images/assets/hero-1-2.png
View file
Binary file not shown.
Binary file modified images/assets/logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
258 changes: 213 additions & 45 deletions images/assets/logo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/assets/logo2.png
View file
Binary file not shown.
Binary file added images/assets/team/job.jpg
View file
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 images/assets/tech.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 22 additions & 22 deletions index.html
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>DSC - Kisii University</title>
<title>DSC - Kimathi University</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="DSC Kisii University"/>
<meta name="author" content="DSC Kimathi University"/>
<meta name="description"
content="Developer Student Clubs (DSC) is a Google Developers program for university students to learn mobile and web development skills.">
<meta name="keywords"
content="dsc, kisii university, kelvin kamau,google developers, sub saharan africa, kenya, computer science"/>
content="dsc, kimathi university, samwel kamwana,google developers, sub saharan africa, kenya, computer science"/>
<link href="css/ionicons.min.css" rel="stylesheet">
<link rel="manifest" href="manifest.json">
<link rel="stylesheet" href="css/fontawesome-all.min.css">
@@ -77,11 +77,11 @@
<a class="nav-link" href="#faqs">FAQs</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://medium.com/search?q=DSCKisii" target="_blank">Stories</a>
<a class="nav-link" href="https://medium.com/search?q=DSCKimathi" target="_blank">Stories</a>
</li>
</ul>
<div class="custom-menu__right">
<a href="https://www.meetup.com/DSC-Kisii/" class="btn btn-primary btn-pills" target="_blank">RSVP for
<a href="https://www.meetup.com/DSC-Kimathi/" class="btn btn-primary btn-pills" target="_blank">RSVP for
Next Event</a>
</div>
</div>
@@ -95,7 +95,7 @@
<div class="hero-content">
<div class="hero-title__group">
<div class="hero-title">
<h2 class="zuri">Developer Student Club<br> Kisii University.</h2>
<h2 class="zuri">Developer Student Club<br> Kimathi University.</h2>
</div>
<div class="Hero--Subtitle">
<p class="lead">Developer Student Clubs (DSC) is a Google Developers program for university
@@ -120,7 +120,7 @@ <h2 class="zuri">Developer Student Club<br> Kisii University.</h2>
</div>
<div class="col-12 col-sm-5 ml-auto">
<div class="hero-figure">
<img src="images/assets/hero-1-2.png" class="img-fluid w-100" alt="">
<img src="images/assets/tech.png" class="img-fluid w-100" alt="">
</div>
</div>
</div>
@@ -287,7 +287,7 @@ <h6>TIME : 0900hrs - 1500hrs</h6>
</div>
</div>
<div class="workshops-footer">
<a href="https://www.meetup.com/DSC-Kisii/events/" class="btn btn-primary">RSVP NOW</a>
<a href="https://www.meetup.com/DSC-Kimathi/events/" class="btn btn-primary">RSVP NOW</a>
</div>
</div>
</div>
@@ -306,7 +306,7 @@ <h6>TIME : 0900hrs - 1500hrs</h6>
</div>
</div>
<div class="workshops-footer">
<a href="https://www.meetup.com/DSC-Kisii/events/253674711/" class="btn btn-primary">RSVP
<a href="https://www.meetup.com/DSC-Kimathi/events/253674711/" class="btn btn-primary">RSVP
NOW</a>
</div>
</div>
@@ -326,7 +326,7 @@ <h6>TIME : 0900hrs - 1500hrs</h6>
</div>
</div>
<div class="workshops-footer">
<a href="https://www.meetup.com/DSC-Kisii/events/" class="btn btn-primary">RSVP NOW</a>
<a href="https://www.meetup.com/DSC-Kimathi/events/" class="btn btn-primary">RSVP NOW</a>
</div>
</div>
</div>
@@ -445,7 +445,7 @@ <h2 class="section-title">Meet The DSC Team</h2>
<div class="col-12 col-md-4">
<div class="team-item__thumb">
<div class="team-item__image">
<img src="images/assets/team/kelvin.jpg" alt="Image">
<img src="images/assets/team/job.jpg" alt="Image">
</div>
</div>
</div>
@@ -459,8 +459,8 @@ <h2 class="section-title">Meet The DSC Team</h2>
change-makers.</p>
</div>
<div class="team-meta">
<h5>Kelvin Kamau</h5>
<p>Lead Organizer & 4th Year Student.</p>
<h5>Job Getabu</h5>
<p>Lead Organizer & Android developer</p>
</div>
</div>
</div>
@@ -478,7 +478,7 @@ <h5>Kelvin Kamau</h5>
<div class="col-md-8">
<div class="team-content">
<div class="team-item__context">
<p class="vanish">Lecturer at Kisii University</p>
<p class="vanish">Lecturer at Kimathi University</p>
<p class="vanish">My areas of specialization include:- Concurrency
control,Bioinformatics, ICT
integration,knowledge based systems, IoT and e-learning.</p>
@@ -545,7 +545,7 @@ <h5 class="card-title">Who can become a member?</h5>
<h5 class="card-title">How frequently do events and workshops occur?</h5>
<p>We have a hands-on session every Tuesday at SG25 from 1800hrs to 2030hrs. We also hold
workshops and showcases & we would recommend you to join our community on <a
href="https://www.meetup.com/DSC-Kisii/">Meetup</a> to get updates.</p>
href="https://www.meetup.com/DSC-Kimathi/">Meetup</a> to get updates.</p>
</div>
</div>
</div>
@@ -573,7 +573,7 @@ <h5 class="card-title">Who should I reach out to if I have any questions?</h5>
</div>
</div>
<div class="mt-40 text-center">
<a href="mailto:team@dsckisiiuiversity.org" class="btn btn-primary btn-lg">Send us an email</a>
<a href="mailto:team@dsckimathiuiversity.org" class="btn btn-primary btn-lg">Send us an email</a>
</div>
</div>
</section>
@@ -583,18 +583,18 @@ <h5 class="card-title">Who should I reach out to if I have any questions?</h5>
<div class="row flex-column-reverse flex-sm-row flex-lg-row">
<div class="col-md-4 col-12">
<div class="footer-widget first-of-footer-widget">
<img src="images/assets/logo2.png" class="logo-sm mb-10" alt="Image">
<img src="images/assets/logo.png" class="logo-sm mb-10" alt="Image">
<p>Copyright &copy; 2018. All Rights Reserved.</p>
<span>Feel free to drop us an email at </span>
<a href="mailto:team@dsc.kisiiuniversity.ac.ke">team@dsc.kisiiuniversity.ac.ke</a>
<a href="mailto:team@dsc.kimathiuniversity.ac.ke">team@dsc.kimathiuniversity.ac.ke</a>
<ul class="social-list__inline mt-10">
<li>
<a href="https://twitter.com/DSCKisiiUni">
<a href="https://twitter.com/DSCKimathiUni">
<i class="fab fa-twitter"></i>
</a>
</li>
<li>
<a href="https://github.com/dsckisii">
<a href="https://github.com/dsckimathi">
<i class="fab fa-github"></i>
</a>
</li>
@@ -638,7 +638,7 @@ <h4 class="footer-widget__title">Developers</h4>
<ul>
<li class="list-unstyled">
<li>
<a href="https://github.com/dsckisii">Developers Forum</a>
<a href="https://github.com/dsckimathi">Developers Forum</a>
</li>
<li>
<a href="https://github.com/DSCLEADSAfrica">GitHub</a>
@@ -648,7 +648,7 @@ <h4 class="footer-widget__title">Developers</h4>
conduct</a>
</li>
<li>
<a href="https://github.com/dsckisii">Release Notes</a>
<a href="https://github.com/dsckimathi">Release Notes</a>
</li>
</ul>
</div>
4 changes: 2 additions & 2 deletions manifest.json
View file
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
"display": "standalone",
"theme_color": "#fff",

"short_name": "DSC - Kisii University",
"name": "Developer Student Club Kisii University | Official Website",
"short_name": "DSC - Kimathi University",
"name": "Developer Student Club Kimathi University | Official Website",
"icons": [
{
"src": "images/icon.png",
13 changes: 1 addition & 12 deletions readme.md
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
<p align="center">
<img width="300" height="140" src="https://github.com/kelvinkamau/Vibranium/blob/master/images/vibranium.png">
</p>

# Project Vibranium
The web template is created for DSC SSA Communities to get showcase to the world their
success stories, upcoming and past events with pictures & event slides.

[Live Demo](https://dsc-kisiiuni.firebaseapp.com)

### Creators
* Kelvin Kamau
* Buy me a coffee [here](https://www.buymeacoffee.com/EqeRlzLSc)

### Features

### Usage
* Fork repository and clone it locally
* Setup Environment
@@ -47,7 +36,7 @@ var config = {
## Updating
Here is a git workflow for updating your fork (or downloaded copy) to the latest version:
```git
git remote add upstream https://github.com/kelvinkamau/Vibranium.git
git remote add upstream https://github.com/DSC-kimathi/Vibranium.git
git fetch upstream
git merge upstream/Vibranium
# resolve the merge conflicts in your editor