Merge pull request #72 from vitornp/editorconfig

Adicionando editorconfig
tableless · Mar 4, 2014 · 1ba00de · 1ba00de
2 parents 52521c7 + e12eb86
commit 1ba00de
Show file tree

Hide file tree

Showing 46 changed files with 1,435 additions and 1,478 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,11 @@
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,19 +1,16 @@
 
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-  ga('create', 'UA-335027-1', 'tableless.com.br');
-  ga('send', 'pageview');
+      ga('create', 'UA-335027-1', 'tableless.com.br');
+      ga('send', 'pageview');
 
-</script>
-
-
-<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
-<script type="text/javascript" src="/iniciantes/assets/javascripts/prettify/src/prettify.js"></script>
-<script type="text/javascript" src="/iniciantes/assets/javascripts/scripts.js"></script>
-
-</body>
-</html>
+    </script>
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
+    <script type="text/javascript" src="/iniciantes/assets/javascripts/prettify/src/prettify.js"></script>
+    <script type="text/javascript" src="/iniciantes/assets/javascripts/scripts.js"></script>
+  </body>
+</html>
diff --git a/_includes/header.html b/_includes/header.html
@@ -1,21 +1,21 @@
 <!DOCTYPE html>
 <html lang="pt-br">
-<head>
-	<meta name="viewport" content="width=device-width">
-	<meta charset="UTF-8">
-	<title>Para iniciantes</title>
-	<link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,900,300italic,400italic,700italic,900italic" rel="stylesheet" type="text/css" media="screen and (min-width:800px)">
-	<link rel="stylesheet" type="text/css" href="/iniciantes/assets/stylesheets/style.css">
-	<link rel="stylesheet" type="text/css" href="/iniciantes/assets/javascripts/prettify/src/prettycss.css">
-	<link rel="stylesheet" type="text/css" href="/iniciantes/assets/stylesheets/smallscreens.css" media="screen and (max-width:800px)">
-</head>
-
-<body>
-<a href="https://github.com/tableless/iniciantes" class="lnk-fork"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"></a>
+  <head>
+    <meta name="viewport" content="width=device-width">
+    <meta charset="UTF-8">
+    <title>Para iniciantes</title>
+    <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,900,300italic,400italic,700italic,900italic" rel="stylesheet" type="text/css" media="screen and (min-width:800px)">
+    <link rel="stylesheet" type="text/css" href="/iniciantes/assets/stylesheets/style.css">
+    <link rel="stylesheet" type="text/css" href="/iniciantes/assets/javascripts/prettify/src/prettycss.css">
+    <link rel="stylesheet" type="text/css" href="/iniciantes/assets/stylesheets/smallscreens.css" media="screen and (max-width:800px)">
+  </head>
 
-<header>
-	<div class="limit">
-		<h1><a href="/iniciantes/">Getting Started</a></h1>
-		<h2>Um guia para iniciantes na área de web.</h2>
-	</div>
-</header>
+  <body>
+    <a href="https://github.com/tableless/iniciantes" class="lnk-fork"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"></a>
+
+    <header>
+      <div class="limit">
+        <h1><a href="/iniciantes/">Getting Started</a></h1>
+        <h2>Um guia para iniciantes na área de web.</h2>
+      </div>
+    </header>
diff --git a/_includes/submenu-css.html b/_includes/submenu-css.html
@@ -1,19 +1,19 @@
 <nav class="navside" id="menu-css">
-	<h3><a href="#menu-css">CSS</a></h3>
-	<ul>
-		<li><a href="index.html">O que é CSS?</a></li>
-		<li><a href="sintaxe-css.html">Sintaxe do CSS</a></li>
-		<li><a href="inserindo-css.html">Como inserir CSS na página?</a></li>
-		<li><a href="class-id.html">Diferença entre CLASS e ID</a></li>
-		<li><a href="seletores.html">Seletores encadeados e agrupados</a></li>
-		<li><a href="seletores-complexos.html">Seletores complexos</a></li>
-		<li><a href="box-model.html">Box Model</a></li>
-		<li><a href="background.html">Background</a></li>
-		<li><a href="font.html">Font</a></li>
-		<li><a href="overflow.html">Overflow</a></li>
-		<li><a href="display.html">Display</a></li>
-		<li><a href="margin-padding.html">Margin e Padding</a></li>
-		<li><a href="position.html">Position</a></li>
-		<li><a href="float-clear.html">Float e Clear</a></li>
-	</ul>
-</nav>
+  <h3><a href="#menu-css">CSS</a></h3>
+  <ul>
+    <li><a href="index.html">O que é CSS?</a></li>
+    <li><a href="sintaxe-css.html">Sintaxe do CSS</a></li>
+    <li><a href="inserindo-css.html">Como inserir CSS na página?</a></li>
+    <li><a href="class-id.html">Diferença entre CLASS e ID</a></li>
+    <li><a href="seletores.html">Seletores encadeados e agrupados</a></li>
+    <li><a href="seletores-complexos.html">Seletores complexos</a></li>
+    <li><a href="box-model.html">Box Model</a></li>
+    <li><a href="background.html">Background</a></li>
+    <li><a href="font.html">Font</a></li>
+    <li><a href="overflow.html">Overflow</a></li>
+    <li><a href="display.html">Display</a></li>
+    <li><a href="margin-padding.html">Margin e Padding</a></li>
+    <li><a href="position.html">Position</a></li>
+    <li><a href="float-clear.html">Float e Clear</a></li>
+  </ul>
+</nav>
diff --git a/_includes/submenu-html.html b/_includes/submenu-html.html
@@ -1,10 +1,10 @@
 <nav class="navside" id="menu-html">
-	<h3><a href="#menu-html">HTML</a></h3>
-	<ul>
-		<li><a href="index.html">O que é HTML?</a></li>
-		<li><a href="oquesemantica.html">O que é semântica?</a></li>
-		<li><a href="oquetags.html">O que são Tags, atributos e elementos?</a></li>
-		<li><a href="estruturabasica.html">Estrutura básica</a></li>
-		<li><a href="oquemetatags.html">O que são metatags?</a></li>
-	</ul>
+  <h3><a href="#menu-html">HTML</a></h3>
+  <ul>
+    <li><a href="index.html">O que é HTML?</a></li>
+    <li><a href="oquesemantica.html">O que é semântica?</a></li>
+    <li><a href="oquetags.html">O que são Tags, atributos e elementos?</a></li>
+    <li><a href="estruturabasica.html">Estrutura básica</a></li>
+    <li><a href="oquemetatags.html">O que são metatags?</a></li>
+  </ul>
 </nav>
diff --git a/_includes/submenu-js.html b/_includes/submenu-js.html
@@ -1,14 +1,14 @@
 <nav class="navside" id="menu-js">
-	<h3><a href="#menu-js">JavaScript</a></h3>
-	<ul>
-		<li><a href="index.html">O que é JavaScript?</a></li>
-		<li><a href="inserindo-js.html">Inserindo JavaScript na página</a></li>
-		<li><a href="variaveis.html">Variáveis</a></li>
-		<li><a href="operadores.html">Operadores</a></li>
-		<li><a href="funcoes.html">Funções</a></li>
-		<li><a href="arrays.html">Arrays</a></li>
-		<li><a href="objetos.html">Objetos</a></li>
-		<li><a href="o-que-framework.html">O que é um framework?</a></li>
-		<li><a href="o-que-jquery.html">O que é jQuery?</a></li>
-	</ul>
+  <h3><a href="#menu-js">JavaScript</a></h3>
+  <ul>
+    <li><a href="index.html">O que é JavaScript?</a></li>
+    <li><a href="inserindo-js.html">Inserindo JavaScript na página</a></li>
+    <li><a href="variaveis.html">Variáveis</a></li>
+    <li><a href="operadores.html">Operadores</a></li>
+    <li><a href="funcoes.html">Funções</a></li>
+    <li><a href="arrays.html">Arrays</a></li>
+    <li><a href="objetos.html">Objetos</a></li>
+    <li><a href="o-que-framework.html">O que é um framework?</a></li>
+    <li><a href="o-que-jquery.html">O que é jQuery?</a></li>
+  </ul>
 </nav>
diff --git a/_includes/submenu-obasico.html b/_includes/submenu-obasico.html
@@ -1,9 +1,9 @@
 <nav class="navside" id="menu-obasico">
-	<h3><a href="#menu-obasico">O Conceito</a></h3>
-	<ul>
-		<li><a href="o-que-front-back.html">O que é Front-end e Back-end?</a></li>
-		<li><a href="oquew3c.html">O que é W3C?</a></li>
-		<li><a href="desenvolvimentocamadas.html">O que é desenvolvimento por camadas?</a></li>
-		<li><a href="oquedom.html">O que é DOM?</a></li>
-	</ul>
-</nav>
+  <h3><a href="#menu-obasico">O Conceito</a></h3>
+  <ul>
+    <li><a href="o-que-front-back.html">O que é Front-end e Back-end?</a></li>
+    <li><a href="oquew3c.html">O que é W3C?</a></li>
+    <li><a href="desenvolvimentocamadas.html">O que é desenvolvimento por camadas?</a></li>
+    <li><a href="oquedom.html">O que é DOM?</a></li>
+  </ul>
+</nav>
diff --git a/_layouts/base.html b/_layouts/base.html
@@ -2,4 +2,4 @@
 
 {{content}}
 
-{% include footer.html %}
+{% include footer.html %}
diff --git a/_layouts/interna.html b/_layouts/interna.html
@@ -1,15 +1,11 @@
 {% include header.html %}
 
 <div class="limit">
+  <aside class="sidebar">
+    <!-- Something before the submenus -->
+  </aside>
 
-	<aside class="sidebar">
-		<!--
-			Something before the submenus
-		-->
-	</aside>
-
-{{content}}
-
+  {{content}}
 </div>
 
-{% include footer.html %}
+{% include footer.html %}
diff --git a/assets/javascripts/scripts.js b/assets/javascripts/scripts.js
@@ -1,3 +1,3 @@
 $(document).ready(function(){
-	prettyPrint();
-});
+  prettyPrint();
+});
diff --git a/assets/stylesheets/smallscreens.css b/assets/stylesheets/smallscreens.css
@@ -1,76 +1,76 @@
 .lnk-fork {
-	display: none;
+  display: none;
 }
 
 .limit {
-	width: 90%;
-	margin: 0 auto;
+  width: 90%;
+  margin: 0 auto;
 }
 
 .box {
-	display: block;
-	width: 100%;
-	margin: 0 auto 20px;
+  display: block;
+  width: 100%;
+  margin: 0 auto 20px;
 }
 .box:nth-child(even) {margin: 0 auto 20px;}
 
 .box:before {
-	padding: 20px 0;
-	font-size: 2em;
+  padding: 20px 0;
+  font-size: 2em;
 }
 
 .box h1 {
-	font-size: 1em;
+  font-size: 1em;
 }
 
 .box p {
-	padding: 10px 10px 7px;
-	line-height: 20px;
-	font-size: 1em;
+  padding: 10px 10px 7px;
+  line-height: 20px;
+  font-size: 1em;
 }
 
 
 /*****
 ****** SIDEBAR
 *****/
 .sidebar {
-	float: none;
-	margin-right: 20px;
-	position: relative;
-	top: -70px;
+  float: none;
+  margin-right: 20px;
+  position: relative;
+  top: -70px;
 }
 
 .navside {
-	margin-right: 0;
-	margin-bottom: 20px;
-	float: none;
-	clear: left;
-	width: 100%;
+  margin-right: 0;
+  margin-bottom: 20px;
+  float: none;
+  clear: left;
+  width: 100%;
 }
 
 
 
 .navside ul {position: absolute; top: -1000px}
 
 .navside:target ul {
-	position: relative;
-	top: 0;
+  position: relative;
+  top: 0;
 }
 
 .navside h3:before {
-	display: inline-block;
-	content: " ";
-	position: absolute;
-	right: 15px;
-	top: 20px;
-	width: 10px;
-	height: 5px;
-	background: url(../img/arrow-menu.png) no-repeat center;
-	background-size: 100%;
-	-webkit-transform: rotate(-90deg);
+  display: inline-block;
+  content: " ";
+  position: absolute;
+  right: 15px;
+  top: 20px;
+  width: 10px;
+  height: 5px;
+  background: url(../img/arrow-menu.png) no-repeat center;
+  background-size: 100%;
+  -webkit-transform: rotate(-90deg);
 }
 
 .navside:target h3:before {
-	background: url(../img/arrow-menu.png) no-repeat center;
-	-webkit-transform: rotate(0deg);
+  background: url(../img/arrow-menu.png) no-repeat center;
+  -webkit-transform: rotate(0deg);
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		{{content}}

		{% include footer.html %}
		{% include footer.html %}