From 82dfcb6bdd8b3efc5dd5ce65b1074ab02ce60b12 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 4 Jul 2016 16:34:29 +0200 Subject: [PATCH] apply some style fixes --- customize.dist/main.css | 40 ++++++++++++-------------------- customize.dist/src/cryptpad.less | 38 +++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/customize.dist/main.css b/customize.dist/main.css index cd397d569..f12a1bfd6 100644 --- a/customize.dist/main.css +++ b/customize.dist/main.css @@ -1,23 +1,9 @@ -@font-face { - font-family: lato; - src: url('/customize/fonts/lato/Lato-Regular.ttf') format('truetype'); - font-weight: 400; - font-style: normal; -} -@font-face { - font-family: lato; - src: url('/customize/fonts/lato/Lato-Black.ttf') format('truetype'); - font-weight: 700; - font-style: normal; -} -@font-face { - font-family: lato; - src: url('/customize/fonts/lato/Lato-Italic.ttf') format('truetype'); - font-weight: 400; - font-style: italic; -} +/* + Apparently Chrome fails to render fonts half the time, so we just have to drop + lato for now :( +*/ .lato { - font-family: lato, sans-serif; + font-family: lato, Helvetica, sans-serif; font-size: 1.02em; } html { @@ -90,18 +76,19 @@ a { color: #46E981; text-decoration: none; } +a:hover { + color: #a1f4bf; +} img { height: auto; max-width: 100%; } img.cryptofist { filter: invert(100%); + -webkit-filter: invert(100%); } p { padding-top: .66001rem; - -webkit-font-feature-settings: 'kern' 1, 'onum' 1, 'liga' 1; - -moz-font-feature-settings: 'kern' 1, 'onum' 1, 'liga' 1; - font-feature-settings: 'kern' 1, 'onum' 1, 'liga' 1; margin-top: 0; } p, @@ -114,7 +101,7 @@ td, a, table, tr { - font-family: lato, sans-serif; + font-family: lato, Helvetica, sans-serif; font-size: 1.02em; } #main { @@ -125,7 +112,7 @@ tr { } /* buttons */ .create { - border: 1px solid #46E981; + border: 2px solid #46E981; border-radius: 10px; background-color: #302B28; color: #46E981; @@ -134,6 +121,10 @@ tr { margin-right: 5px; margin-left: 5px; } +.create:hover { + border: 2px solid #a1f4bf; + color: #46E981; +} .buttons { margin-bottom: 50px; margin-top: 20px; @@ -203,7 +194,6 @@ tbody td:last-child { border-top: 1px solid #444; } .bottom-bar a { - color: #27b000; color: #46E981; text-decoration: none; } diff --git a/customize.dist/src/cryptpad.less b/customize.dist/src/cryptpad.less index 8b0794e29..229aff402 100644 --- a/customize.dist/src/cryptpad.less +++ b/customize.dist/src/cryptpad.less @@ -1,7 +1,10 @@ @base: #302B28; +@light-base: lighten(@base, 20%); @fore: #fafafa; @cp-green: #46E981; +@cp-accent: lighten(@cp-green, 20%); + @cp-red: #FF0073; // remove red @cp-outline: #444; @@ -14,12 +17,16 @@ } } -.fontface(lato, '/customize/fonts/lato/Lato-Regular.ttf', normal, 400); -.fontface(lato, '/customize/fonts/lato/Lato-Black.ttf', normal, 700); -.fontface(lato, '/customize/fonts/lato/Lato-Italic.ttf', italic, 400); +/* + Apparently Chrome fails to render fonts half the time, so we just have to drop + lato for now :( +*/ +//.fontface(lato, '/customize/fonts/lato/Lato-Regular.ttf', normal, 400); +//.fontface(lato, '/customize/fonts/lato/Lato-Black.ttf', normal, 700); +//.fontface(lato, '/customize/fonts/lato/Lato-Italic.ttf', italic, 400); .lato { - font-family: lato, sans-serif; + font-family: lato, Helvetica, sans-serif; font-size: 1.02em; } @@ -97,6 +104,10 @@ a { cursor: pointer; color: @cp-green; text-decoration: none; + + &:hover { + color: @cp-accent; + } } img { @@ -105,14 +116,15 @@ img { &.cryptofist { filter: invert(100%); + -webkit-filter: invert(100%); } } p { padding-top: .66001rem; - -webkit-font-feature-settings: 'kern' 1,'onum' 1,'liga' 1; - -moz-font-feature-settings: 'kern' 1,'onum' 1,'liga' 1; - font-feature-settings: 'kern' 1,'onum' 1,'liga' 1; + //-webkit-font-feature-settings: 'kern' 1,'onum' 1,'liga' 1; + //-moz-font-feature-settings: 'kern' 1,'onum' 1,'liga' 1; + //font-feature-settings: 'kern' 1,'onum' 1,'liga' 1; margin-top: 0; } @@ -122,6 +134,7 @@ p,pre { p, pre, td, a, table, tr { .lato; + //color: @fore; } #main { @@ -134,7 +147,8 @@ p, pre, td, a, table, tr { /* buttons */ .create { - border: 1px solid @cp-green; + @thick: 2px; + border: @thick solid @cp-green; border-radius: 10px; background-color: @base; color: @cp-green; @@ -143,6 +157,10 @@ p, pre, td, a, table, tr { font-size: large; margin-right: 5px; margin-left: 5px; + &:hover { + border: @thick solid @cp-accent; + color: @cp-green; + } } .buttons { margin-bottom: 50px; @@ -175,7 +193,7 @@ tbody { text-decoration: underline; } &:nth-child(odd) { - background-color: lighten(@base, 20%); //darken(@base, 20%); + background-color: @light-base; } th:first-of-type { border-left: 0px; @@ -222,7 +240,6 @@ tbody { border-top: 1px solid @cp-outline; a { - color: rgb(39, 176, 0); color: @cp-green; text-decoration: none; } @@ -234,7 +251,6 @@ tbody { display:block; float:left; padding-top:3px; - //color: rgb(39, 176, 0); color: @fore; } img {