diff --git a/src/components/About.js b/src/components/About.js
index 3e1d56a..6c1e23c 100644
--- a/src/components/About.js
+++ b/src/components/About.js
@@ -14,6 +14,7 @@ import kedar from './assets/img/Kedar.PNG'
import icon from './assets/img/aboutlogo.PNG'
import raghav from './assets/img/Raghav.PNG'
import shruti from './assets/img/shruti.png'
+import group from './assets/img/group.png'
import classnames from 'classnames'
import GroupPhoto from './assets/img/team_picture.png'
@@ -62,12 +63,15 @@ class About extends Component {
return (
- About Us
+ About Us
- {/* Put something else here later */}
+
+
+ Potentia Robotics is the first high school team building a fully-functional humanoid robot. It is run entirely by students from Thomas Jefferson High School for Science and Technology (TJHSST). Our goal is to build Olympian, a 6-foot tall, low-cost bipedal humanoid robot with a human-like dynamically stable gait, limb mobility, and balance capabilities, that can be controlled effectively and efficiently from afar.
+
-
+
Leadership
Programming Subteam
@@ -89,7 +93,7 @@ class About extends Component {
-
+
diff --git a/src/components/assets/About.scss b/src/components/assets/About.scss
index d0f8622..67acb84 100644
--- a/src/components/assets/About.scss
+++ b/src/components/assets/About.scss
@@ -6,10 +6,24 @@
}
.backColor {
- background-color: #293241;
+ background-color: #3D5A80;
color: #E0FBFC;
}
+.imgStyle {
+ border: 15px solid #98C1D9;
+ padding: 10px;
+}
+
+.imgStyle2 {
+ border: 5px solid #EE6C4D;
+ padding: 5px;
+}
+
+.backColor2 {
+ background-color: #293241;
+}
+
.nameStyle {
display:inline-block;
border-bottom:2px solid#98C1D9;
@@ -62,6 +76,13 @@ img{
}
.simple-highlight{
- background-color: #E0FBFC;
+ background-color: #98C1D9;
+ color:#293241;
padding:0.1em 0.2em;
-}
\ No newline at end of file
+}
+
+.backColor3 {
+ background-color: #E0FBFC;
+ color:#3D5A80;
+ padding:0.1em 0.2em;
+}
diff --git a/src/components/assets/img/group.png b/src/components/assets/img/group.png
new file mode 100644
index 0000000..275c719
Binary files /dev/null and b/src/components/assets/img/group.png differ
diff --git a/src/components/assets/react-tabs.scss b/src/components/assets/react-tabs.scss
index 5e9ba84..4ffee90 100644
--- a/src/components/assets/react-tabs.scss
+++ b/src/components/assets/react-tabs.scss
@@ -2,7 +2,7 @@
-webkit-tap-highlight-color: transparent;
&__tab-list {
- border-bottom: 1px solid #98C1D9;
+ border-bottom: 1px solid #293241;
margin: 0 0 10px;
padding: 0;
}
@@ -19,14 +19,15 @@
background-color:#98C1D9;
&--selected {
- background: #EE6C4D;
+ background: #293241;
border-color: #aaa;
- color: #E0FBFC;
+ color: #98C1D9;
border-radius: 5px 5px 0 0;
}
&--disabled {
- color: #E0FBFC;
+ color: #293241;
+ background-color:#98C1D9;
cursor: default;
}