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

Revert 14 patch 1 #62

Open
wants to merge 50 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
6bf2531
Create jekyll-docker.yml
SabanciRobotics Feb 7, 2023
4ed2947
Update header.html
SabanciRobotics Feb 7, 2023
fa0a0f3
Update header.html
efeoztaban Feb 7, 2023
b1e0d05
Merge pull request #1 from efeoztaban/patch-1
SabanciRobotics Feb 7, 2023
1f4ce7f
Update front.html
efeoztaban Feb 7, 2023
65c8bee
Update header.html
SabanciRobotics Feb 7, 2023
bf8ef74
Update nav.html
efeoztaban Feb 7, 2023
f75acf7
Merge pull request #2 from efeoztaban/patch-2
SabanciRobotics Feb 7, 2023
61ee2ec
Merge pull request #3 from efeoztaban/patch-3
SabanciRobotics Feb 7, 2023
114e282
Update front.html
efeoztaban Feb 7, 2023
cd969e9
Update header.html
efeoztaban Feb 7, 2023
5c7bd29
Delete header.jpg
SabanciRobotics Feb 7, 2023
4faa596
Add files via upload
SabanciRobotics Feb 7, 2023
678c26a
Update head.html
efeoztaban Feb 7, 2023
9dfbb79
Merge pull request #4 from efeoztaban/patch-4
SabanciRobotics Feb 7, 2023
f8f7a59
Merge pull request #6 from efeoztaban/patch-6
SabanciRobotics Feb 7, 2023
65e73cd
Update main.scss
SabanciRobotics Feb 7, 2023
b7eafbd
Delete header.jpg
SabanciRobotics Feb 7, 2023
bb75201
Add files via upload
SabanciRobotics Feb 7, 2023
7154cea
Delete header.jpg.jpeg
SabanciRobotics Feb 7, 2023
8067945
Add files via upload
SabanciRobotics Feb 7, 2023
811b937
Merge pull request #5 from efeoztaban/patch-5
SabanciRobotics Feb 7, 2023
cc628da
Update header.html
SabanciRobotics Feb 7, 2023
a2d14bf
Update front.html
efeoztaban Feb 7, 2023
1b13901
Merge pull request #7 from efeoztaban/patch-7
SabanciRobotics Feb 7, 2023
91d2949
Update nav.html
ZeynepKilinc Feb 7, 2023
2562577
Merge pull request #8 from ZeynepKilinc/patch-1
SabanciRobotics Feb 7, 2023
5e8d32f
Update portfolio.html
SabanciRobotics Feb 7, 2023
d496413
Update header.html
SabanciRobotics Feb 7, 2023
a160a33
Update services.html
ZeynepKilinc Feb 7, 2023
abb8684
Merge pull request #9 from ZeynepKilinc/patch-2
SabanciRobotics Feb 7, 2023
27133bf
Add files via upload
SabanciRobotics Feb 7, 2023
80f66b1
Update services.html
ZeynepKilinc Feb 7, 2023
65ed429
Update services.html
SabanciRobotics Feb 7, 2023
bc8a294
style added
ZeynepKilinc Feb 7, 2023
913632c
Merge branch 'master' into patch-3
SabanciRobotics Feb 7, 2023
8cc0fcd
Merge pull request #10 from ZeynepKilinc/patch-3
SabanciRobotics Feb 7, 2023
a92f0e2
Merge pull request #11 from ZeynepKilinc/patch-5
SabanciRobotics Feb 7, 2023
9f0a017
Update services.html
SabanciRobotics Feb 7, 2023
9aa7fca
Update portfolio.html
ZeynepKilinc Feb 7, 2023
455e72c
Merge pull request #12 from ZeynepKilinc/patch-6
SabanciRobotics Feb 7, 2023
2e62211
Update front.html
SabanciRobotics Feb 7, 2023
3dc75f9
Update nav.html
ZeynepKilinc Feb 7, 2023
639dfb2
Merge pull request #13 from ZeynepKilinc/patch-7
SabanciRobotics Feb 7, 2023
aef26b9
Update header.html
SabanciRobotics Feb 7, 2023
4bb0f68
Update header.html
SabanciRobotics Feb 7, 2023
93be873
Update header.html
mertertorer Feb 7, 2023
7cc36b6
Horizontal Alignment Improvement of Club Logos
mertertorer Feb 7, 2023
5a6b310
Merge pull request #14 from mertertorer/patch-1
SabanciRobotics Feb 7, 2023
356aa7f
Revert "Patch 1"
SabanciRobotics Feb 7, 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
20 changes: 20 additions & 0 deletions .github/workflows/jekyll-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Jekyll site CI

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Build the site in the jekyll/builder container
run: |
docker run \
-v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \
jekyll/builder:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future"
2 changes: 1 addition & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="description" content="">
<meta name="author" content="">

<title>Creative - Start Bootstrap Theme</title>
<title>Geçmiş Olsun Türkiye</title>

<!-- Bootstrap Core CSS -->
<link rel="stylesheet" href="css/bootstrap.min.css" type="text/css">
Expand Down
14 changes: 11 additions & 3 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
<header>
<div class="header-content">
<div class="header-content-inner">
<h1>Your Favorite Source of Free Bootstrap Themes</h1>
<h1>Geçmiş Olsun Türkiye</h1>
<hr>
<p>Start Bootstrap can help you build better websites using the Bootstrap CSS framework! Just download your template and start going, no strings attached!</p>
<a href="#about" class="btn btn-primary btn-xl page-scroll">Find Out More</a>
<p>Bu web sitesi tamamen aşağıda logoları yer alan üniversite kulüplerinin, sivil toplum kuruluşlarının ve sizlerin teşvikleri ile AFAD, Ahbap ve Kızılay’a yapılan bağışın miktarını yansıtmak için kurulmuştur. Bağış yapmak için yukarıdaki butonları kullanabilirsiniz.</p>
<hr>
<h2>Ulaşılan Kişi Sayısı 15</h2>
<h2>Ulaşılan Miktar 0TL </h2>
<h2>Ulaşılan Kurum/Kuruluş 2 </h2>

<hr>
<p>Bu sayıyı arttırmak bir kişiye daha ulaşmak ile mümkün. Lütfen iletişimimizin gücünü kullanalım, yardım miktarını arttırabilmek adına hep beraber çağrı yapalım.</p>

<a href="#https://docs.google.com/forms/d/e/1FAIpQLSfahpchqP0H3WZzvX0o4YTkpMFJl-oYmMKCMgClCXjhWF9lbQ/viewform?usp=sf_link" class="btn btn-primary btn-xl page-scroll">Makbuz Paylaş</a>
</div>
</div>
</header>
14 changes: 7 additions & 7 deletions _includes/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand page-scroll" href="#page-top">Start Bootstrap</a>
<a class="navbar-brand page-scroll" href="#page-top">GEÇMİŞ OLSUN TÜRKİYE </a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li>
<a class="page-scroll" href="#about">About</a>
<a class="page-scroll" href="https://www.kizilay.org.tr/Bagis/BagisYap/404/pazarcik-depremi-bagisi">Kızılay </a>
</li>
<li>
<a class="page-scroll" href="#services">Services</a>
<li>
<a class="page-scroll" href="https://www.afad.gov.tr/depremkampanyasi2">AFAD</a>
</li>
<li>
<a class="page-scroll" href="#portfolio">Portfolio</a>
<li>
<a class="page-scroll" href="https://ahbap.org/bagisci-ol">Ahbap </a>
</li>
<li>
<a class="page-scroll" href="#contact">Contact</a>
<a class="page-scroll" href="https://docs.google.com/forms/d/e/1FAIpQLSfahpchqP0H3WZzvX0o4YTkpMFJl-oYmMKCMgClCXjhWF9lbQ/viewform?usp=sf_link">Makbuz Paylaşma </a>
</li>
</ul>
</div>
Expand Down
74 changes: 4 additions & 70 deletions _includes/portfolio.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,89 +3,23 @@
<div class="row no-gutter">
<div class="col-lg-4 col-sm-6">
<a href="#" class="portfolio-box">
<img src="img/portfolio/1.jpg" class="img-responsive" alt="">
<img src="img/portfolio/surk.jpg" class="img-responsive" style="max-width:90%;height: auto" alt="">
<div class="portfolio-box-caption">
<div class="portfolio-box-caption-content">
<div class="project-category text-faded">
Category
</div>
<div class="project-name">
Project Name
</div>
</div>
</div>
</a>
</div>
<div class="col-lg-4 col-sm-6">
<a href="#" class="portfolio-box">
<img src="img/portfolio/2.jpg" class="img-responsive" alt="">
<div class="portfolio-box-caption">
<div class="portfolio-box-caption-content">
<div class="project-category text-faded">
Category
</div>
<div class="project-name">
Project Name
</div>
</div>
</div>
</a>
</div>
<div class="col-lg-4 col-sm-6">
<a href="#" class="portfolio-box">
<img src="img/portfolio/3.jpg" class="img-responsive" alt="">
<div class="portfolio-box-caption">
<div class="portfolio-box-caption-content">
<div class="project-category text-faded">
Category
</div>
<div class="project-name">
Project Name
Sabancı Robotik Kulübü
</div>
</div>
</div>
</a>
</div>
<div class="col-lg-4 col-sm-6">
<a href="#" class="portfolio-box">
<img src="img/portfolio/4.jpg" class="img-responsive" alt="">
<img src="img/portfolio/susnow.jpg" class="img-responsive" style="max-width:50%;height: auto" alt="">
<div class="portfolio-box-caption">
<div class="portfolio-box-caption-content">
<div class="project-category text-faded">
Category
</div>
<div class="project-name">
Project Name
</div>
</div>
</div>
</a>
</div>
<div class="col-lg-4 col-sm-6">
<a href="#" class="portfolio-box">
<img src="img/portfolio/5.jpg" class="img-responsive" alt="">
<div class="portfolio-box-caption">
<div class="portfolio-box-caption-content">
<div class="project-category text-faded">
Category
</div>
<div class="project-name">
Project Name
</div>
</div>
</div>
</a>
</div>
<div class="col-lg-4 col-sm-6">
<a href="#" class="portfolio-box">
<img src="img/portfolio/6.jpg" class="img-responsive" alt="">
<div class="portfolio-box-caption">
<div class="portfolio-box-caption-content">
<div class="project-category text-faded">
Category
</div>
<div class="project-name">
Project Name
Sabancı Kış Sporları Kulübü
</div>
</div>
</div>
Expand Down
30 changes: 6 additions & 24 deletions _includes/services.html
Original file line number Diff line number Diff line change
@@ -1,40 +1,22 @@
<section id="services">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">At Your Service</h2>
<hr class="primary">
</div>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-lg-3 col-md-6 text-center">
<div class="service-box">
<i class="fa fa-4x fa-diamond wow bounceIn text-primary"></i>
<h3>Sturdy Templates</h3>
<p class="text-muted">Our templates are updated regularly so they don't break.</p>
</div>
</div>
<div class="col-lg-3 col-md-6 text-center">
<div class="service-box">
<i class="fa fa-4x fa-paper-plane wow bounceIn text-primary" data-wow-delay=".1s"></i>
<h3>Ready to Ship</h3>
<p class="text-muted">You can use this theme as is, or you can make changes!</p>
<i class="fa fa-4x fa-light fa-kit-medical text-primary" data-wow-delay=".2s"></i>
<a href="https://www.afad.gov.tr/depremkampanyasi2" class="h3">AFAD</a>
</div>
</div>
<div class="col-lg-3 col-md-6 text-center">
<div class="service-box">
<i class="fa fa-4x fa-newspaper-o wow bounceIn text-primary" data-wow-delay=".2s"></i>
<h3>Up to Date</h3>
<p class="text-muted">We update dependencies to keep things fresh.</p>
<i class="fa fa-4x fa-solid fa-circle-heart text-primary"></i>
<a href="https://ahbap.org/bagisci-ol" class="h3">Ahbap</a>
</div>
</div>
<div class="col-lg-3 col-md-6 text-center">
<div class="service-box">
<i class="fa fa-4x fa-heart wow bounceIn text-primary" data-wow-delay=".3s"></i>
<h3>Made with Love</h3>
<p class="text-muted">You have to make your websites with love these days!</p>
<i class="fa fa-4x fa-regular fa-moon text-primary"></i>
<a href="https://www.kizilay.org.tr/Bagis/BagisYap/404/pazarcik-depremi-bagisi" class="h3">Kızılay</a>
</div>
</div>
</div>
Expand Down
8 changes: 2 additions & 6 deletions _layouts/front.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<html lang="tr">

{% include head.html %}

<body id="page-top">
{% include nav.html %}
{% include header.html %}
{% include call-to-action.html %}
{% include services.html %}
{% include portfolio.html %}
{% include aside.html %}
{% include contact.html %}
{% include scripts.html %}
</body>

</html>
</html>
2 changes: 1 addition & 1 deletion css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
// }

// variables.less
$theme-primary: #F05F40;
$theme-primary: #1E0C81;
$theme-dark: #222;

// Import partials from `sass_dir` (defaults to `_sass`)
Expand Down
Binary file modified img/header.jpg
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 img/portfolio/surk.jpg
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 img/portfolio/susnow.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.