Skip to content

Commit

Permalink
minor bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Rohanhacker committed Mar 28, 2017
1 parent e7373a1 commit f1156fc
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 37 deletions.
14 changes: 6 additions & 8 deletions src/containers/About/about.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
.background {
background: linear-gradient(40deg,#1F1C2C,transparent 100%),
linear-gradient(230deg, #928DAB, transparent),
#ffa949 url('http://res.cloudinary.com/www-rohanm-com/image/upload/v1489134159/bgabout_dbbkaq.jpg') center;
#ffa949 url('http://res.cloudinary.com/www-rohanm-com/image/upload/c_scale,q_auto:low,w_1456/v1489134159/bgabout_dbbkaq.jpg') center;
background-size: cover;
height: calc(100vh - 10px);
width: calc(100vw - 10px);
height: calc(100vh);
width: calc(100vw);
border: 10px solid white;
transition: filter 1s ease;
}

.container {
overflow-y: auto;
padding: 20px;
height: calc(100% - 30px);
height: calc(100% - 20px);
width: calc(100% - 20px);
position: fixed;
top: 10px;
Expand Down Expand Up @@ -117,12 +117,12 @@ h2 {
{
box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
background-color: #F5F5F5;
border-radius: 10px;
border-radius: 5px;
}

.container::-webkit-scrollbar
{
width: 10px;
width: 8px;
background-color: #F5F5F5;
}

Expand All @@ -137,5 +137,3 @@ h2 {
color-stop(0.86, #747281));
}



18 changes: 7 additions & 11 deletions src/containers/Contact/contact.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
.background {
background: linear-gradient(40deg,#1F1C2C,transparent 100%),
linear-gradient(230deg, #928DAB, transparent),
#ffa949 url('http://res.cloudinary.com/www-rohanm-com/image/upload/v1489134166/bgcontact_bigclr.jpg') center;
#ffa949 url('http://res.cloudinary.com/www-rohanm-com/image/upload/c_scale,q_auto:low,w_1371/v1489134166/bgcontact_bigclr.jpg') center;
background-size: cover;
height: calc(100vh - 10px);
width: calc(100vw - 10px);
height: calc(100vh);
width: calc(100vw);
border: 10px solid white;
transition: filter 1s ease;
}

.container {
overflow-y: auto;
padding: 20px;
height: calc(100% - 30px);
height: calc(100% - 20px);
width: calc(100% - 20px);
position: fixed;
top: 10px;
Expand Down Expand Up @@ -61,17 +61,16 @@
}



.container::-webkit-scrollbar-track
{
box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
background-color: #F5F5F5;
border-radius: 10px;
border-radius: 5px;
}

.container::-webkit-scrollbar
{
width: 10px;
width: 8px;
background-color: #F5F5F5;
}

Expand All @@ -84,7 +83,4 @@
color-stop(0.44, #908CA7),
color-stop(0.72, #565462),
color-stop(0.86, #747281));
}



}
12 changes: 6 additions & 6 deletions src/containers/Landing/Landing.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
.background {
background: linear-gradient(40deg,#1F1C2C,transparent 100%),
linear-gradient(230deg, #928DAB, transparent),
#ffa949 url('http://res.cloudinary.com/www-rohanm-com/image/upload/v1489134157/bg_q27nqt.jpg') center;
#ffa949 url('http://res.cloudinary.com/www-rohanm-com/image/upload/c_scale,q_auto:eco,w_1346/v1489134157/bg_q27nqt.jpg') center;
background-size: cover;
height: calc(100vh - 10px);
width: calc(100vw - 10px);
height: calc(100vh);
width: calc(100vw);
border: 10px solid white;
}

.container {
overflow-y: auto;
padding: 20px;
height: calc(100% - 30px);
height: calc(100% - 20px);
width: calc(100% - 20px);
position: fixed;
top: 10px;
Expand Down Expand Up @@ -90,12 +90,12 @@
{
box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
background-color: #F5F5F5;
border-radius: 10px;
border-radius: 5px;
}

.container::-webkit-scrollbar
{
width: 10px;
width: 8px;
background-color: #F5F5F5;
}

Expand Down
3 changes: 1 addition & 2 deletions src/containers/Landing/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ class App extends Component {
}
handleScroll(event) {
let height = this.refs.heading.getBoundingClientRect().top
console.log(this.refs.heading.getBoundingClientRect())
if(height < 50) {
this.refs.background.style.filter = 'blur(2px)'
} else {
Expand Down Expand Up @@ -89,7 +88,7 @@ class App extends Component {
<span className={styles.heading} ref='heading'>
Rohan Malhotra
</span>
<Subhead words={['Coder','Designer','Wizard','Indian','Geek','Startup Enthusiast','Web Developer','Student','Casual Nerd', 'Developer', 'Casual Pentester']} />
<Subhead words={['Coder','Designer','Wizard','Indian','Geek','Startup Enthusiast','Magna Fanatic','Student','Casual Nerd', 'Developer', 'Pentester']} />
</div>
<div className={styles.about}>
<p>
Expand Down
4 changes: 2 additions & 2 deletions src/containers/Navigation/Navigation.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
height: 5px;
margin-top: 5px;
background-color: white;
transition: all 0.1s ease;
transition: all 0.2s linear;
}


Expand All @@ -50,7 +50,7 @@
font-size: 24px;
margin: 5px;
transform: translateX(200%);
transition: transform 0.1s ease-out;
transition: transform 0.2s ease;
}

.shownav {
Expand Down
13 changes: 6 additions & 7 deletions src/containers/Projects/projects.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
.background {
background: linear-gradient(40deg,#1F1C2C,transparent 100%),
linear-gradient(230deg, #928DAB, transparent),
#ffa949 url('http://res.cloudinary.com/www-rohanm-com/image/upload/v1489134169/bgprojects_jcwtwb.jpg') center;
#ffa949 url('http://res.cloudinary.com/www-rohanm-com/image/upload/c_scale,h_992,q_auto:low/v1489134169/bgprojects_jcwtwb.jpg') center;
background-size: cover;
height: calc(100vh - 10px);
width: calc(100vw - 10px);
height: calc(100vh);
width: calc(100vw);
border: 10px solid white;
transition: filter 1s ease;
}

.container {
overflow-y: auto;
padding: 20px;
height: calc(100% - 30px);
height: calc(100% - 20px);
width: calc(100% - 20px);
position: fixed;
top: 10px;
Expand Down Expand Up @@ -87,12 +87,12 @@
{
box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
background-color: #F5F5F5;
border-radius: 10px;
border-radius: 5px;
}

.container::-webkit-scrollbar
{
width: 10px;
width: 8px;
background-color: #F5F5F5;
}

Expand All @@ -108,4 +108,3 @@
}



5 changes: 4 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = {
module: {
rules: [
{
test: /\.jsx?$/,
test: /\.jsx?/,
use: [
'babel-loader',
],
Expand Down Expand Up @@ -73,4 +73,7 @@ module.exports = {
historyApiFallback: true,
hot: true,
},
resolve: {
extensions: ['.js', '.jsx'],
},
};

0 comments on commit f1156fc

Please sign in to comment.