Skip to content

Costas carles Pull Recuest Dev #31

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.

Sign up for GitHub

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

Open
costascarles wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Costas carles Pull Recuest Dev #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6e9dff
ahi va
Oct 11, 2016
134fc92
Merge branch 'master' of https://github.com/RogerTorrell/Team into dev
Oct 11, 2016
84b797f
Merge branch 'master' of https://github.com/RogerTorrell/Team into dev
Oct 11, 2016
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
15 changes: 15 additions & 0 deletions content/ccm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<html>
<head>
<link href='https://fonts.googleapis.com/css?family=Montserrat' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Arvo' rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/css?family=Shadows+Into+Light" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="../css/team.css">
<link rel="stylesheet" type="text/css" href="../css/bootstrap/bootstrap.min.css">
</head>
<body class="ccm-body">
<div class="ccm-title">Carles Costas Mateu</div>
<div class="ccm-subtitle">Analiza lo que puedes crear y crea todo aquello que no se pueda analizar. </div>
<div class="ccm-circular"></div>
<div class="ccm-title">I like koalas <3</div>
</body>
</html>
23 changes: 23 additions & 0 deletions css/team.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,15 @@
<option value="content/abm.html">Alejandro Barrena</option>
<option value="content/dmm.html">David Mendoza Moreno</option>
<option value="content/ecc.html">Edgar Coca Collado</option>
<<<<<<< HEAD
<option value="content/ccm.html">Carles Costas</option>
=======
<option value="content/jcc.html">Joan Cusco Celma</option>
<option value="content/cgr.html">Conrado Garc�a</option>
<option value="content/fbg.html">Faozi Bouybaouene Gadrouz</option>
<option value="content/rta.html">Roger Torrecillas Armengol</option>

>>>>>>> e5985bba1ac8a114028d53b8be4d2796adbb1856
</select>
</div>
</div>
Expand Down