Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

third: Rename thirdparty-fonts.css for better clarity. 

Now it's clear that this is just legacy fontawesome styles.
This commit is contained in:
Tim Abbott 2018-05-17 04:54:18 -07:00
parent b05a702285
commit 0dcf873370
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/subsystems/html_css.md
View File

@ -17,7 +17,6 @@ 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/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:

13
docs/subsystems/user-docs.md
View File

@ -192,13 +192,12 @@ a new line to be formatted this way.
### Icons ### Icons
You can refer to features in the Zulip UI by referencing their names and You can refer to features in the Zulip UI by referencing their names
their [FontAwesome](http://fontawesome.io) (version 4.7.0) text icons within and their [FontAwesome](http://fontawesome.io) (version 4.7.0) text
parentheses. The source for the text icons is located in icons within parentheses. **Note:** We are migrating to the modern
`static/third/thirdparty-fonts.css`. **Note:** It is strongly recommended to use font awesome base class `fa` instead of the older base class
the new base class `fa` instead of the older base class `icon-vector` when `icon-vector` when specifying icons. In future we will be removing
specifying icons. In future we will be removing support for the icons with base support for the icons with base class `icon-vector`.
class `icon-vector`.
* cog (<i class="fa fa-cog"></i>) icon — `cog (<i * cog (<i class="fa fa-cog"></i>) icon — `cog (<i
class="fa fa-cog"></i>) icon` class="fa fa-cog"></i>) icon`

2
static/styles/portico-styles.scss
View File

@ -4,6 +4,6 @@
@import "portico-signin"; @import "portico-signin";
@import "pygments"; @import "pygments";
@import "../node_modules/font-awesome/css/font-awesome.css"; @import "../node_modules/font-awesome/css/font-awesome.css";
@import "../third/thirdparty-fonts.css"; @import "../third/fontawesome-legacy.css";
@import "../generated/icons/style.css"; @import "../generated/icons/style.css";
@import "../node_modules/source-sans-pro/source-sans-pro.css"; @import "../node_modules/source-sans-pro/source-sans-pro.css";

1
static/third/thirdparty-fonts.css → static/third/fontawesome-legacy.css
View File

@ -1,3 +1,4 @@
/* Legacy fontawesome names; we should migrate to the fa- style */
/* Our custom narrowing symbol */ /* Our custom narrowing symbol */
.icon-vector-narrow:before { content: "\f054"; } .icon-vector-narrow:before { content: "\f054"; }

2
tools/linter_lib/custom_check.py
View File

@ -562,7 +562,7 @@ def build_custom_checkers(by_lang):
'bad_lines': ['background: url(https://example.com/image.png);']}, 'bad_lines': ['background: url(https://example.com/image.png);']},
{'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/third/thirdparty-fonts.css']), 'exclude': set(['static/third/fontawesome-legacy.css']),
'strip': '\n', 'strip': '\n',
'good_lines': [" color: white;", "color: white;"], 'good_lines': [" color: white;", "color: white;"],
'bad_lines': [" color: white;"]}, 'bad_lines': [" color: white;"]},

2
tools/webpack.assets.json
View File

@ -54,7 +54,7 @@
"./static/third/bootstrap-notify/css/bootstrap-notify.css", "./static/third/bootstrap-notify/css/bootstrap-notify.css",
"./static/third/spectrum/spectrum.css", "./static/third/spectrum/spectrum.css",
"./node_modules/font-awesome/css/font-awesome.css", "./node_modules/font-awesome/css/font-awesome.css",
"./static/third/thirdparty-fonts.css", "./static/third/fontawesome-legacy.css",
"./static/generated/icons/style.css", "./static/generated/icons/style.css",
"./static/node_modules/katex/dist/katex.css", "./static/node_modules/katex/dist/katex.css",
"./node_modules/source-sans-pro/source-sans-pro.css", "./node_modules/source-sans-pro/source-sans-pro.css",