Skip to content
This repository was archived by the owner on Feb 1, 2018. It is now read-only.

#23: moved font import from main.css to index.html #31

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#23: moved font import from main.css to index.html #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66ac475
Reorganized index.html declarations
StanleySathler Jul 27, 2017
cab1aa6
#23 Moved font import from main.css to index.html
StanleySathler Jul 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,24 @@
<meta name="viewport" content="width=device-width">
<base href="/">
<title>Documentation</title>

<!-- Vendor -->
<link rel="stylesheet" type="text/css" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="/bower_components/bootstrap/dist/css/bootstrap-theme.min.css">
<!-- Flatdoc theme -->
<link href="/bower_components/flatdoc/theme-white/style.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="/bower_components/flatdoc/theme-white/style.css">
<link rel="stylesheet" type="text/css" href="/bower_components/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="/bower_components/google-code-prettify/bin/prettify.min.css">

<!-- Font -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700">

<!-- DocBase -->
<link rel="stylesheet" type="text/css" href="styles/main.css">
<link rel="stylesheet" type="text/css" href="styles/docs.css">
<script src="/bower_components/google-code-prettify/bin/prettify.min.js"></script>
<link rel="stylesheet" type="text/css" href="/bower_components/google-code-prettify/bin/prettify.min.css">
<link rel="stylesheet" type="text/css" href="/bower_components/font-awesome/css/font-awesome.min.css">

</head>
<body role="flatdoc">
<div ng-view></div>
<script src="/bower_components/google-code-prettify/bin/prettify.min.js"></script>
<script type="text/javascript" src='./docbase-config.js'></script>
<script type="text/javascript" src="/dist/main.unique.js"></script>
</body>
Expand Down
2 changes: 0 additions & 2 deletions styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700");

/**
*
* DocBase styling
Expand Down