summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustyna Att Ilczuk <justyna.ilczuk@gmail.com>2012-08-11 23:25:16 +0200
committerJustyna Att Ilczuk <justyna.ilczuk@gmail.com>2012-08-11 23:25:16 +0200
commite71350bd5dff862304de60c67ea88bbe0c34ec4a (patch)
treeab81180f3e1629b5df8ade2b799bdb5e1dcee822
parentc330fd69ed63e887763ef10a1ee4e1fabde08866 (diff)
downloaddattero-e71350bd5dff862304de60c67ea88bbe0c34ec4a.tar.gz
dattero-e71350bd5dff862304de60c67ea88bbe0c34ec4a.tar.bz2
dattero-e71350bd5dff862304de60c67ea88bbe0c34ec4a.zip
better support for mobile devices and more content and photos, one script to automate updating
-rw-r--r--about.html57
-rw-r--r--about.html~54
-rw-r--r--contact.html44
-rw-r--r--contact.html~45
-rw-r--r--img/VDG2.jpgbin0 -> 51115 bytes
-rw-r--r--img/measure.jpgbin0 -> 57667 bytes
-rw-r--r--index.html22
-rw-r--r--index.html~23
-rw-r--r--projects.html75
-rw-r--r--projects.html~105
-rwxr-xr-xupdate_basic_views5
-rw-r--r--update_basic_views~1
12 files changed, 321 insertions, 110 deletions
diff --git a/about.html b/about.html
index b695661..d5c2058 100644
--- a/about.html
+++ b/about.html
@@ -14,7 +14,7 @@
padding-top: 60px;
}
</style>
- <link href="css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<link rel="shortcut icon" href="ico/favicon.ico">
@@ -25,19 +25,21 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
+
<a class="brand" href="#">Attero</a>
- <div class="nav-collapse collapse">
+
<ul class="nav nav-pills">
<li><a href="./index.html">Home</a></li>
- <li class="active"><a href="./about.html">About</a></li>
+ <li class="active"><a href="./about.html">About</a>
<li><a href="./contact.html">Contact</a></li>
<li><a href="./projects.html">Projects</a></li>
</ul>
+
+ </a>
+
+ <div class="nav-collapse collapse">
</div><!--/.nav-collapse -->
</div>
</div>
@@ -46,15 +48,42 @@
- <div class="container">
-
- <div class="page-header">
- <h1>Who I am?</h1>
- </div>
- <p>Why so difficult questions?</p>
-
+ <div class="container">
+ <div class="container-fluid">
+ <div class="row-fluid">
+ <div class="span2 well">
+ <div class="">
+ <p>11.08.2012</p>
+ <h3>
+ <i class="icon-wrench"></i>Something about something!
+ </h3>
+ </div>
+ </div>
+ <div class="span10">
+ <div class="page-header">
+ <h1>About this site...</h1>
+ </div>
+ <p>Site is designed to be my home page. However I still
+ don't have clear idea, what I'm going to store here. Probably
+ lot of everything if I get serious about this site...</p>
+ <p>Firstly I want to develop <a href="./projects.html">Projects</a>
+ section. My life is mostly reading about interesting stuff and doing
+ things, hence I regard projects as something really important.</p>
+
+ <img src="./img/measure.jpg" style="padding:10px"/>
+ <p>Photo taken in
+ <a href="http://if.pw.edu.pl/www_en/">faculty of physics
+ at Warsaw University of Technology</a>.
+ </p>
+ <br/>
+ </div>
</div>
+ <div class="container-fluid">
+ <div class="row-fluid">
+ <div class= "span12">Made by Justyna Edyta Ilczuk also known as Attero ;)</div>
+ <div>
+ </div>
<!-- Placed at the end of the document so the pages load faster -->
<script src="js/jquery-1.8.0.min.js"></script>
diff --git a/about.html~ b/about.html~
index 01f20b2..71b3b70 100644
--- a/about.html~
+++ b/about.html~
@@ -14,7 +14,7 @@
padding-top: 60px;
}
</style>
- <link href="css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<link rel="shortcut icon" href="ico/favicon.ico">
@@ -25,18 +25,21 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
+
<a class="brand" href="#">Attero</a>
- <div class="nav-collapse collapse">
+
<ul class="nav nav-pills">
<li><a href="./index.html">Home</a></li>
- <li class="active"><a href="./about.html">About</a></li>
+ <li class="active"><a href="./about.html">About</a>
<li><a href="./contact.html">Contact</a></li>
+ <li><a href="./projects.html">Projects</a></li>
</ul>
+
+ </a>
+
+ <div class="nav-collapse collapse">
</div><!--/.nav-collapse -->
</div>
</div>
@@ -45,16 +48,39 @@
- <div class="container">
-
- <div class="page-header">
- <h1>Who I am?</h1>
- </div>
- <p>Why so difficult questions?</p>
-
+ <div class="container">
+ <div class="container-fluid">
+ <div class="row-fluid">
+ <div class="span2 well">
+ <div class="">
+ <p>11.08.2012</p>
+ <h3>
+ <i class="icon-wrench"></i>Something about something!
+ </h3>
+ </div>
+ </div>
+ <div class="span10">
+ <div class="page-header">
+ <h1>About this site...</h1>
+ </div>
+ <p>Site is designed to be my home page. However I still
+ don't have clear idea, what I'm going to store here. Probably
+ lot of everything if I get serious about this site...</p>
+ <p>Firstly I want to develop <a href="./projects.html">Projects</a>
+ section. My life is mostly reading about interesting stuff and doing
+ things, hence I regard projects as something really important.</p>
+
+ <img src="./img/measure.jpg" style="padding:10px"/>
+ <p>Photo taken in
+ <a href="http://if.pw.edu.pl/www_en/">faculty of physics
+ at Warsaw University of Technology</a>.
+ </p>
+ <br/>
+ </div>
</div>
+
<!-- Placed at the end of the document so the pages load faster -->
<script src="js/jquery-1.8.0.min.js"></script>
diff --git a/contact.html b/contact.html
index 0b7b12e..5c5a182 100644
--- a/contact.html
+++ b/contact.html
@@ -14,7 +14,7 @@
padding-top: 60px;
}
</style>
- <link href="css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<link rel="shortcut icon" href="ico/favicon.ico">
@@ -23,24 +23,26 @@
<body>
<div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a class="brand" href="#">Attero</a>
- <div class="nav-collapse collapse">
- <ul class="nav nav-pills">
- <li><a href="./index.html">Home</a></li>
- <li><a href="./about.html">About</a></li>
- <li class="active"><a href="./contact.html">Contact</a></li>
- <li><a href="./projects.html">Projects</a></li>
- </ul>
- </div><!--/.nav-collapse -->
- </div>
- </div>
+ <div class="navbar-inner">
+ <div class="container">
+
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+
+ <a class="brand" href="#">Attero</a>
+
+ <ul class="nav nav-pills">
+ <li><a href="./index.html">Home</a></li>
+ <li><a href="./about.html">About</a>
+ <li class="active"><a href="./contact.html">Contact</a></li>
+ <li><a href="./projects.html">Projects</a></li>
+ </ul>
+
+ </a>
+
+ <div class="nav-collapse collapse">
+ </div><!--/.nav-collapse -->
+ </div>
+ </div>
</div>
@@ -62,8 +64,8 @@
<p>Eh? Is anyone interested in contacting with me? I'm usually not at home...</p>
<img src="./img/not_at_home.jpg" style="padding:10px"/>
<p>But you can catch me via
- <a href="http://www.facebook.com/jilczuk">my facebook page</a>.
- </p>
+ <a href="http://www.facebook.com/jilczuk">my facebook page</a>
+ or send me an email: justyna.ilczuk[at]gmail.com. </p>
<br/>
</div>
</div>
diff --git a/contact.html~ b/contact.html~
index 2183551..ca3dc9e 100644
--- a/contact.html~
+++ b/contact.html~
@@ -14,7 +14,7 @@
padding-top: 60px;
}
</style>
- <link href="css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<link rel="shortcut icon" href="ico/favicon.ico">
@@ -23,24 +23,26 @@
<body>
<div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a class="brand" href="#">Attero</a>
- <div class="nav-collapse collapse">
- <ul class="nav nav-pills">
- <li><a href="./index.html">Home</a></li>
- <li><a href="./about.html">About</a></li>
- <li class="active"><a href="./contact.html">Contact</a></li>
- <li><a href="./projects.html">Projects</a></li>
- </ul>
- </div><!--/.nav-collapse -->
- </div>
- </div>
+ <div class="navbar-inner">
+ <div class="container">
+
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+
+ <a class="brand" href="#">Attero</a>
+
+ <ul class="nav nav-pills">
+ <li><a href="./index.html">Home</a></li>
+ <li><a href="./about.html">About</a>
+ <li class="active"><a href="./contact.html">Contact</a></li>
+ <li><a href="./projects.html">Projects</a></li>
+ </ul>
+
+ </a>
+
+ <div class="nav-collapse collapse">
+ </div><!--/.nav-collapse -->
+ </div>
+ </div>
</div>
@@ -59,8 +61,11 @@
<div class="page-header">
<h1>Contact</h1>
</div>
- <p>Eh? <a href="http://www.facebook.com/jilczuk">My facebook page</a></p>
+ <p>Eh? Is anyone interested in contacting with me? I'm usually not at home...</p>
<img src="./img/not_at_home.jpg" style="padding:10px"/>
+ <p>But you can catch me via
+ <a href="http://www.facebook.com/jilczuk">my facebook page</a>
+ or send me an email: justyna.ilczuk[at]gmail.com </p>
<br/>
</div>
</div>
diff --git a/img/VDG2.jpg b/img/VDG2.jpg
new file mode 100644
index 0000000..9eb6662
--- /dev/null
+++ b/img/VDG2.jpg
Binary files differ
diff --git a/img/measure.jpg b/img/measure.jpg
new file mode 100644
index 0000000..cbb9343
--- /dev/null
+++ b/img/measure.jpg
Binary files differ
diff --git a/index.html b/index.html
index 3230a51..c02e8bf 100644
--- a/index.html
+++ b/index.html
@@ -13,9 +13,10 @@
<style>
body {
padding-top: 60px;
+
}
</style>
- <link href="css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<link rel="shortcut icon" href="ico/favicon.ico">
@@ -23,27 +24,30 @@
<body>
+
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
+
<a class="brand" href="#">Attero</a>
- <div class="nav-collapse collapse">
+
<ul class="nav nav-pills">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="./about.html">About</a></li>
+ <li class="active"><a href="./index.html">Home</a></li>
+ <li><a href="./about.html">About</a>
<li><a href="./contact.html">Contact</a></li>
<li><a href="./projects.html">Projects</a></li>
</ul>
+
+ </a>
+
+ <div class="nav-collapse collapse">
</div><!--/.nav-collapse -->
</div>
</div>
</div>
-
+
<div class="container">
<div class="container-fluid">
<div class="row-fluid">
diff --git a/index.html~ b/index.html~
index 67100e3..cf3e2a6 100644
--- a/index.html~
+++ b/index.html~
@@ -13,9 +13,10 @@
<style>
body {
padding-top: 60px;
+ padding-bottom: 60px;
}
</style>
- <link href="css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<link rel="shortcut icon" href="ico/favicon.ico">
@@ -23,26 +24,30 @@
<body>
+
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
+
<a class="brand" href="#">Attero</a>
- <div class="nav-collapse collapse">
+
<ul class="nav nav-pills">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="./about.html">About</a></li>
+ <li class="active"><a href="./index.html">Home</a></li>
+ <li><a href="./about.html">About</a>
<li><a href="./contact.html">Contact</a></li>
+ <li><a href="./projects.html">Projects</a></li>
</ul>
+
+ </a>
+
+ <div class="nav-collapse collapse">
</div><!--/.nav-collapse -->
</div>
</div>
</div>
-
+
<div class="container">
<div class="container-fluid">
<div class="row-fluid">
diff --git a/projects.html b/projects.html
index aaf623e..e71baed 100644
--- a/projects.html
+++ b/projects.html
@@ -14,7 +14,7 @@
padding-top: 60px;
}
</style>
- <link href="css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<link rel="shortcut icon" href="ico/favicon.ico">
@@ -22,22 +22,24 @@
<body>
- <div class="navbar navbar-fixed-top">
+ <div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
+
<a class="brand" href="#">Attero</a>
- <div class="nav-collapse collapse">
+
<ul class="nav nav-pills">
<li><a href="./index.html">Home</a></li>
- <li><a href="./about.html">About</a></li>
+ <li><a href="./about.html">About</a>
<li><a href="./contact.html">Contact</a></li>
<li class="active"><a href="./projects.html">Projects</a></li>
</ul>
+
+ </a>
+
+ <div class="nav-collapse collapse">
</div><!--/.nav-collapse -->
</div>
</div>
@@ -45,17 +47,54 @@
-
- <div class="container">
-
- <div class="page-header">
- <h1>Projects</h1>
- </div>
- <p>More info soon...</p>
-
+ <div class="container">
+ <div class="container-fluid">
+ <div class="row-fluid">
+ <div class="span2 well">
+ <div class="">
+ <p>11.08.2012</p>
+ <h3>
+ <i class="icon-wrench"></i>Why I am so busy?
+ </h3>
+ </div>
+ </div>
+ <div class="span10">
+ <div class="page-header">
+ <h1>Projects</h1>
+ </div>
+ <h2>Big things</h2>
+ <h3>Van Der Graaf Generator</h3>
+ <p>It's a very interesting device, which can be used to generate a
+ really big voltage. At least measured in hundreds of kVolts!</p>
+ <p><a href="http://en.wikipedia.org/wiki/Van_de_Graaff_generator">
+ Here</a>'s more info about how this thing works.</p>
+ <p>I hope that we'll finish it soon. It'd be probably done by now,
+ but our workspace is actually out of order. Eh...</p>
+ <p>I'm working on it with q3k.</p>
+ <img src="./img/VDG2.jpg" style="padding:10px"/>
+ <p>Photo was taken in the <a href="https://hackerspace.pl">Warsaw Hackerspace</a>
+ by <a href="http://q3k.org/">q3k</a>.</p>
+
+ <br/>
+ <h2>Programming</h2>
+ <p>Will be updated later on...</p>
+
+ <h2>Physics</h2>
+ <p>Will be updated later on...</p>
+ <h2>Art</h2>
+ <p>Will be updated later on...</p>
+ <h2>Different stuff</h2>
+ <p>Will be updated later on...</p>
+ </br>
+ </div>
</div>
-
-
+
+
+ <div class="container-fluid">
+ <div class="row-fluid">
+ <div class= "span12">Made by Justyna Edyta Ilczuk also known as Attero ;)</div>
+ <div>
+ </div>
<!-- Placed at the end of the document so the pages load faster -->
<script src="js/jquery-1.8.0.min.js"></script>
diff --git a/projects.html~ b/projects.html~
index c217ab3..edeba07 100644
--- a/projects.html~
+++ b/projects.html~
@@ -1,8 +1,103 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
<head>
- <title></title>
- <meta content="">
- <style></style>
+ <meta charset="utf-8">
+ <title>Atte.ro</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="description" content="Home page of Attero">
+ <meta name="author" content="Justyna Edyta Ilczuk">
+
+
+ <link href="css/bootstrap.css" rel="stylesheet">
+ <style>
+ body {
+ padding-top: 60px;
+ }
+ </style>
+ <link href="css/bootstrap.min.css" rel="stylesheet">
+
+
+ <link rel="shortcut icon" href="ico/favicon.ico">
</head>
- <body></body>
+
+ <body>
+
+ <div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+
+ <a class="brand" href="#">Attero</a>
+
+ <ul class="nav nav-pills">
+ <li><a href="./index.html">Home</a></li>
+ <li><a href="./about.html">About</a>
+ <li><a href="./contact.html">Contact</a></li>
+ <li class="active"><a href="./projects.html">Projects</a></li>
+ </ul>
+
+ </a>
+
+ <div class="nav-collapse collapse">
+ </div><!--/.nav-collapse -->
+ </div>
+ </div>
+ </div>
+
+
+
+ <div class="container">
+ <div class="container-fluid">
+ <div class="row-fluid">
+ <div class="span2 well">
+ <div class="">
+ <p>11.08.2012</p>
+ <h3>
+ <i class="icon-wrench"></i>Why I am so busy?
+ </h3>
+ </div>
+ </div>
+ <div class="span10">
+ <div class="page-header">
+ <h1>Projects</h1>
+ </div>
+ <h2>Big things</h2>
+ <h3>Van Der Graaf Generator</h3>
+ <p>It's a very interesting device, which can be used to generate a
+ really big voltage. At least measured in hundreds of kVolts!</p>
+ <p><a href="http://en.wikipedia.org/wiki/Van_de_Graaff_generator">
+ Here</a>'s more info how it works.</p>
+ <p>I hope that we'll finish it soon. It'd be probably done by now,
+ but our workspace is actually out of order. Eh...</p>
+ <p>I'm working on it with q3k.</p>
+ <img src="./img/VDG2.jpg" style="padding:10px"/>
+ <p>Photo was taken in the <a href="https://hackerspace.pl">Warsaw Hackerspace</a>
+ by <a href="http://q3k.org/">q3k</a>.</p>
+
+ <br/>
+ <h2>Programming</h2>
+ <p>Will be updated later on...</p>
+
+ <h2>Physics</h2>
+ <p>Will be updated later on...</p>
+ <h2>Art</h2>
+ <p>Will be updated later on...</p>
+ <h2>Different stuff</h2>
+ <p>Will be updated later on...</p>
+ </br>
+ </div>
+ </div>
+
+
+ <div class="container-fluid">
+ <div class="row-fluid">
+ <div class= "span12">Made by Justyna Edyta Ilczuk also known as Attero ;)</div>
+ <div>
+ </div>
+ <!-- Placed at the end of the document so the pages load faster -->
+ <script src="js/jquery-1.8.0.min.js"></script>
+
+
+ </body>
</html> \ No newline at end of file
diff --git a/update_basic_views b/update_basic_views
new file mode 100755
index 0000000..43fd861
--- /dev/null
+++ b/update_basic_views
@@ -0,0 +1,5 @@
+#!/bin/bash
+scp index.html att@vicodin.q3k.org:./htdocs-atte.ro
+scp contact.html att@vicodin.q3k.org:./htdocs-atte.ro
+scp projects.html att@vicodin.q3k.org:./htdocs-atte.ro
+scp about.html att@vicodin.q3k.org:./htdocs-atte.ro \ No newline at end of file
diff --git a/update_basic_views~ b/update_basic_views~
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/update_basic_views~
@@ -0,0 +1 @@
+