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 #8514 from adobe/dangoor/bye-thor

Browse Source 
Rename "Thor" themes to simple "Default (Light)" and "Dark"
This commit is contained in:
Kevin Dangoor 2014-07-22 15:13:57 -04:00
commit c7fddecf4f
7 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/extensions/default/ThorDarkTheme/main.less → src/extensions/default/DarkTheme/main.less
View File

14
src/extensions/default/DarkTheme/package.json Normal file
View File

@ -0,0 +1,14 @@
{
"title": "Dark",
"name": "dark-theme",
"description": "Built-in dark theme for Brackets",
"version": "0.42.0",
"author": "Miguel Castillo <mahchagnu@gmail.com>",
"engines": {
"brackets": ">=0.42.0"
},
"theme": {
"file": "main.less",
"dark": true
}
}

0
src/extensions/default/ThorLightTheme/main.less → src/extensions/default/LightTheme/main.less
View File

13
src/extensions/default/LightTheme/package.json Normal file
View File

@ -0,0 +1,13 @@
{
"title": "Default (Light)",
"name": "light-theme",
"description": "Built-in light theme for Brackets",
"version": "0.42.0",
"author": "Miguel Castillo <mahchagnu@gmail.com>",
"engines": {
"brackets": ">=0.42.0"
},
"theme": {
"file": "main.less"
}
}

15
src/extensions/default/ThorDarkTheme/package.json
View File

@ -1,15 +0,0 @@
{
"title": "Thor Dark",
"name": "thor-dark-theme",
"description": "Awesome dark theme for Brackets",
"version": "0.0.1",
"author": "Miguel Castillo <mahchagnu@gmail.com>",
"engines": {
"brackets": ">=0.39.0"
},
"theme": {
"file": "main.less",
"dark": true
},
"screenshot": "screenshot.png"
}

14
src/extensions/default/ThorLightTheme/package.json
View File

@ -1,14 +0,0 @@
{
"title": "Default (Thor Light)",
"name": "thor-light-theme",
"description": "Awesome light theme for Brackets",
"version": "0.0.1",
"author": "Miguel Castillo <mahchagnu@gmail.com>",
"engines": {
"brackets": ">=0.39.0"
},
"theme": {
"file": "main.less"
},
"screenshot": "screenshot.png"
}

12
src/view/ThemeSettings.js
View File

@ -46,7 +46,7 @@ define(function (require, exports, module) {
*/
var defaults = {
"customScrollbars": true,
"theme": "thor-light-theme"
"theme": "light-theme"
};
@ -85,9 +85,13 @@ define(function (require, exports, module) {
var $template = $(Mustache.render(template, {"settings": currentSettings, "themes": themes, "Strings": Strings}));
// Select the correct theme.
$template
.find("[value='" + currentSettings.theme + "']")
.attr("selected", "selected");
var $currentThemeOption = $template
.find("[value='" + currentSettings.theme + "']");
if ($currentThemeOption.length === 0) {
$currentThemeOption = $template.find("[value='" + defaults.theme + "']");
}
$currentThemeOption.attr("selected", "selected");
$template
.find("[data-toggle=tab].default")