1
0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-11 18:32:50 +00:00

beautified

This commit is contained in:
2016-09-01 13:11:17 +00:00
parent f8ccec7ae0
commit f8c89b4486
16 changed files with 107 additions and 104 deletions

View File

@@ -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 // Main
export function bubble() { export function bubble() {

View File

@@ -9,7 +9,6 @@
display: block; display: block;
margin: 0; margin: 0;
opacity: 0.7; opacity: 0.7;
@media (min-width: 1200px) { @media (min-width: 1200px) {
position: absolute; position: absolute;
width: 7em; width: 7em;

View File

@@ -1,14 +1,13 @@
@import './utils.scss'; @import './utils.scss';
$linkColor: #3598db; $linkColor: #3598db;
$backgroundColor: #FFFFFF; $backgroundColor: #FFFFFF;
html { html {
font-family: 'Roboto Slab', serif; font-family: 'Roboto Slab', serif;
max-width: 100%; max-width: 100%;
overflow-x: hidden; overflow-x: hidden;
overflow-y: scroll; overflow-y: scroll;
} }
body { body {
background-color: $backgroundColor; background-color: $backgroundColor;
max-width: 100%; max-width: 100%;
@@ -17,6 +16,7 @@ body {
-webkit-font-smoothing: subpixel-antialiased; -webkit-font-smoothing: subpixel-antialiased;
font-weight: 300; font-weight: 300;
} }
h1, h1,
h2, h2,
h3, h3,
@@ -27,9 +27,11 @@ h6 {
font-weight: 400; font-weight: 400;
line-height: 1em; line-height: 1em;
} }
p { p {
font-weight: 300; font-weight: 300;
} }
*, *,
*:after, *:after,
*:before { *:before {
@@ -37,6 +39,7 @@ p {
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
a { a {
background-color: transparent; background-color: transparent;
color: $linkColor; color: $linkColor;
@@ -45,11 +48,13 @@ a {
color: $linkColor; color: $linkColor;
} }
} }
hr { hr {
margin: 1em; margin: 1em;
border: 0; border: 0;
border-top: 1px solid #eee; border-top: 1px solid #eee;
} }
.Footer, .Footer,
.Main { .Main {
display: flex; display: flex;
@@ -61,9 +66,11 @@ hr {
width: 1em; width: 1em;
} }
} }
.Main { .Main {
padding-top: 1em; padding-top: 1em;
} }
.Header { .Header {
width: 100%; width: 100%;
background: url("../images/header.jpg"); background: url("../images/header.jpg");
@@ -76,18 +83,19 @@ hr {
text-align: center; text-align: center;
} }
} }
.Loading { .Loading {
display: flex; display: flex;
flex: 1; flex: 1;
justify-content: center; justify-content: center;
} }
.btn { .btn {
background-color: $backgroundColor; background-color: $backgroundColor;
border: 1px solid #DADADA; border: 1px solid #DADADA;
border-radius: .2em; border-radius: .2em;
cursor: pointer; cursor: pointer;
padding: .5em; padding: .5em;
&:hover { &:hover {
background-color: #F3F3F3; background-color: #F3F3F3;
} }

View File

@@ -1,7 +1,7 @@
import hljs from 'highlight.js';
import marked from 'marked';
import React from 'react'; import React from 'react';
import {Link} from 'react-router'; import {Link} from 'react-router';
import marked from 'marked';
import hljs from 'highlight.js';
import '../../assets/scss/Content.scss'; import '../../assets/scss/Content.scss';

View File

@@ -1,6 +1,6 @@
//constants //constants
export const INCREASE_POST_LIMIT = 'INCREASE_POST_LIMIT';
export const INIT_PREVIEW = 'INIT_PREVIEW'; export const INIT_PREVIEW = 'INIT_PREVIEW';
export const FETCHING = 'FETCHING';
export const FILTER_PREVIEW = 'FILTER_PREVIEW'; export const FILTER_PREVIEW = 'FILTER_PREVIEW';
export const LOAD_POST = 'LOAD_POST'; export const LOAD_POST = 'LOAD_POST';
export const FETCHING = 'FETCHING';
export const INCREASE_POST_LIMIT = 'INCREASE_POST_LIMIT';

View File

@@ -1,10 +1,6 @@
//just using one reducer - use combineReducers from redux to modularize things //just using one reducer - use combineReducers from redux to modularize things
import { import {combineReducers} from 'redux';
combineReducers import {routerReducer} from 'react-router-redux';
} from 'redux';
import {
routerReducer
} from 'react-router-redux';
//import typs //import typs
import * as types from './constants'; import * as types from './constants';

View File

@@ -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 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'; import reducers from './reducers';