mirror of
https://github.com/mgerb/mywebsite
synced 2026-01-24 15:42:48 +00:00
beautified
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
var width, height, largeHeader, canvas, ctx, circles, target, animateHeader = true;
|
||||
let width, height, largeHeader, canvas, ctx, circles, target, animateHeader = true;
|
||||
|
||||
// Main
|
||||
export function bubble() {
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
display: block;
|
||||
margin: 0;
|
||||
opacity: 0.7;
|
||||
|
||||
@media (min-width: 1200px) {
|
||||
position: absolute;
|
||||
width: 7em;
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
@import './utils.scss';
|
||||
|
||||
$linkColor: #3598db;
|
||||
$backgroundColor: #FFFFFF;
|
||||
|
||||
html {
|
||||
font-family: 'Roboto Slab', serif;
|
||||
max-width: 100%;
|
||||
overflow-x: hidden;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
body {
|
||||
background-color: $backgroundColor;
|
||||
max-width: 100%;
|
||||
@@ -17,6 +16,7 @@ body {
|
||||
-webkit-font-smoothing: subpixel-antialiased;
|
||||
font-weight: 300;
|
||||
}
|
||||
|
||||
h1,
|
||||
h2,
|
||||
h3,
|
||||
@@ -27,9 +27,11 @@ h6 {
|
||||
font-weight: 400;
|
||||
line-height: 1em;
|
||||
}
|
||||
|
||||
p {
|
||||
font-weight: 300;
|
||||
}
|
||||
|
||||
*,
|
||||
*:after,
|
||||
*:before {
|
||||
@@ -37,6 +39,7 @@ p {
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
a {
|
||||
background-color: transparent;
|
||||
color: $linkColor;
|
||||
@@ -45,11 +48,13 @@ a {
|
||||
color: $linkColor;
|
||||
}
|
||||
}
|
||||
|
||||
hr {
|
||||
margin: 1em;
|
||||
border: 0;
|
||||
border-top: 1px solid #eee;
|
||||
}
|
||||
|
||||
.Footer,
|
||||
.Main {
|
||||
display: flex;
|
||||
@@ -61,9 +66,11 @@ hr {
|
||||
width: 1em;
|
||||
}
|
||||
}
|
||||
|
||||
.Main {
|
||||
padding-top: 1em;
|
||||
}
|
||||
|
||||
.Header {
|
||||
width: 100%;
|
||||
background: url("../images/header.jpg");
|
||||
@@ -76,18 +83,19 @@ hr {
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.Loading {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.btn {
|
||||
background-color: $backgroundColor;
|
||||
border: 1px solid #DADADA;
|
||||
border-radius: .2em;
|
||||
cursor: pointer;
|
||||
padding: .5em;
|
||||
|
||||
&:hover {
|
||||
background-color: #F3F3F3;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import hljs from 'highlight.js';
|
||||
import marked from 'marked';
|
||||
import React from 'react';
|
||||
import {Link} from 'react-router';
|
||||
import marked from 'marked';
|
||||
import hljs from 'highlight.js';
|
||||
|
||||
import '../../assets/scss/Content.scss';
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//constants
|
||||
export const INCREASE_POST_LIMIT = 'INCREASE_POST_LIMIT';
|
||||
export const INIT_PREVIEW = 'INIT_PREVIEW';
|
||||
export const FETCHING = 'FETCHING';
|
||||
export const FILTER_PREVIEW = 'FILTER_PREVIEW';
|
||||
export const LOAD_POST = 'LOAD_POST';
|
||||
export const FETCHING = 'FETCHING';
|
||||
export const INCREASE_POST_LIMIT = 'INCREASE_POST_LIMIT';
|
||||
@@ -1,10 +1,6 @@
|
||||
//just using one reducer - use combineReducers from redux to modularize things
|
||||
import {
|
||||
combineReducers
|
||||
} from 'redux';
|
||||
import {
|
||||
routerReducer
|
||||
} from 'react-router-redux';
|
||||
import {combineReducers} from 'redux';
|
||||
import {routerReducer} from 'react-router-redux';
|
||||
|
||||
//import typs
|
||||
import * as types from './constants';
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import {applyMiddleware, createStore} from 'redux';
|
||||
import {syncHistoryWithStore} from 'react-router-redux';
|
||||
import {browserHistory} from 'react-router';
|
||||
import thunk from 'redux-thunk';
|
||||
import logger from 'redux-logger';
|
||||
import thunk from 'redux-thunk';
|
||||
import {applyMiddleware, createStore} from 'redux';
|
||||
import {browserHistory} from 'react-router';
|
||||
import {syncHistoryWithStore} from 'react-router-redux';
|
||||
|
||||
import reducers from './reducers';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user