+
+
+
+
+
+
+
+
+
+
+
diff --git a/landing_logo.png b/landing_logo.png
new file mode 100644
index 0000000..60122d9
Binary files /dev/null and b/landing_logo.png differ
diff --git a/script.js b/script.js
index cdcdbb5..58c5c1c 100644
--- a/script.js
+++ b/script.js
@@ -1,3 +1,12 @@
+<<<<<<< HEAD
+function addDiv() {
+ //create a new P tag, save it in a variable
+ let theNewDiv = document.createElement("div");
+ //add a class to our new div element
+ theNewDiv.classList.add("auto-div");
+ //set the text inside the div
+ theNewDiv.innerHTML = document.getElementById("textInput").value;
+=======
function addDiv() {
let currentDate = new Date();
@@ -15,6 +24,7 @@ let time = hours + ":" + currentDate.getMinutes();
//set the text inside the div
theNewDiv.innerHTML = document.getElementById("textInput").value;
timeDiv.innerHTML = time;
+>>>>>>> 1e5465efaa1c2cf4d2de1fe72c239e6f5e53b19f
//find the right tag to add the div to
//we used an id of "content-area" for
@@ -23,6 +33,15 @@ let time = hours + ":" + currentDate.getMinutes();
//add the new div to that tag
theContentArea.appendChild(theNewDiv);
+<<<<<<< HEAD
+}
+
+function addImage() {
+ //create a new P tag, save it in a variable
+ let theNewDiv = document.createElement("div");
+ //add a class to our new div element
+ theNewDiv.classList.add("auto-div");
+=======
theContentArea.appendChild(timeDiv);
}
@@ -39,13 +58,17 @@ let time = hours + ":" + currentDate.getMinutes();
//add a class to our new div element
theNewDiv.classList.add("auto-div");
timeDiv.classList.add("right");
+>>>>>>> 1e5465efaa1c2cf4d2de1fe72c239e6f5e53b19f
//create image tag to put into the div
theImgTag = "";
//set the text inside the div
theNewDiv.innerHTML = theImgTag;
+<<<<<<< HEAD
+=======
timeDiv.innerHTML = time;
+>>>>>>> 1e5465efaa1c2cf4d2de1fe72c239e6f5e53b19f
//find the right tag to add the div to
//we used an id of "content-area" for
@@ -54,8 +77,11 @@ let time = hours + ":" + currentDate.getMinutes();
//add the new div to that tag
theContentArea.appendChild(theNewDiv);
+<<<<<<< HEAD
+=======
theContentArea.appendChild(timeDiv);
+>>>>>>> 1e5465efaa1c2cf4d2de1fe72c239e6f5e53b19f
}
diff --git a/style.css b/style.css
index 54b6cb9..d5916fe 100644
--- a/style.css
+++ b/style.css
@@ -1,62 +1,85 @@
+/* div{
+ border: 5px solid pink;
+} */
html,
body {
- height: 100%;
- margin: 0px;
- padding: 20px;
- box-sizing: border-box;
+ height: 100%;
+ margin: 0px;
+ padding: 20px;
+ box-sizing: border-box;
+ /* specifying length from the outside of the box */
+ background-color: #FDFCDC;
}
-body {
+.main {
+ text-align: center;
}
.paragraph-text {
- color: blue;
+ color: blue;
}
-.my-button {
- border: 0px;
- background-color: #90adc6;
- padding: 10px;
- border: 1px solid black;
+.basic-button {
+ border: 0px;
+ background-color: #90adc6;
+ padding: 10px;
+ border: 1px solid black;
+ border-radius: 5px;
}
.grid-container {
- /*set the positioning of the grid*/
- /*so that it fills the screen*/
- position: absolute;
- top: 0px;
- left: 0px;
- height: 100%;
- width: 100%;
-
- /*set display to grid*/
- display: grid;
- grid-template-columns: 250px auto;
- grid-template-rows: 100% 100%;
+ /*set the positioning of the grid*/
+ /*so that it fills the screen*/
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ height: 100%;
+ width: 100%;
+ /*set display to grid*/
+ display: grid;
+ grid-template-columns: 250px auto;
+ grid-template-rows: 100% 100%;
}
.left-col {
- /*style left column*/
- padding: 15px;
- background-color: #fad02c;
+ /*style left column*/
+ padding: 15px;
+ background-color: #fad02c;
}
.right-col {
- /*style right column*/
- padding: 15px;
- background-color: coral;
+ /*style right column*/
+ padding: 15px;
+ background-color: coral;
}
/*format for each chirp message*/
.auto-div {
- /*15px on top and botton*/
- /*0 on left and right*/
- margin: 15px 0;
+ /*15px on top and botton*/
+ /*0 on left and right*/
+ margin: 15px 0;
+ padding: 10px;
+ background-color: palevioletred;
+ border: 3px solid peachpuff;
+}
+
+h1 {
+ font-weight: 400;
+ font-size: 15vh;
+ font-family: 'Quicksand', sans-serif;
+}
+
+p {
+ font-family: 'Raleway', sans-serif;
+}
- padding: 10px;
+#logo {
+ min-width: 100px;
+ margin: auto;
+}
- background-color: palevioletred;
- border: 3px solid peachpuff;
+#top {
+ margin-bottom: 20vh;
}
.right {
margin: -15px 0;
+