1
Fork 0

Small restyle. Removed material bootstrap

This commit is contained in:
Jake Howard 2016-01-19 19:11:48 +00:00
parent dd67f18658
commit b2bcdc00cc
9 changed files with 18 additions and 16 deletions

View file

@ -22,7 +22,6 @@
"dependencies": { "dependencies": {
"animate.css": "=3.4.0", "animate.css": "=3.4.0",
"bootstrap": "=3.3.5", "bootstrap": "=3.3.5",
"bootstrap-material-design": "=0.5.7",
"ionicons": "=2.0.1", "ionicons": "=2.0.1",
"jquery": "=2.1.4", "jquery": "=2.1.4",
"react": "=0.13.3", "react": "=0.13.3",

View file

@ -12,15 +12,14 @@ export default class ProjectImage extends React.Component {
} }
componentDidMount() { componentDidMount() {
if (this.props.data.link.startsWith('#')) { if (this.props.data.link.startsWith('#')) {
return; this.setState({url: this.props.data.link})
} else {
Reverser(this.props.data.link)
.then(function (url) {
this.setState({ url });
}.bind(this))
.catch(console.log);
} }
Reverser(this.props.data.link)
.then(function (url) {
this.setState({ url });
}.bind(this))
.catch(function (error) {
console.log('Got this error:', error);
});
} }
render() { render() {

View file

@ -8,7 +8,7 @@ export default class NavBar extends React.Component {
return ( return (
<span> <span>
<div id="navbar-anchor" /> <div id="navbar-anchor" />
<div id="navbar-container" className="align h4"> <div id="navbar-container" className="align">
<nav className="navbar navbar-inverse"> <nav className="navbar navbar-inverse">
<div className="container-fluid"> <div className="container-fluid">
<Header /> <Header />

View file

@ -2,8 +2,8 @@
var is_navbar_attached = false; var is_navbar_attached = false;
$(window).load(function() { $(window).load(function() {
$.material.init();
$(window).trigger('scroll'); $(window).trigger('scroll');
$.material.init()
}); });
function detach_navbar() { function detach_navbar() {

View file

@ -6,12 +6,13 @@
background-size: cover; background-size: cover;
background-position: fixed; background-position: fixed;
.jumbotron { .jumbotron {
margin-top: 15vh; margin-top: 19vh;
text-align: center; text-align: center;
background-color: transparent; background-color: transparent;
color: white; color: white;
padding-bottom: 0; padding-bottom: 0;
margin-bottom: 0; margin-bottom: 0;
.box-shadow(initial);
h1 { h1 {
margin-bottom: 15px; margin-bottom: 15px;
margin-top: 10px; margin-top: 10px;

View file

@ -20,6 +20,9 @@
} }
} }
} }
.dropdown-toggle {
font-size: 18px;
}
.dropdown-menu { .dropdown-menu {
@media (min-width: @screen-sm) { @media (min-width: @screen-sm) {
right: auto; right: auto;
@ -46,6 +49,7 @@
.navbar { .navbar {
max-height: 52px;
border-radius: 0; border-radius: 0;
.home-button a { .home-button a {
.transition(~"ease-in-out .3 all"); .transition(~"ease-in-out .3 all");

View file

@ -1,8 +1,7 @@
@import "node_modules/less-mixins/index.less"; @import "node_modules/less-mixins/index.less";
@import "node_modules/bootstrap/less/bootstrap"; @import "node_modules/bootstrap/less/bootstrap";
@import "node_modules/bootstrap/less/theme";
@import "node_modules/ionicons/less/ionicons"; @import "node_modules/ionicons/less/ionicons";
@import "node_modules/bootstrap-material-design/less/bootstrap-material-design"; @import "node_modules/bootstrap/less/theme";
@import url(https://fonts.googleapis.com/css?family=Roboto:400,300,400italic,700); @import url(https://fonts.googleapis.com/css?family=Roboto:400,300,400italic,700);
@import (inline) "node_modules/animate.css/animate.css"; @import (inline) "node_modules/animate.css/animate.css";
@import 'homepage'; @import 'homepage';

View file

@ -30,7 +30,7 @@
@line-height-base: 1.428571429; @line-height-base: 1.428571429;
@line-height-computed: floor((@font-size-base * @line-height-base)); @line-height-computed: floor((@font-size-base * @line-height-base));
@headings-font-family: inherit; @headings-font-family: inherit;
@headings-font-weight: 500; @headings-font-weight: 300;
@headings-line-height: 1.1; @headings-line-height: 1.1;
@headings-color: inherit; @headings-color: inherit;
@icon-font-path: "../fonts/"; @icon-font-path: "../fonts/";

View file

@ -35,7 +35,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<h5>Powered by <a href="https://www.djangoproject.com/">Django</a>, <a href="https://clients.inceptionhosting.com/aff.php?aff=256">Inception Hosting</a>, and a whole heap of <a href="https://github.com/RealOrangeOne/theorangeone.net">Magic</a>!</h5> <p>Powered by <a href="https://www.djangoproject.com/">Django</a>, <a href="https://clients.inceptionhosting.com/aff.php?aff=256">Inception Hosting</a>, and a whole heap of <a href="https://github.com/RealOrangeOne/theorangeone.net">Magic</a>!</p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">