diff --git a/02/src/App.css b/02/src/App.css
index 49316133..6ef85c8f 100644
--- a/02/src/App.css
+++ b/02/src/App.css
@@ -1,3 +1,11 @@
.App {
text-align: center;
}
+
+.red {
+ color:red;
+}
+
+.bold {
+ font-weight: bold;
+}
\ No newline at end of file
diff --git a/02/src/App.js b/02/src/App.js
index 136d2279..870bee18 100644
--- a/02/src/App.js
+++ b/02/src/App.js
@@ -151,12 +151,28 @@ class App extends React.Component {
);
style.backgroundColor = "red";
+<<<<<<< HEAD
+=======
+ }
+
+ let classes = [];
+ if (this.state.character.length <= 2) {
+ classes.push('red');
+ }
+ if (this.state.character.length <= 1) {
+ classes.push('bold');
+>>>>>>> 07c583587442782ee7aeef672dd58c907f53437c
}
return (
Hi, I'm a React App, I'm cute.
+<<<<<<< HEAD
Created using OOP code
+=======
+
Created using OOP code
+
And this is a little test in styling
+>>>>>>> 07c583587442782ee7aeef672dd58c907f53437c