From a5687fe03bbda1cc98fa1abe0c350348edbf960f Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 30 Nov 2014 15:27:36 +0100 Subject: [PATCH] Adjust font sizes. --- src/_h5ai/client/css/inc/content.less | 1 - src/_h5ai/client/css/inc/context-menu.less | 1 - src/_h5ai/client/css/inc/fallback.less | 4 +- src/_h5ai/client/css/inc/fonts.less | 56 -------------------- src/_h5ai/client/css/inc/general.less | 7 +-- src/_h5ai/client/css/inc/h5ai-info.less | 7 +-- src/_h5ai/client/css/inc/preview-txt.less | 61 +--------------------- src/_h5ai/client/css/inc/sidebar.less | 2 +- src/_h5ai/client/css/inc/topbar.less | 2 + src/_h5ai/client/css/inc/view.less | 3 -- src/_h5ai/index.html.jade | 40 +++++++------- 11 files changed, 32 insertions(+), 152 deletions(-) delete mode 100644 src/_h5ai/client/css/inc/fonts.less diff --git a/src/_h5ai/client/css/inc/content.less b/src/_h5ai/client/css/inc/content.less index c4db0ac0..cd9791a8 100644 --- a/src/_h5ai/client/css/inc/content.less +++ b/src/_h5ai/client/css/inc/content.less @@ -1,6 +1,5 @@ #content { - font-size: 15px; overflow: auto; flex: 1 1 auto; order: 50; diff --git a/src/_h5ai/client/css/inc/context-menu.less b/src/_h5ai/client/css/inc/context-menu.less index 4b9d33e3..e38849e8 100644 --- a/src/_h5ai/client/css/inc/context-menu.less +++ b/src/_h5ai/client/css/inc/context-menu.less @@ -9,7 +9,6 @@ border: @border-widget; color: #999; z-index: 10; - font-size: 0.9em; ul { margin: 0; diff --git a/src/_h5ai/client/css/inc/fallback.less b/src/_h5ai/client/css/inc/fallback.less index 48d29d2d..7895da58 100644 --- a/src/_h5ai/client/css/inc/fallback.less +++ b/src/_h5ai/client/css/inc/fallback.less @@ -2,7 +2,8 @@ #fallback { display: none; max-width: 960px; - margin: 32px auto 64px; + margin: 0 auto 32px; + padding: 32px 16px; table { display: block; @@ -24,7 +25,6 @@ border-bottom: 1px solid @col-border; overflow: hidden; white-space: nowrap; - font-size: 15px; a, a:active, a:visited { display: block; diff --git a/src/_h5ai/client/css/inc/fonts.less b/src/_h5ai/client/css/inc/fonts.less deleted file mode 100644 index d0fa84f5..00000000 --- a/src/_h5ai/client/css/inc/fonts.less +++ /dev/null @@ -1,56 +0,0 @@ - -@font-face { - font-family: 'Ubuntu'; - font-style: normal; - font-weight: 300; - src: local('Ubuntu Light'), local('Ubuntu-Light'), url(fonts/Ubuntu-L.woff) format('woff'); -} - -@font-face { - font-family: 'Ubuntu'; - font-style: normal; - font-weight: 700; - src: local('Ubuntu Bold'), local('Ubuntu-Bold'), url(fonts/Ubuntu-B.woff) format('woff'); -} - -@font-face { - font-family: 'Ubuntu'; - font-style: italic; - font-weight: 300; - src: local('Ubuntu Light Italic'), local('Ubuntu-LightItalic'), url(fonts/Ubuntu-LI.woff) format('woff'); -} - -@font-face { - font-family: 'Ubuntu'; - font-style: italic; - font-weight: 700; - src: local('Ubuntu Bold Italic'), local('Ubuntu-BoldItalic'), url(fonts/Ubuntu-BI.woff) format('woff'); -} - -@font-face { - font-family: 'Ubuntu Mono'; - font-style: normal; - font-weight: 400; - src: local('Ubuntu Mono'), local('UbuntuMono-Regular'), url(fonts/UbuntuMono-R.woff) format('woff'); -} - -@font-face { - font-family: 'Ubuntu Mono'; - font-style: normal; - font-weight: 700; - src: local('Ubuntu Mono Bold'), local('UbuntuMono-Bold'), url(fonts/UbuntuMono-B.woff) format('woff'); -} - -@font-face { - font-family: 'Ubuntu Mono'; - font-style: italic; - font-weight: 400; - src: local('Ubuntu Mono Italic'), local('UbuntuMono-Italic'), url(fonts/UbuntuMono-RI.woff) format('woff'); -} - -@font-face { - font-family: 'Ubuntu Mono'; - font-style: italic; - font-weight: 700; - src: local('Ubuntu Mono Bold Italic'), local('UbuntuMono-BoldItalic'), url(fonts/Ubuntu-BI.woff) format('woff'); -} diff --git a/src/_h5ai/client/css/inc/general.less b/src/_h5ai/client/css/inc/general.less index 8ada5367..95aec630 100644 --- a/src/_h5ai/client/css/inc/general.less +++ b/src/_h5ai/client/css/inc/general.less @@ -27,8 +27,9 @@ @border-widget: 1px solid @col-border; @border-widget-sep: 1px solid @col-widget-sep; -@font-family: Roboto, Ubuntu, Helvetica, Arial, sans-serif; -@font-weight: 400; +@font-family: Roboto, Helvetica, Arial, sans-serif; +@font-weight: normal; +@font-size: 13px; @font-family-mono: monospace; @@ -67,7 +68,7 @@ body { bottom: 0; font-family: @font-family; - font-size: 13px; + font-size: @font-size; font-weight: @font-weight; color: @col; background: @col-back; diff --git a/src/_h5ai/client/css/inc/h5ai-info.less b/src/_h5ai/client/css/inc/h5ai-info.less index 496d2121..2ad595b0 100644 --- a/src/_h5ai/client/css/inc/h5ai-info.less +++ b/src/_h5ai/client/css/inc/h5ai-info.less @@ -1,8 +1,7 @@ body#h5ai-info { - font-family: @font-family; margin: 2em auto 4em auto; - font-size: 20px; + // font-size: 20px; color: @col; max-width: 600px; text-align: center; @@ -39,7 +38,6 @@ body#h5ai-info { margin: 12px auto 24px auto; padding: 6px 18px; width: 164px; - font-size: 12px; background: @col-widget-back; border: @border-widget; border-radius: 4px; @@ -94,7 +92,6 @@ body#h5ai-info { margin: 12px auto; width: 360px; color: @col; - font-size: 12px; } @@ -142,6 +139,6 @@ body#h5ai-info { #bottombar { - font-size: 13px; + } } diff --git a/src/_h5ai/client/css/inc/preview-txt.less b/src/_h5ai/client/css/inc/preview-txt.less index 07ef0853..7d4ba852 100644 --- a/src/_h5ai/client/css/inc/preview-txt.less +++ b/src/_h5ai/client/css/inc/preview-txt.less @@ -10,11 +10,10 @@ box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.3); &.highlighted { - // word-break: break-all; code { font-family: @font-family-mono; - font-size: 16px; + font-size: @font-size; line-height: 1.2em; } @@ -91,67 +90,11 @@ .token.entity { cursor: help; } - - // pre.line-numbers { - // position: relative; - // padding-left: 3.8em; - // counter-reset: linenumber; - // } - // pre.line-numbers > code { - // position: relative; - // } - // .line-numbers .line-numbers-rows { - // position: absolute; - // pointer-events: none; - // top: 0; - // font-size: 100%; - // left: -3.8em; - // width: 3em; /* works for line-numbers below 1000 lines */ - // letter-spacing: -1px; - // border-right: 1px solid #999; - - // -webkit-user-select: none; - // -moz-user-select: none; - // -ms-user-select: none; - // user-select: none; - - // } - // .line-numbers-rows > span { - // pointer-events: none; - // display: block; - // counter-increment: linenumber; - // } - // .line-numbers-rows > span:before { - // content: counter(linenumber); - // color: #999; - // display: block; - // padding-right: 0.8em; - // text-align: right; - // } - - // .token.tab:not(:empty):before, - // .token.cr:before, - // .token.lf:before { - // color: hsl(24, 20%, 85%); - // } - // .token.tab:not(:empty):before { - // content: '▸'; - // } - // .token.cr:before { - // content: '␍'; - // } - // .token.lf:before { - // // content: '␊'; - // content: '¶'; - // } - // .token a { - // color: inherit; - // } } &.markdown { - font-size: 16px; + font-size: 1.1em; padding: 8px 24px; a, a:active, a:visited { diff --git a/src/_h5ai/client/css/inc/sidebar.less b/src/_h5ai/client/css/inc/sidebar.less index 0f725c9c..9a6fc721 100644 --- a/src/_h5ai/client/css/inc/sidebar.less +++ b/src/_h5ai/client/css/inc/sidebar.less @@ -70,7 +70,7 @@ -ms-appearance: none; -webkit-appearance: none; font-family: @font-family; - font-size: 13px; + font-size: @font-size; font-weight: @font-weight; color: @col; background: @col-widget-back; diff --git a/src/_h5ai/client/css/inc/topbar.less b/src/_h5ai/client/css/inc/topbar.less index 110dc119..710e371a 100644 --- a/src/_h5ai/client/css/inc/topbar.less +++ b/src/_h5ai/client/css/inc/topbar.less @@ -7,6 +7,8 @@ background-color: @col-widget-back; border-bottom: @border-widget; font-weight: lighter; + // box-shadow: 0 0 3px 0 rgba(0,0,0,0.3); + // z-index: 1; } diff --git a/src/_h5ai/client/css/inc/view.less b/src/_h5ai/client/css/inc/view.less index b295d278..b3707226 100644 --- a/src/_h5ai/client/css/inc/view.less +++ b/src/_h5ai/client/css/inc/view.less @@ -44,7 +44,6 @@ &.header { display: none; - font-size: 13px; background: #fafafa; a, a:active, a:visited { @@ -75,8 +74,6 @@ } &.item { - // font-size: 15px; - font-size: 13px; a, a:active, a:visited { display: block; diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade index 78b1a566..8259a35d 100644 --- a/src/_h5ai/index.html.jade +++ b/src/_h5ai/index.html.jade @@ -14,28 +14,26 @@ head body#h5ai-info - h1 - a( href="#{pkg.homepage}" ) #{pkg.name} + div#main-row + h1 + a( href="#{pkg.homepage}" ) #{pkg.name} - div#support - | show your love and support for h5ai with a small donation - div.paypal - form( action="https://www.paypal.com/cgi-bin/webscr", method="post", target="_top" ) - input( type="hidden", name="cmd", value="_s-xclick" ) - input( type="hidden", name="hosted_button_id", value="8WSPKWT7YBTSQ" ) - input( type="image", src="client/images/paypal.png", border="0", name="submit", alt="PayPal - The safer, easier way to pay online!" ) + div#support + | show your love and support for h5ai with a small donation + div.paypal + form( action="https://www.paypal.com/cgi-bin/webscr", method="post", target="_top" ) + input( type="hidden", name="cmd", value="_s-xclick" ) + input( type="hidden", name="hosted_button_id", value="8WSPKWT7YBTSQ" ) + input( type="image", src="client/images/paypal.png", border="0", name="submit", alt="PayPal - The safer, easier way to pay online!" ) - div#bottombar.clearfix - span.left - span.noJsMsg - | ⚡ JavaScript disabled! ⚡ - span.noBrowserMsg - | ⚡ Works best in - a( href="http://browsehappy.com" ) modern browsers - | ! ⚡ - span.right - a( href="#{pkg.homepage}", title="#{pkg.name} #{pkg.version} · #{pkg.description}" ) - | powered by #{pkg.name} #{pkg.version} - span.center + div#bottombar + span.noJsMsg + | JavaScript disabled! + span.noBrowserMsg + | Works best in + a( href="http://browsehappy.com" ) modern browsers + | ! + a( href="#{pkg.homepage}", title="#{pkg.name} #{pkg.version} · #{pkg.description}" ) + | powered by #{pkg.name} #{pkg.version}