Bladeren bron

Update original files

Pierre-Yves Barriat 6 jaren geleden
bovenliggende
commit
24c24aee2f
3 gewijzigde bestanden met toevoegingen van 25 en 21 verwijderingen
  1. 14 2
      project/windows/branching-website.html
  2. 0 19
      project/windows/functions/greetings.sh
  3. 11 0
      project/windows/styles.css

+ 14 - 2
project/windows/branching-website.html

@@ -8,7 +8,19 @@
     <h1> Branching </h1>
     <h2> A website to practice branching with Git. </h2>
     <p> This page has been created in order to practice branching with Git and GitHub. By creating branches, we can work on different versions of the same code in the same repository simultaneously!  </p>
-    <h2>Branches</h2>
-    <p class="master">I am the master</p>
+    <h2> Tips </h2>
+    <p> This HTML file is associated to a CSS file. You will have to write you own style definitions and to create your own appropriate div part below.  </p>
+    <h1> Branches </h1>
+
+    <div class="master">
+      <h2> Master </h2>
+      <p>I am the master</p>
+    </div>
+
+    <div class="example"> 
+      <h2 class="example"> Example </h2>
+      <p>I am an example</p>    
+    </div>
+
   </body>
 </html>

+ 0 - 19
project/windows/functions/greetings.sh

@@ -1,19 +0,0 @@
-# Functions to deal with greetings
-#
-# Written by Domingo Manubens-Gil
-#
-# Barcelona Supercomputing Centre / Earth Sciences Department (BSC-ES)
-# Created: December 4, 2015
-# Adapted:
-
-#######################################
-# Say Hello in English
-# Globals:
-# Arguments: 
-# None
-# Returns:
-# None
-#######################################
-function say_hello() {
-	echo "Add same function for your language below..."
-}

+ 11 - 0
project/windows/styles.css

@@ -2,3 +2,14 @@
   background-color: blue;
   color: white;
 }
+
+.example {
+  background-color: skyblue;
+  color: gray;
+}
+h2.example {
+  font-style: italic;
+  text-align: center;
+  color: teal;
+}
+