github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-05-04 02:24:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #278 from huytd/https-web-font

Browse Source 
Make Google Web Font work on both HTTP and HTTPS
This commit is contained in:
Toby Zerner 2015-08-28 12:50:12 +09:30
commit 5d3ea065a9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/core/less/lib/lib.less
View File

@ -1,4 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700,600); @import url(//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700,600);
@import "font-awesome.less"; @import "font-awesome.less";
@fa-font-path: "../../assets/fonts"; @fa-font-path: "../../assets/fonts";
@ -27,4 +27,3 @@
@import "Tooltip.less"; @import "Tooltip.less";
@import "variables.less"; @import "variables.less";

2
framework/core/views/install/app.blade.php
View File

@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
<style> <style>
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700,600); @import url(//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700,600);
body { body {
background: #fff; background: #fff;