Mirrors/brackets
1
0
Fork 0
mirror of https://github.com/adobe/brackets.git synced 2024-11-20 09:53:00 +01:00
Code Issues Releases Activity

Merge pull request #8512 from MiguelCastillo/fonts-cssclean

Browse Source 
Removed font definitions from css since they are handled in the fonts ap...
This commit is contained in:
Kevin Dangoor 2014-07-22 17:08:29 -04:00
commit 612ff365bd
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/styles/brackets_theme_default.less
View File

@ -144,9 +144,6 @@
*/
.code-font() {
color: @content-color;
font-size: 12px;
line-height: 1.25;
font-family: "SourceCodePro-Medium", "ＭＳ ゴシック", "MS Gothic", monospace;
}
.code-font-win() {

8
src/view/ViewCommandHandlers.js
View File

@ -322,7 +322,7 @@ define(function (require, exports, module) {
return prefs.get("lineHeight");
}
/**
* @private
* Increases or decreases the editor's font size.
@ -390,7 +390,7 @@ define(function (require, exports, module) {
CommandManager.get(Commands.VIEW_RESTORE_FONT_SIZE).setEnabled(false);
}
}
/**
* Initializes the different settings that need to loaded
*/
@ -551,7 +551,7 @@ define(function (require, exports, module) {
CommandManager.register(Strings.CMD_THEMES, Commands.CMD_THEMES_OPEN_SETTINGS, _handleThemeSettings);
PreferencesManager.convertPreferences(module, {"fontSizeAdjustment": "user"}, true, _convertToNewViewState);
prefs.definePreference("fontSize", "string", DEFAULT_FONT_SIZE + "px");
prefs.definePreference("lineHeight", "number", DEFAULT_LINE_HEIGHT);
prefs.definePreference("fontFamily", "string", DEFAULT_FONT_FAMILY);
@ -560,7 +560,7 @@ define(function (require, exports, module) {
$(DocumentManager).on("currentDocumentChange", _updateUI);
// Update UI when Brackets finishes loading
AppInit.appReady(_updateUI);
AppInit.appReady(init);
exports.restoreFontSize = restoreFontSize;
exports.restoreFonts = restoreFonts;