mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
Move the font css
This commit is contained in:
parent
3e28c3cc1c
commit
48eed51c04
6 changed files with 13 additions and 54 deletions
|
|
@ -80,7 +80,8 @@ module.exports = function (grunt) {
|
|||
files: [
|
||||
'<%= yeoman.app %>/app/**/*.css',
|
||||
'<%= yeoman.app %>/components/**/*.css',
|
||||
'<%= yeoman.app %>/assets/styles/**/*.css'
|
||||
'<%= yeoman.app %>/assets/styles/**/*.css',
|
||||
'<%= yeoman.app %>/fonts/**/*.css'
|
||||
],
|
||||
tasks: ['newer:copy:styles', 'autoprefixer']
|
||||
},
|
||||
|
|
@ -310,9 +311,14 @@ module.exports = function (grunt) {
|
|||
'*.html',
|
||||
'assets/styles/**/*',
|
||||
'assets/images/**/*',
|
||||
'WEB-INF/*',
|
||||
'fonts/*'
|
||||
'WEB-INF/*'
|
||||
]
|
||||
}, {
|
||||
// copy fonts
|
||||
expand : true,
|
||||
cwd: '<%= yeoman.app %>',
|
||||
dest: '<%= yeoman.dist %>',
|
||||
src: ['fonts/**/*.{eot,svg,ttf,woff}']
|
||||
}, {
|
||||
expand : true,
|
||||
cwd: '<%= yeoman.app %>',
|
||||
|
|
@ -340,7 +346,7 @@ module.exports = function (grunt) {
|
|||
flatten: true,
|
||||
cwd: '<%= yeoman.app %>',
|
||||
dest: '.tmp/styles/',
|
||||
src: '{app, components}/**/*.css'
|
||||
src: '{fonts,components,app}/**/*.css'
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
/*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
/** concept from http://www.google.com/design/spec/style/typography.html#typography-standard-styles */
|
||||
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
font-family: 'RobotoDraft', sans-serif;
|
||||
color: black;
|
||||
text-rendering: optimizeLegibility;
|
||||
}
|
||||
h1 {
|
||||
font-size: 2.25em;
|
||||
}
|
||||
h2 {
|
||||
font-size: 2em;
|
||||
}
|
||||
h3 {
|
||||
font-size: 1.75em;
|
||||
}
|
||||
h4 {
|
||||
font-size: 1.5em;
|
||||
}
|
||||
h5 {
|
||||
font-size: 1.25em;
|
||||
}
|
||||
h6 {
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
.btnText {
|
||||
text-transform: uppercase;
|
||||
font-size: 12px;
|
||||
text-decoration: none!important;
|
||||
}
|
||||
|
|
@ -39,14 +39,13 @@ limitations under the License.
|
|||
<link rel="stylesheet" href="bower_components/jquery-ui/themes/base/all.css" />
|
||||
<!-- endbuild -->
|
||||
<!-- build:css(.tmp) styles/main.css -->
|
||||
<link href='https://fonts.googleapis.com/css?family=RobotoDraft:400,500,700,400italic' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="app/home/home.css">
|
||||
<link rel="stylesheet" href="app/typography.css">
|
||||
<link rel="stylesheet" href="app/notebook/notebook.css">
|
||||
<link rel="stylesheet" href="app/interpreter/interpreter.css">
|
||||
<link rel="stylesheet" href="app/font-awesome.min.css">
|
||||
<link rel="stylesheet" href="app/simple-line-icons.css">
|
||||
<link rel="stylesheet" href="app/custom-font.css">
|
||||
<link rel="stylesheet" href="fonts/font-awesome.min.css">
|
||||
<link rel="stylesheet" href="fonts/simple-line-icons.css">
|
||||
<link rel="stylesheet" href="fonts/custom-font.css">
|
||||
<!-- endbuild -->
|
||||
<link rel="stylesheet" ng-href="assets/styles/looknfeel/{{looknfeel}}.css">
|
||||
</head>
|
||||
|
|
|
|||
Loading…
Reference in a new issue