From 239b0c055c2f9d2a84dfbeaf89b50f814738b0cd Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Wed, 4 Jan 2017 13:51:04 -0500 Subject: [PATCH] Update postcss to actually output compatible css --- public/css/base.css | 100 ++++++++++++++++++++++---------------------- public/css/marx.css | 83 ++++++++++++++++++++++++++++++++---- public/package.json | 8 ++-- 3 files changed, 129 insertions(+), 62 deletions(-) diff --git a/public/css/base.css b/public/css/base.css index d0610647..ced08d25 100644 --- a/public/css/base.css +++ b/public/css/base.css @@ -1,21 +1,9 @@ -:root { - --link-shadow: 1px 1px 1px #000; - --shadow: 1px 2px 1px rgba(0, 0, 0, 0.85); - --title-overlay: rgba(0, 0, 0, 0.45); - --text-color: #ffffff; - --normal-padding: 0.25em 0.125em; - --link-hover-color: #7d12db; - --edit-link-hover-color: #db7d12; - --edit-link-color: #12db18; - --radius: 5px; -} - template, [hidden="hidden"], .media[hidden] {display:none} body {margin: 0.5em;} button { - background:rgba(255,255,255,0.65); + background:rgba(255, 255, 255, .65); margin: 0; } @@ -26,11 +14,13 @@ table { td { padding:1em; + padding:16px; padding:1rem; } thead td, thead th { padding:0.5em; + padding:8px; padding:0.5rem; } @@ -43,7 +33,7 @@ tbody > tr:nth-child(odd) { } a:hover, a:active { - color: var(--link-hover-color) + color:#7d12db } /* ----------------------------------------------------------------------------- @@ -51,27 +41,28 @@ a:hover, a:active { ------------------------------------------------------------------------------*/ .bracketed { - color: var(--edit-link-color); + color:#12db18; } .bracketed, h1 a { - text-shadow: var(--link-shadow); + text-shadow:1px 1px 1px #000; } .bracketed:before {content: '[\00a0'} .bracketed:after {content: '\00a0]'} .bracketed:hover, .bracketed:active { - color: var(--edit-link-hover-color) + color:#db7d12 } -.grow-1 {-webkit-box-flex: 1;flex-grow: 1} -.flex-wrap {flex-wrap: wrap} -.flex-no-wrap {flex-wrap: nowrap} -.flex-align-end {-webkit-box-align: end;align-items: flex-end} -.flex-align-space-around {align-content: space-around} -.flex-justify-space-around {justify-content: space-around} -.flex-self-center {align-self:center} -.flex {display: -webkit-box;display: flex} +.grow-1 {-webkit-box-flex: 1;-ms-flex-positive: 1;flex-grow: 1} +.flex-wrap {-ms-flex-wrap: wrap;flex-wrap: wrap} +.flex-no-wrap {-ms-flex-wrap: nowrap;flex-wrap: nowrap} +.flex-align-end {-webkit-box-align: end;-ms-flex-align: end;align-items: flex-end} +.flex-align-space-around {-ms-flex-line-pack: distribute;align-content: space-around} +.flex-justify-space-around {-ms-flex-pack: distribute;justify-content: space-around} +.flex-self-center {-ms-flex-item-align:center;-ms-grid-row-align:center;align-self:center} +.flex {display: -webkit-box;display: -ms-flexbox;display: flex} .small-font { + font-size:25.6px; font-size:1.6rem; } @@ -102,15 +93,16 @@ a:hover, a:active { } .user-btn { - border-color: var(--edit-link-color); - color: var(--edit-link-color); - text-shadow: var(--link-shadow); + border-color:#12db18; + color:#12db18; + text-shadow:1px 1px 1px #000; padding:0 0.5em; + padding:0 8px; padding:0 0.5rem; } .user-btn:hover, .user-btn:active { - border-color: var(--edit-link-hover-color); - background-color: var(--edit-link-hover-color); + border-color:#db7d12; + background-color:#db7d12; } /* ----------------------------------------------------------------------------- @@ -140,7 +132,7 @@ a:hover, a:active { top: 0%; -webkit-animation: cssload-rotate-one 1.15s linear infinite; animation: cssload-rotate-one 1.15s linear infinite; - border-bottom: 3px solid rgb(0,0,0); + border-bottom: 3px solid rgb(0, 0, 0); } .cssload-inner.cssload-two { @@ -148,7 +140,7 @@ a:hover, a:active { top: 0%; -webkit-animation: cssload-rotate-two 1.15s linear infinite; animation: cssload-rotate-two 1.15s linear infinite; - border-right: 3px solid rgb(0,0,0); + border-right: 3px solid rgb(0, 0, 0); } .cssload-inner.cssload-three { @@ -156,7 +148,7 @@ a:hover, a:active { bottom: 0%; -webkit-animation: cssload-rotate-three 1.15s linear infinite; animation: cssload-rotate-three 1.15s linear infinite; - border-top: 3px solid rgb(0,0,0); + border-top: 3px solid rgb(0, 0, 0); } @-webkit-keyframes cssload-rotate-one { @@ -340,7 +332,7 @@ a:hover, a:active { text-align:center; width:220px; height:311px; - margin: var(--normal-padding); + margin:0.25em 0.125em; } .media .edit_buttons > button { @@ -351,10 +343,10 @@ a:hover, a:active { .media_metadata > div, .medium_metadata > div, .row { - text-shadow: var(--shadow); - background: var(--title-overlay); - color: var(--text-color); - padding: var(--normal-padding); + text-shadow:1px 2px 1px rgba(0, 0, 0, .85); + background:rgba(0, 0, 0, .45); + color:#ffffff; + padding:0.25em 0.125em; text-align:right; } @@ -384,15 +376,15 @@ a:hover, a:active { .media:hover > .medium_metadata > div, .media:hover > .table .row { - -webkit-transition: .25s ease; + -webkit-transition:.25s ease; transition: .25s ease; - background:rgba(0,0,0,0.75); + background:rgba(0, 0, 0, .75); } .media:hover > button[hidden], .media:hover > .edit_buttons[hidden] { - -webkit-transition: .25s ease; + -webkit-transition:.25s ease; transition: .25s ease; display:block; } @@ -400,7 +392,7 @@ a:hover, a:active { .media > .name > a { background:none; color:#fff; - text-shadow: var(--shadow); + text-shadow:1px 2px 1px rgba(0, 0, 0, .85); } @@ -435,11 +427,14 @@ a:hover, a:active { .anime .row, .manga .row { width:100%; - background: var(--title-overlay); + background:rgba(0, 0, 0, .45); display: -webkit-box; + display: -ms-flexbox; display: flex; - align-content: space-around; - justify-content: space-around; + -ms-flex-line-pack: distribute; + align-content: space-around; + -ms-flex-pack: distribute; + justify-content: space-around; text-align:center; padding:0 inherit; } @@ -451,7 +446,8 @@ a:hover, a:active { .anime .row > div, .manga .row > div { font-size:0.8em; display:flex-item; - align-self:center; + -ms-flex-item-align:center; + align-self:center; text-align:center; vertical-align:middle; } @@ -491,7 +487,7 @@ a:hover, a:active { ------------------------------------------------------------------------------*/ .media.search > .name { background-color:#555; - background-color: rgba(000,000,000,0.35); + background-color: rgba(0, 0, 0, .35); background-size: cover; background-size: contain; background-repeat: no-repeat; @@ -502,14 +498,15 @@ a:hover, a:active { } .big-check:checked + label { - -webkit-transition: .25s ease; + -webkit-transition:.25s ease; transition: .25s ease; - background:rgba(0,0,0,0.75); + background:rgba(0, 0, 0, .75); } .big-check:checked + label:after { content: '✓'; font-size: 15em; + font-size:240px; font-size: 15rem; text-align:center; color: greenyellow; @@ -536,8 +533,11 @@ a:hover, a:active { Details page styles -----------------------------------------------------------------------------*/ .details { + margin:24px auto 0 auto; margin: 1.5rem auto 0 auto; + max-width:1488px; max-width:93rem; + padding:16px; padding:1rem; font-size:inherit; } @@ -552,6 +552,7 @@ a:hover, a:active { } .details .flex > div { + margin:16px; margin: 1rem; } @@ -559,6 +560,7 @@ a:hover, a:active { max-width:300px; } .details td { + padding:0 24px; padding:0 1.5rem; } diff --git a/public/css/marx.css b/public/css/marx.css index 8e25ba1b..c4be9282 100644 --- a/public/css/marx.css +++ b/public/css/marx.css @@ -1,11 +1,10 @@ :root { - --default-font-list:'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif; -ms-text-size-adjust:100%; -webkit-text-size-adjust:100%; box-sizing:border-box; cursor:default; - font-family:var(--default-font-list); + font-family:'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif; line-height:1.4; overflow-y:scroll; text-size-adjust:100%; @@ -37,6 +36,7 @@ main display:block; margin:0 auto; padding:0 1.6em 1.6em; + padding:0 16px 16px; padding:0 1.6rem 1.6rem; } @@ -52,11 +52,14 @@ pre display:block; font-family:Menlo, Monaco, Consolas, 'Courier New', monospace; font-size:1.4em; + font-size:14px; font-size:1.4rem; margin:1.6em 0; + margin:16px 0; margin:1.6rem 0; overflow:auto; padding:1.6em; + padding:16px; padding:1.6rem; word-break:break-all; word-wrap:break-word; @@ -85,11 +88,14 @@ template textarea { + border:1px solid #ccc; border:.1rem solid #ccc; border-radius:0; display:block; + margin-bottom:8px; margin-bottom:.8rem; overflow:auto; + padding:8px; padding:.8rem; resize:vertical; vertical-align:middle; @@ -102,6 +108,8 @@ textarea [unselectable] { + -moz-user-select:none; + -ms-user-select:none; -webkit-user-select:none; user-select:none; } @@ -142,6 +150,7 @@ audio,canvas,iframe,img,svg,video button,input,select,textarea { + border:1px solid #ccc; border:.1rem solid #ccc; color:inherit; font-family:inherit; @@ -159,9 +168,16 @@ table { border-collapse:collapse; border-spacing:0; + margin-bottom:16px; margin-bottom:1.6rem; } +::-moz-selection +{ + background-color:#b3d4fc; + text-shadow:none; +} + ::selection { background-color:#b3d4fc; @@ -176,7 +192,8 @@ button::-moz-focus-inner body { color:#444; - font-family:var(--default-font-list); + font-family:'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif; + font-size:16px; font-size:1.6rem; font-style:normal; font-weight:400; @@ -185,20 +202,24 @@ body p { + margin:0 0 16px; margin:0 0 1.6rem; } h1,h2,h3,h4,h5,h6 { - font-family:Lato, var(--default-font-list); + font-family:Lato, 'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif; margin:2em 0 1.6em; + margin:20px 0 16px; margin:2rem 0 1.6rem; } h1 { - border-bottom:.1rem solid rgba(0,0,0,0.2); + border-bottom:1px solid rgba(0, 0, 0, .2); + border-bottom:.1rem solid rgba(0, 0, 0, .2); font-size:3.6em; + font-size:36px; font-size:3.6rem; font-style:normal; font-weight:500; @@ -207,6 +228,7 @@ h1 h2 { font-size:3em; + font-size:30px; font-size:3rem; font-style:normal; font-weight:500; @@ -215,27 +237,33 @@ h2 h3 { font-size:2.4em; + font-size:24px; font-size:2.4rem; font-style:normal; font-weight:500; + margin:16px 0 4px; margin:1.6rem 0 .4rem; } h4 { font-size:1.8em; + font-size:18px; font-size:1.8rem; font-style:normal; font-weight:600; + margin:16px 0 4px; margin:1.6rem 0 .4rem; } h5 { font-size:1.6em; + font-size:16px; font-size:1.6rem; font-style:normal; font-weight:600; + margin:16px 0 4px; margin:1.6rem 0 .4rem; } @@ -243,9 +271,11 @@ h6 { color:#777; font-size:1.4em; + font-size:14px; font-size:1.4rem; font-style:normal; font-weight:600; + margin:16px 0 4px; margin:1.6rem 0 .4rem; } @@ -254,6 +284,7 @@ code background:#efefef; color:#444; font-family:Menlo, Monaco, Consolas, 'Courier New', monospace; + font-size:14px; font-size:1.4rem; word-break:break-all; word-wrap:break-word; @@ -266,26 +297,33 @@ a:hover,a:focus dl { + margin-bottom:16px; margin-bottom:1.6rem; } dd { + margin-left:40px; margin-left:4rem; } ul,ol { + margin-bottom:8px; margin-bottom:.8rem; + padding-left:20px; padding-left:2rem; } blockquote { + border-left:2px solid #1271db; border-left:.2rem solid #1271db; font-family:Georgia, Times, 'Times New Roman', serif; font-style:italic; + margin:16px 0; margin:1.6rem 0; + padding-left:16px; padding-left:1.6rem; } @@ -309,19 +347,23 @@ main,header,footer,article,section,aside,details,summary footer { - border-top:.1rem solid rgba(0,0,0,0.2); + border-top:1px solid rgba(0, 0, 0, .2); + border-top:.1rem solid rgba(0, 0, 0, .2); clear:both; display:inline-block; float:left; max-width:100%; + padding:10px 0; padding:1rem 0; text-align:center; } hr { - border-top:.1rem solid rgba(0,0,0,0.2); + border-top:1px solid rgba(0, 0, 0, .2); + border-top:.1rem solid rgba(0, 0, 0, .2); display:block; + margin-bottom:16px; margin-bottom:1.6rem; width:100%; } @@ -335,9 +377,11 @@ img input[type=text],input[type=password],input[type=email],input[type=url],input[type=date],input[type=month],input[type=time],input[type=datetime],input[type=datetime-local],input[type=week],input[type=number],input[type=search],input[type=tel],input[type=color],select { + border:1px solid #ccc; border:.1rem solid #ccc; border-radius:0; display:inline-block; + padding:8px; padding:.8rem; vertical-align:middle; } @@ -347,16 +391,19 @@ input:not([type]) -webkit-appearance:none; background-clip:padding-box; background-color:#fff; + border:1px solid #ccc; border:.1rem solid #ccc; border-radius:0; color:#444; display:inline-block; + padding:8px; padding:.8rem; text-align:left; } input[type=color] { + padding:8px 16px; padding:.8rem 1.6rem; } @@ -377,6 +424,7 @@ input[type=radio],input[type=checkbox] input[type=file]:focus,input[type=radio]:focus,input[type=checkbox]:focus { + outline:1px solid thin #444; outline:.1rem solid thin #444; } @@ -415,6 +463,7 @@ input[type=file]:focus:invalid:focus,input[type=radio]:focus:invalid:focus,input select { background-color:#fff; + border:1px solid #ccc; border:.1rem solid #ccc; } @@ -432,15 +481,19 @@ fieldset { border:0; margin:0; + padding:8px 0; padding:.8rem 0; } legend { + border-bottom:1px solid #ccc; border-bottom:.1rem solid #ccc; color:#444; display:block; + margin-bottom:8px; margin-bottom:.8rem; + padding:8px 0; padding:.8rem 0; width:100%; } @@ -452,13 +505,17 @@ input[type=submit],button -webkit-transition:.25s ease; -webkit-user-drag:none; -webkit-user-select:none; + border:2px solid #444; border:.2rem solid #444; border-radius:0; color:#444; cursor:pointer; display:inline-block; + margin-bottom:8px; margin-bottom:.8rem; + margin-right:4px; margin-right:.4rem; + padding:8px 16px; padding:.8rem 1.6rem; text-align:center; text-decoration:none; @@ -525,8 +582,10 @@ nav ul li nav a { -webkit-transition:.25s ease; + border-bottom:2px solid transparent; border-bottom:.2rem solid transparent; color:#444; + padding:8px 16px; padding:.8rem 1.6rem; text-decoration:none; transition:.25s ease; @@ -534,16 +593,17 @@ nav a nav a:hover,nav li.selected a { - border-color:rgba(0,0,0,0.2); + border-color:rgba(0, 0, 0, .2); } nav a:active { - border-color:rgba(0,0,0,0.56); + border-color:rgba(0, 0, 0, .56); } caption { + padding:8px 0; padding:.8rem 0; } @@ -556,12 +616,15 @@ thead th tr { background:#fff; + margin-bottom:8px; margin-bottom:.8rem; } th,td { + border:1px solid #ccc; border:.1rem solid #ccc; + padding:8px 16px; padding:.8rem 1.6rem; text-align:center; vertical-align:inherit; @@ -575,8 +638,10 @@ tfoot tr tfoot td { color:#efefef; + font-size:8px; font-size:.8rem; font-style:italic; + padding:16px 4px; padding:1.6rem .4rem; } diff --git a/public/package.json b/public/package.json index 17f500c7..039b7384 100644 --- a/public/package.json +++ b/public/package.json @@ -1,11 +1,11 @@ { "scripts": { "build": "npm-run-all --parallel build:base build:marx", - "build:base": "postcss --use autoprefixer --autoprefixer.browsers \"> 5%\" -o css/base.css css/base.myth.css", - "build:marx": "postcss --use autoprefixer --autoprefixer.browsers \"> 5%\" -o css/marx.css css/marx.myth.css", + "build:base": "postcss --autoprefixer.browsers \"> 5%\" --use postcss-cssnext -o css/base.css css/base.myth.css", + "build:marx": "postcss --autoprefixer.browsers \"> 5%\" --use postcss-cssnext -o css/marx.css css/marx.myth.css", "watch": "npm-run-all --parallel watch:base watch:marx", - "watch:base": "postcss --use autoprefixer --autoprefixer.browsers \"> 5%\" -w -o css/base.css css/base.myth.css", - "watch:marx": "postcss --use autoprefixer --autoprefixer.browsers \"> 5%\" -w -o css/marx.css css/marx.myth.css" + "watch:base": "postcss --autoprefixer.browsers \"> 5%\" --use postcss-cssnext -w -o css/base.css css/base.myth.css", + "watch:marx": "postcss --autoprefixer.browsers \"> 5%\" --use postcss-cssnext -w -o css/marx.css css/marx.myth.css" }, "devDependencies": { "autoprefixer": "^6.6.1",