mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #5371 from open-sausages/pulls/4.0/fix-icon-styles
Fix regression with font-icon styles
This commit is contained in:
Ingo Schommer
commit
12383c16e4
2
admin/client/dist/font/icon-reference.html
vendored
2
admin/client/dist/font/icon-reference.html
vendored
@ -6,7 +6,7 @@
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1">
|
||||
<title>Font Reference - SilverStripe</title>
|
||||
<link href="http://fonts.googleapis.com/css?family=Dosis:400,500,700" rel="stylesheet" type="text/css">
|
||||
<link rel="stylesheet" href="icon-styles.css">
|
||||
<link rel="stylesheet" href="styles.css">
|
||||
<style type="text/css">html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-family:inherit;font-size:100%;vertical-align:baseline}body{line-height:1;color:#000;background:#fff}ol,ul{list-style:none}table{border-collapse:separate;border-spacing:0;vertical-align:middle}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}a img{border:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{font-family:'Dosis','Tahoma',sans-serif}.container{margin:15px auto;width:80%}h1{margin:40px 0 20px;font-weight:700;font-size:38px;line-height:32px;color:#fb565e}h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercase;font-weight:500}.small{font-size:14px;color:#a5adb4;}.small a{color:#a5adb4;}.small a:hover{color:#fb565e}.glyphs.character-mapping{margin:0 0 20px 0;padding:20px 0 20px 30px;color:rgba(0,0,0,0.5);border:1px solid #d8e0e5;-webkit-border-radius:3px;border-radius:3px;}.glyphs.character-mapping li{margin:0 30px 20px 0;display:inline-block;width:90px}.glyphs.character-mapping .icon{margin:10px 0 10px 15px;padding:15px;position:relative;width:55px;height:55px;color:#162a36 !important;overflow:hidden;-webkit-border-radius:3px;border-radius:3px;font-size:32px;}.glyphs.character-mapping .icon svg{fill:#000}.glyphs.character-mapping input{margin:0;padding:5px 0;line-height:12px;font-size:12px;display:block;width:100%;border:1px solid #d8e0e5;-webkit-border-radius:5px;border-radius:5px;text-align:center;outline:0;}.glyphs.character-mapping input:focus{border:1px solid #fbde4a;-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}.glyphs.character-mapping input:hover{-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}.glyphs.css-mapping{margin:0 0 60px 0;padding:30px 0 20px 30px;color:rgba(0,0,0,0.5);border:1px solid #d8e0e5;-webkit-border-radius:3px;border-radius:3px;}.glyphs.css-mapping li{margin:0 30px 20px 0;padding:0;display:inline-block;overflow:hidden}.glyphs.css-mapping .icon{margin:0;margin-right:10px;padding:13px;height:50px;width:50px;color:#162a36 !important;overflow:hidden;float:left;font-size:24px}.glyphs.css-mapping input{margin:0;margin-top:5px;padding:8px;line-height:16px;font-size:16px;display:block;width:150px;height:40px;border:1px solid #d8e0e5;-webkit-border-radius:5px;border-radius:5px;background:#fff;outline:0;float:right;}.glyphs.css-mapping input:focus{border:1px solid #fbde4a;-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}.glyphs.css-mapping input:hover{-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
6
admin/client/dist/styles/bundle.css
vendored
6
admin/client/dist/styles/bundle.css
vendored
File diff suppressed because one or more lines are too long
222
admin/client/src/styles/_fonts.scss
Normal file
222
admin/client/src/styles/_fonts.scss
Normal file
@ -0,0 +1,222 @@
|
||||
@charset "UTF-8";
|
||||
|
||||
@font-face {
|
||||
font-family: "silverstripe";
|
||||
src:url("../../dist/font/fonts/silverstripe.eot");
|
||||
src:url("../../dist/font/fonts/silverstripe.eot?#iefix") format("embedded-opentype"),
|
||||
url("../../dist/font/fonts/silverstripe.woff") format("woff"),
|
||||
url("../../dist/font/fonts/silverstripe.ttf") format("truetype"),
|
||||
url("../../dist/font/fonts/silverstripe.svg#silverstripe") format("svg");
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
|
||||
}
|
||||
|
||||
[class^="font-icon-"]:before,
|
||||
[class*=" font-icon-"]:before {
|
||||
font-family: "silverstripe" !important;
|
||||
font-style: normal !important;
|
||||
font-weight: normal !important;
|
||||
font-variant: normal !important;
|
||||
text-transform: none !important;
|
||||
speak: none;
|
||||
line-height: 1;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
.font-icon-search:before {
|
||||
content: "\73";
|
||||
}
|
||||
.font-icon-sync:before {
|
||||
content: "\63";
|
||||
}
|
||||
.font-icon-print:before {
|
||||
content: "\64";
|
||||
}
|
||||
.font-icon-list:before {
|
||||
content: "\65";
|
||||
}
|
||||
.font-icon-plus-circled:before {
|
||||
content: "\66";
|
||||
}
|
||||
.font-icon-check-mark-2:before {
|
||||
content: "\6b";
|
||||
}
|
||||
.font-icon-book:before {
|
||||
content: "\6e";
|
||||
}
|
||||
.font-icon-book-open:before {
|
||||
content: "\6f";
|
||||
}
|
||||
.font-icon-plus:before {
|
||||
content: "\6a";
|
||||
}
|
||||
.font-icon-tree:before {
|
||||
content: "\70";
|
||||
}
|
||||
.font-icon-flow-tree:before {
|
||||
content: "\71";
|
||||
}
|
||||
.font-icon-info-circled:before {
|
||||
content: "\79";
|
||||
}
|
||||
.font-icon-chart-line:before {
|
||||
content: "\42";
|
||||
}
|
||||
.font-icon-graph-bar:before {
|
||||
content: "\45";
|
||||
}
|
||||
.font-icon-torsos-all:before {
|
||||
content: "\46";
|
||||
}
|
||||
.font-icon-torso:before {
|
||||
content: "\48";
|
||||
}
|
||||
.font-icon-picture:before {
|
||||
content: "\76";
|
||||
}
|
||||
.font-icon-chart-pie:before {
|
||||
content: "\41";
|
||||
}
|
||||
.font-icon-sitemap:before {
|
||||
content: "\43";
|
||||
}
|
||||
.font-icon-globe-1:before {
|
||||
content: "\52";
|
||||
}
|
||||
.font-icon-chat:before {
|
||||
content: "\74";
|
||||
}
|
||||
.font-icon-comment:before {
|
||||
content: "\77";
|
||||
}
|
||||
.font-icon-logout:before {
|
||||
content: "\7a";
|
||||
}
|
||||
.font-icon-cancel-circled:before {
|
||||
content: "\51";
|
||||
}
|
||||
.font-icon-left-open:before {
|
||||
content: "\54";
|
||||
}
|
||||
.font-icon-right-open:before {
|
||||
content: "\55";
|
||||
}
|
||||
.font-icon-check-mark:before {
|
||||
content: "\47";
|
||||
}
|
||||
.font-icon-check-mark-circle:before {
|
||||
content: "\49";
|
||||
}
|
||||
.font-icon-back-in-time:before {
|
||||
content: "\58";
|
||||
}
|
||||
.font-icon-cog:before {
|
||||
content: "\59";
|
||||
}
|
||||
.font-icon-fast-forward:before {
|
||||
content: "\68";
|
||||
}
|
||||
.font-icon-install:before {
|
||||
content: "\61";
|
||||
}
|
||||
.font-icon-down-circled:before {
|
||||
content: "\69";
|
||||
}
|
||||
.font-icon-eye:before {
|
||||
content: "\6c";
|
||||
}
|
||||
.font-icon-columns:before {
|
||||
content: "\72";
|
||||
}
|
||||
.font-icon-edit-write:before {
|
||||
content: "\75";
|
||||
}
|
||||
.font-icon-monitor:before {
|
||||
content: "\78";
|
||||
}
|
||||
.font-icon-mobile:before {
|
||||
content: "\4a";
|
||||
}
|
||||
.font-icon-tablet:before {
|
||||
content: "\4b";
|
||||
}
|
||||
.font-icon-resize:before {
|
||||
content: "\4c";
|
||||
}
|
||||
.font-icon-pencil:before {
|
||||
content: "\6d";
|
||||
}
|
||||
.font-icon-trash:before {
|
||||
content: "\67";
|
||||
}
|
||||
.font-icon-edit:before {
|
||||
content: "\4e";
|
||||
}
|
||||
.font-icon-tick:before {
|
||||
content: "\4f";
|
||||
}
|
||||
.font-icon-upload:before {
|
||||
content: "\62";
|
||||
}
|
||||
.font-icon-folder-add:before {
|
||||
content: "\53";
|
||||
}
|
||||
.font-icon-silverstripe:before {
|
||||
content: "\4d";
|
||||
}
|
||||
.font-icon-thumbnails:before {
|
||||
content: "\57";
|
||||
}
|
||||
.font-icon-down-open:before {
|
||||
content: "\30";
|
||||
}
|
||||
.font-icon-up-open:before {
|
||||
content: "\31";
|
||||
}
|
||||
.font-icon-link:before {
|
||||
content: "\32";
|
||||
}
|
||||
.font-icon-level-up:before {
|
||||
content: "\56";
|
||||
}
|
||||
.font-icon-image:before {
|
||||
content: "\34";
|
||||
}
|
||||
.font-icon-trash-bin:before {
|
||||
content: "\50";
|
||||
}
|
||||
.font-icon-code:before {
|
||||
content: "\33";
|
||||
}
|
||||
.font-icon-left-open-big:before {
|
||||
content: "\35";
|
||||
}
|
||||
.font-icon-down-open-big:before {
|
||||
content: "\36";
|
||||
}
|
||||
.font-icon-up-open-big:before {
|
||||
content: "\37";
|
||||
}
|
||||
.font-icon-right-open-big:before {
|
||||
content: "\38";
|
||||
}
|
||||
.font-icon-dot-3:before {
|
||||
content: "\39";
|
||||
}
|
||||
.font-icon-save:before {
|
||||
content: "\21";
|
||||
}
|
||||
.font-icon-rocket:before {
|
||||
content: "\5a";
|
||||
}
|
||||
.font-icon-cancel:before {
|
||||
content: "\44";
|
||||
}
|
||||
.font-icon-happy:before {
|
||||
content: "\22";
|
||||
}
|
||||
.font-icon-sad:before {
|
||||
content: "\23";
|
||||
}
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
// Base
|
||||
@import "typography";
|
||||
@import "../../dist/font/icon-styles.css";
|
||||
@import "fonts";
|
||||
|
||||
// Legacy
|
||||
@import "legacy/sprity";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user