diff --git a/lib/cust/main.css b/lib/cust/main.css index 62a0288db22a90b184e84abae93292ef2fdcf175..af37693e46686e14ddfe943dbc4c936e7f63a084 100644 --- a/lib/cust/main.css +++ b/lib/cust/main.css @@ -2,31 +2,15 @@ IMPORTS */ -/*@font-face { - font-family: DINPro; - font-weight: normal; - src: url(../../res/fonts/DINPro-Light.ttf); -} -@font-face { - font-family: DINPro; - font-weight: bold; - src: url(../../res/fonts/DINPro-Bold.ttf); -}*/ - /* GENERAL SETUP */ -* { - margin: 0; - padding: 0; -} html, body { width: 100%; height: 100%; } body { - font-family: DINPro; overflow: hidden; } @@ -40,11 +24,6 @@ body { transition: all 0.5s ease; } -[contenteditable=true]:empty:before { - content: attr(placeholder); - display: block; /* For Firefox */ -} - /* LOGIN PANEL */ @@ -59,7 +38,7 @@ body { justify-content: center; position: fixed; z-index: 20; - //background: rgba(30,30,30,.9); + /*background: rgba(30,30,30,.9);*/ background: rgba(31, 45, 84, 1); } .loginPanel>div { @@ -111,14 +90,6 @@ body { overflow: hidden; } -/* - MAIN NAVBAR -*/ - -.navbar-main .container-fluid>ul>li { - float: left; -} - /* ANNOUNCE TOOL */ diff --git a/src/index.js b/src/index.js index d56ffd314e5cc20298fb5b1cb2b201fcf0a6d744..324ccdd9b819e292f9627583740f0bd00b23c73a 100644 --- a/src/index.js +++ b/src/index.js @@ -6,7 +6,7 @@ import { MembershipView } from './membershipTool'; import { EventTable, NewEvent, EventModal } from './eventTool'; import Sidebar from './sidebar'; import AnnounceTool from './announceTool'; -import style from './style'; +import './style'; const main = document.createElement('div'); document.body.appendChild(main); @@ -49,6 +49,3 @@ m.route(root, '/users', { '/login': LoginScreen, '/announce': layoutWith(AnnounceTool), }); - - -//m.mount(root, layoutWith(userlist)); diff --git a/src/style.js b/src/style.js index 7ccaed11b663dc70902abe8e7e717fbb3840d90d..99559774e7897dee564c4842d419d344d60cc43d 100644 --- a/src/style.js +++ b/src/style.js @@ -1,4 +1,6 @@ -import { ButtonCSS } from 'polythene-css'; +import { ButtonCSS, addTypography } from 'polythene-css'; + +addTypography(); ButtonCSS.addStyle('.blue-button', { color_light_text: 'blue',