mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Trial Noto font, adjust primary tab sizing

Browse Source 
Noto appears to be much easier to read and is more consistent for other languages. Eg, on windows, sans-serif appears to change completely when mb characters are introduced.
This commit is contained in:
Samuel Georges 2016-04-11 04:59:59 +10:00
parent 04fc95bac3
commit b02f0c2230
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/backend/assets/css/october.css
View File

@ -1,4 +1,4 @@
@import "../vendor/jcrop/css/jquery.Jcrop.min.css";@import "../../../system/assets/vendor/prettify/prettify.css";@import "../../../system/assets/vendor/prettify/theme-desert.css";@-webkit-keyframes showSweetAlert{0%{transform:scale(0.7);-webkit-transform:scale(0.7)}
@import "../vendor/jcrop/css/jquery.Jcrop.min.css";@import "../../../system/assets/vendor/prettify/prettify.css";@import "../../../system/assets/vendor/prettify/theme-desert.css";@import url(https://fonts.googleapis.com/css?family=Noto+Sans:400,400italic,700,700italic);@-webkit-keyframes showSweetAlert{0%{transform:scale(0.7);-webkit-transform:scale(0.7)}
45%{transform:scale(1.05);-webkit-transform:scale(1.05)}
80%{transform:scale(0.95);-webkit-tranform:scale(0.95)}
100%{transform:scale(1);-webkit-transform:scale(1)}
@ -581,6 +581,7 @@ body.no-select{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:no
html,body{height:100%; }
body{webkit-font-smoothing:antialiased;font-family:sans-serif;background:#f9f9f9}
#layout-canvas{min-height:100%;height:100%}
body{font-family:'Noto Sans',sans-serif}
.control-tabs.primary-tabs > ul.nav-tabs,.control-tabs.primary-tabs > div > ul.nav-tabs,.control-tabs.primary-tabs > div > div > ul.nav-tabs{margin-left:-20px;margin-right:-20px}
.control-tabs.primary-tabs.tabs-no-inset > ul.nav-tabs,.control-tabs.primary-tabs.tabs-no-inset > div > ul.nav-tabs,.control-tabs.primary-tabs.tabs-no-inset > div > div > ul.nav-tabs{margin-left:0;margin-right:0}
.layout{display:table;table-layout:fixed;height:100%;width:100%}

10
modules/backend/assets/less/layout/layout.less
View File

@ -43,6 +43,16 @@ body {
height: 100%;
}
//
// Font
//
@import url(https://fonts.googleapis.com/css?family=Noto+Sans:400,400italic,700,700italic);
body {
font-family: 'Noto Sans', sans-serif;
}
//
// Tabs override for Layout
// Primary tabs should use inset by default, unless otherwise specified

4
modules/system/assets/ui/less/tab.less
View File

@ -265,7 +265,7 @@
background: transparent;
&:first-child {
padding-left: 35px !important;
padding-left: @padding-standard !important;
}
&:last-child {
@ -273,7 +273,7 @@
}
a {
font-size: 15px;
font-size: @font-size-base;
padding-bottom: 3px;
margin: 0;
position: relative;

4
modules/system/assets/ui/storm.css
View File

@ -1482,9 +1482,9 @@ to{background-position:0 0}
.control-tabs.primary > ul.nav-tabs,.control-tabs.primary-tabs > ul.nav-tabs,.control-tabs.primary > div > ul.nav-tabs,.control-tabs.primary-tabs > div > ul.nav-tabs,.control-tabs.primary > div > div > ul.nav-tabs,.control-tabs.primary-tabs > div > div > ul.nav-tabs{position:relative;margin-left:0;margin-right:0}
.control-tabs.primary > ul.nav-tabs:before,.control-tabs.primary-tabs > ul.nav-tabs:before,.control-tabs.primary > div > ul.nav-tabs:before,.control-tabs.primary-tabs > div > ul.nav-tabs:before,.control-tabs.primary > div > div > ul.nav-tabs:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs:before{position:absolute;bottom:0;height:1px;width:100%;z-index:95;content:' ';border-bottom:2px solid #dbe1e3}
.control-tabs.primary > ul.nav-tabs > li,.control-tabs.primary-tabs > ul.nav-tabs > li,.control-tabs.primary > div > ul.nav-tabs > li,.control-tabs.primary-tabs > div > ul.nav-tabs > li,.control-tabs.primary > div > div > ul.nav-tabs > li,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li{padding-right:0;padding-left:0;margin-left:0;margin-right:-20px;background:transparent}
.control-tabs.primary > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > ul.nav-tabs > li:first-child,.control-tabs.primary > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > ul.nav-tabs > li:first-child,.control-tabs.primary > div > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li:first-child{padding-left:35px !important}
.control-tabs.primary > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > ul.nav-tabs > li:first-child,.control-tabs.primary > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > ul.nav-tabs > li:first-child,.control-tabs.primary > div > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li:first-child{padding-left:20px !important}
.control-tabs.primary > ul.nav-tabs > li:last-child,.control-tabs.primary-tabs > ul.nav-tabs > li:last-child,.control-tabs.primary > div > ul.nav-tabs > li:last-child,.control-tabs.primary-tabs > div > ul.nav-tabs > li:last-child,.control-tabs.primary > div > div > ul.nav-tabs > li:last-child,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li:last-child{margin-right:0}
.control-tabs.primary > ul.nav-tabs > li a,.control-tabs.primary-tabs > ul.nav-tabs > li a,.control-tabs.primary > div > ul.nav-tabs > li a,.control-tabs.primary-tabs > div > ul.nav-tabs > li a,.control-tabs.primary > div > div > ul.nav-tabs > li a,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a{font-size:15px;padding-bottom:3px;margin:0;position:relative;z-index:101;background:transparent;overflow:visible}
.control-tabs.primary > ul.nav-tabs > li a,.control-tabs.primary-tabs > ul.nav-tabs > li a,.control-tabs.primary > div > ul.nav-tabs > li a,.control-tabs.primary-tabs > div > ul.nav-tabs > li a,.control-tabs.primary > div > div > ul.nav-tabs > li a,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a{font-size:14px;padding-bottom:3px;margin:0;position:relative;z-index:101;background:transparent;overflow:visible}
.control-tabs.primary > ul.nav-tabs > li a > span.title,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title,.control-tabs.primary > div > ul.nav-tabs > li a > span.title,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title{position:relative;display:inline-block;padding:4px 25px 0px 25px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;z-index:100}
.control-tabs.primary > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:after,.control-tabs.primary > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:after{content:'';display:block;border-top:2px solid #ecf0f1;position:absolute;background:#f9f9f9;top:0;z-index:-1;width:20px;bottom:-2px;transform-origin:bottom}
.control-tabs.primary > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:before{left:0;border-left:2px solid #ecf0f1;-webkit-border-radius:8px 0 0 0;-moz-border-radius:8px 0 0 0;border-radius:8px 0 0 0;-webkit-transform:skewX(-20deg);-ms-transform:skewX(-20deg);transform:skewX(-20deg)}