Moved FontAwesome css into vendor folder & use cssrewrite filter for webassets
That fixes up the relative URLs to the font files and should make updates down the line a thing of a quick copy and paste (plus allow some more sophisticated dependency management down the road as well). Also renamed fonts folder for FontAwesome 3.2.1 from font to fonts, for more consistency.
This commit is contained in:
parent
d8d9c7fe64
commit
2d9ad41e49
12 changed files with 39 additions and 39 deletions
|
|
@ -1100,8 +1100,8 @@ class Server(object):
|
|||
"css/bootstrap-modal.css",
|
||||
"css/bootstrap-slider.css",
|
||||
"css/bootstrap-tabdrop.css",
|
||||
"css/font-awesome3.min.css",
|
||||
"css/font-awesome.min.css",
|
||||
"assets/vendor/font-awesome-3.2.1/css/font-awesome.min.css",
|
||||
"assets/vendor/font-awesome-4.7.0/css/font-awesome.min.css",
|
||||
"css/jquery.fileupload-ui.css",
|
||||
"css/pnotify.core.min.css",
|
||||
"css/pnotify.buttons.min.css",
|
||||
|
|
@ -1156,7 +1156,7 @@ class Server(object):
|
|||
js_app_bundle = Bundle(js_plugins_bundle, js_core_bundle, output="webassets/packed_app.js", filters="js_delimiter_bundler")
|
||||
|
||||
# CSS
|
||||
css_libs_bundle = Bundle(*css_libs, output="webassets/packed_libs.css")
|
||||
css_libs_bundle = Bundle(*css_libs, output="webassets/packed_libs.css", filters="cssrewrite")
|
||||
|
||||
if len(css_core) == 0:
|
||||
css_core_bundle = Bundle(*[])
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
* -------------------------- */
|
||||
@font-face {
|
||||
font-family: 'FontAwesome3';
|
||||
src: url('../assets/vendor/font-awesome-3.2.1/font/fontawesome-webfont.eot?v=3.2.1');
|
||||
src: url('../assets/vendor/font-awesome-3.2.1/font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../assets/vendor/font-awesome-3.2.1/font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../assets/vendor/font-awesome-3.2.1/font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../assets/vendor/font-awesome-3.2.1/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
|
||||
src: url('../fonts/fontawesome-webfont.eot?v=3.2.1');
|
||||
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../fonts/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
display: inline-block;
|
||||
speak: none;
|
||||
}
|
||||
/* makes the font 33% larger relative to the icon container */
|
||||
/* makes the fonts 33% larger relative to the icon container */
|
||||
.icon-large:before {
|
||||
vertical-align: -10%;
|
||||
font-size: 1.33333333em;
|
||||
|
|
@ -59,7 +59,7 @@ a [class^="icon-"],
|
|||
a [class*=" icon-"] {
|
||||
display: inline;
|
||||
}
|
||||
/* increased font size for icon-large */
|
||||
/* increased fonts size for icon-large */
|
||||
[class^="icon-"].icon-fixed-width,
|
||||
[class*=" icon-"].icon-fixed-width {
|
||||
display: inline-block;
|
||||
25
src/octoprint/static/assets/vendor/font-awesome-3.2.1/css/font-awesome.min.css
vendored
Normal file
25
src/octoprint/static/assets/vendor/font-awesome-3.2.1/css/font-awesome.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 193 KiB After Width: | Height: | Size: 193 KiB |
|
|
@ -6,8 +6,8 @@
|
|||
* -------------------------- */
|
||||
@font-face {
|
||||
font-family: 'FontAwesome';
|
||||
src: url('../assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.eot?v=4.7.0');
|
||||
src: url('../assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
|
||||
src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
|
||||
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
/* makes the font 33% larger relative to the icon container */
|
||||
/* makes the fonts 33% larger relative to the icon container */
|
||||
.fa-lg {
|
||||
font-size: 1.33333333em;
|
||||
line-height: 0.75em;
|
||||
4
src/octoprint/static/assets/vendor/font-awesome-4.7.0/css/font-awesome.min.css
vendored
Normal file
4
src/octoprint/static/assets/vendor/font-awesome-4.7.0/css/font-awesome.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
25
src/octoprint/static/css/font-awesome3.min.css
vendored
25
src/octoprint/static/css/font-awesome3.min.css
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue