paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 19:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move thirdparty-fonts.css from static/styles to static/third.

Browse Source
This commit is contained in:
adnrs96
2017-03-19 04:52:09 +05:30
committed by Tim Abbott
parent 17597e2ddf
commit a91012bd70
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/THIRDPARTY
View File

@@ -86,7 +86,7 @@ Files: static/audio/zulip.*
Copyright: 2011 Vidsyn Copyright: 2011 Vidsyn
License: CC-0-1.0 License: CC-0-1.0
Files: static/styles/thirdparty-fonts.css Files: static/third/thirdparty-fonts.css
Copyright: 2012-2013 Dave Gandy Copyright: 2012-2013 Dave Gandy
License: Expat License: Expat

2
docs/html_css.md
View File

@@ -17,7 +17,7 @@ The CSS files are:
* `pygments.css` - CSS for Python syntax highlighting * `pygments.css` - CSS for Python syntax highlighting
* `activity.css` - CSS for the `activity` app * `activity.css` - CSS for the `activity` app
* `fonts.css` - Fonts for text in the Zulip app * `fonts.css` - Fonts for text in the Zulip app
* `static/styles/thirdparty-fonts.css` - Font Awesome (used for icons) * `static/third/thirdparty-fonts.css` - Font Awesome (used for icons)
The CSS for the Zulip web application UI is primarily here: The CSS for the Zulip web application UI is primarily here:

2
docs/user-docs.md
View File

@@ -180,7 +180,7 @@ a new line to be formatted this way.
You can refer to features in the Zulip UI by refrencing their names and You can refer to features in the Zulip UI by refrencing their names and
their [FontAwesome](http://fontawesome.io) (version 3.0.2) text icons within their [FontAwesome](http://fontawesome.io) (version 3.0.2) text icons within
parentheses. The source for the text icons is located in parentheses. The source for the text icons is located in
`static/styles/thirdparty-fonts.css`. `static/third/thirdparty-fonts.css`.
* cog (<i class="fa fa-cog"></i>) icon — `cog (<i * cog (<i class="fa fa-cog"></i>) icon — `cog (<i
class="icon-vector-cog"></i>) icon` class="icon-vector-cog"></i>) icon`

2
frontend_tests/zjsunit/output.js
View File

@@ -38,7 +38,7 @@ function stylesheets() {
var data = ''; var data = '';
data += '<link href="../../static/styles/fonts.css" rel="stylesheet">\n'; data += '<link href="../../static/styles/fonts.css" rel="stylesheet">\n';
data += '<link href="../../static/styles/portico.css" rel="stylesheet">\n'; data += '<link href="../../static/styles/portico.css" rel="stylesheet">\n';
data += '<link href="../../static/styles/thirdparty-fonts.css" rel="stylesheet">\n'; data += '<link href="../../static/third/thirdparty-fonts.css" rel="stylesheet">\n';
data += '<link href="../../static/styles/zulip.css" rel="stylesheet">\n'; data += '<link href="../../static/styles/zulip.css" rel="stylesheet">\n';
data += '<link href="../../static/styles/settings.css" rel="stylesheet">\n'; data += '<link href="../../static/styles/settings.css" rel="stylesheet">\n';
data += '<link href="../../static/styles/left-sidebar.css" rel="stylesheet">\n'; data += '<link href="../../static/styles/left-sidebar.css" rel="stylesheet">\n';

0
static/styles/thirdparty-fonts.css → static/third/thirdparty-fonts.css
View File

2
tools/lint-all
View File

@@ -452,7 +452,7 @@ def build_custom_checkers(by_lang):
'description': "Zulip CSS should have no dependencies on external resources"}, 'description': "Zulip CSS should have no dependencies on external resources"},
{'pattern': '^[ ][ ][a-zA-Z0-9]', {'pattern': '^[ ][ ][a-zA-Z0-9]',
'description': "Incorrect 2-space indentation in CSS", 'description': "Incorrect 2-space indentation in CSS",
'exclude': set(['static/styles/thirdparty-fonts.css']), 'exclude': set(['static/third/thirdparty-fonts.css']),
'strip': '\n'}, 'strip': '\n'},
{'pattern': '{\w', {'pattern': '{\w',
'description': "Missing whitespace after '{' in CSS (should be newline)."}, 'description': "Missing whitespace after '{' in CSS (should be newline)."},

6
zproject/settings.py
View File

@@ -675,7 +675,7 @@ PIPELINE = {
'third/zocial/zocial.css', 'third/zocial/zocial.css',
'styles/portico.css', 'styles/portico.css',
'styles/pygments.css', 'styles/pygments.css',
'styles/thirdparty-fonts.css', 'third/thirdparty-fonts.css',
'styles/fonts.css', 'styles/fonts.css',
), ),
'output_filename': 'min/portico.css' 'output_filename': 'min/portico.css'
@@ -703,7 +703,7 @@ PIPELINE = {
'styles/right-sidebar.css', 'styles/right-sidebar.css',
'styles/lightbox.css', 'styles/lightbox.css',
'styles/pygments.css', 'styles/pygments.css',
'styles/thirdparty-fonts.css', 'third/thirdparty-fonts.css',
'styles/media.css', 'styles/media.css',
'styles/typing_notifications.css', 'styles/typing_notifications.css',
# We don't want fonts.css on QtWebKit, so its omitted here # We don't want fonts.css on QtWebKit, so its omitted here
@@ -727,7 +727,7 @@ PIPELINE = {
'styles/right-sidebar.css', 'styles/right-sidebar.css',
'styles/lightbox.css', 'styles/lightbox.css',
'styles/pygments.css', 'styles/pygments.css',
'styles/thirdparty-fonts.css', 'third/thirdparty-fonts.css',
'styles/fonts.css', 'styles/fonts.css',
'styles/media.css', 'styles/media.css',
'styles/typing_notifications.css', 'styles/typing_notifications.css',