From aaa38d95ba1998cb3b511a1dba261d8b848ea3db Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 23 Jun 2015 18:28:20 +0100
Subject: [PATCH] s/themes/skins/g as we are always describing the whole UI
layout here, whereas themes can sometimes just be small cosmetic tweaks
(light-on-dark, dark-on-light etc)
---
package.json | 8 ++--
.../base/css/atoms/MessageTimestamp.css | 0
{themes => skins}/base/css/common.css | 0
.../base/css/molecules/MNoticeTile.css | 0
.../base/css/molecules/MessageComposer.css | 0
.../base/css/molecules/MessageTile.css | 0
.../base/css/molecules/ProgressBar.css | 0
.../base/css/molecules/RoomHeader.css | 0
.../base/css/molecules/RoomTile.css | 0
.../base/css/molecules/SenderProfile.css | 0
.../base/css/organisms/RoomList.css | 0
.../base/css/organisms/RoomView.css | 0
.../base/css/pages/MatrixChat.css | 0
.../base/css/templates/Login.css | 0
.../base/views/atoms/LogoutButton.js | 0
.../base/views/atoms/MessageTimestamp.js | 0
.../base/views/molecules/MEmoteTile.js | 0
.../base/views/molecules/MNoticeTile.js | 0
.../base/views/molecules/MTextTile.js | 0
.../base/views/molecules/MatrixToolbar.js | 0
.../base/views/molecules/MemberTile.js | 0
.../base/views/molecules/MessageComposer.js | 0
.../base/views/molecules/MessageTile.js | 0
.../base/views/molecules/ProgressBar.js | 0
.../base/views/molecules/RoomHeader.js | 0
.../base/views/molecules/RoomTile.js | 0
.../base/views/molecules/SenderProfile.js | 0
.../base/views/molecules/ServerConfig.js | 0
.../views/molecules/UnknownMessageTile.js | 0
.../base/views/organisms/MemberList.js | 0
.../base/views/organisms/RoomList.js | 0
.../base/views/organisms/RoomView.js | 0
.../base/views/pages/MatrixChat.js | 0
.../base/views/templates/Login.js | 0
src/ComponentBroker.js | 40 +++++++++----------
src/index.js | 2 +-
36 files changed, 25 insertions(+), 25 deletions(-)
rename {themes => skins}/base/css/atoms/MessageTimestamp.css (100%)
rename {themes => skins}/base/css/common.css (100%)
rename {themes => skins}/base/css/molecules/MNoticeTile.css (100%)
rename {themes => skins}/base/css/molecules/MessageComposer.css (100%)
rename {themes => skins}/base/css/molecules/MessageTile.css (100%)
rename {themes => skins}/base/css/molecules/ProgressBar.css (100%)
rename {themes => skins}/base/css/molecules/RoomHeader.css (100%)
rename {themes => skins}/base/css/molecules/RoomTile.css (100%)
rename {themes => skins}/base/css/molecules/SenderProfile.css (100%)
rename {themes => skins}/base/css/organisms/RoomList.css (100%)
rename {themes => skins}/base/css/organisms/RoomView.css (100%)
rename {themes => skins}/base/css/pages/MatrixChat.css (100%)
rename {themes => skins}/base/css/templates/Login.css (100%)
rename {themes => skins}/base/views/atoms/LogoutButton.js (100%)
rename {themes => skins}/base/views/atoms/MessageTimestamp.js (100%)
rename {themes => skins}/base/views/molecules/MEmoteTile.js (100%)
rename {themes => skins}/base/views/molecules/MNoticeTile.js (100%)
rename {themes => skins}/base/views/molecules/MTextTile.js (100%)
rename {themes => skins}/base/views/molecules/MatrixToolbar.js (100%)
rename {themes => skins}/base/views/molecules/MemberTile.js (100%)
rename {themes => skins}/base/views/molecules/MessageComposer.js (100%)
rename {themes => skins}/base/views/molecules/MessageTile.js (100%)
rename {themes => skins}/base/views/molecules/ProgressBar.js (100%)
rename {themes => skins}/base/views/molecules/RoomHeader.js (100%)
rename {themes => skins}/base/views/molecules/RoomTile.js (100%)
rename {themes => skins}/base/views/molecules/SenderProfile.js (100%)
rename {themes => skins}/base/views/molecules/ServerConfig.js (100%)
rename {themes => skins}/base/views/molecules/UnknownMessageTile.js (100%)
rename {themes => skins}/base/views/organisms/MemberList.js (100%)
rename {themes => skins}/base/views/organisms/RoomList.js (100%)
rename {themes => skins}/base/views/organisms/RoomView.js (100%)
rename {themes => skins}/base/views/pages/MatrixChat.js (100%)
rename {themes => skins}/base/views/templates/Login.js (100%)
diff --git a/package.json b/package.json
index 9b64e07d..1d45dbab 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,10 @@
"license": "Apache 2",
"main": "src/index.js",
"scripts": {
- "build:js": "jsx themes/base/views/ build",
- "start:js": "jsx -w themes/base/views/ build --source-map-inline",
- "build:css": "catw 'themes/base/css/**/*.css' -o bundle.css -c uglifycss --no-watch",
- "start:css": "catw 'themes/base/css/**/*.css' -o bundle.css -v",
+ "build:js": "jsx skins/base/views/ build",
+ "start:js": "jsx -w skins/base/views/ build --source-map-inline",
+ "build:css": "catw 'skins/base/css/**/*.css' -o bundle.css -c uglifycss --no-watch",
+ "start:css": "catw 'skins/base/css/**/*.css' -o bundle.css -v",
"build": "npm run build:js && npm run build:css",
"start": "parallelshell 'npm run start:js' 'npm run start:css'"
},
diff --git a/themes/base/css/atoms/MessageTimestamp.css b/skins/base/css/atoms/MessageTimestamp.css
similarity index 100%
rename from themes/base/css/atoms/MessageTimestamp.css
rename to skins/base/css/atoms/MessageTimestamp.css
diff --git a/themes/base/css/common.css b/skins/base/css/common.css
similarity index 100%
rename from themes/base/css/common.css
rename to skins/base/css/common.css
diff --git a/themes/base/css/molecules/MNoticeTile.css b/skins/base/css/molecules/MNoticeTile.css
similarity index 100%
rename from themes/base/css/molecules/MNoticeTile.css
rename to skins/base/css/molecules/MNoticeTile.css
diff --git a/themes/base/css/molecules/MessageComposer.css b/skins/base/css/molecules/MessageComposer.css
similarity index 100%
rename from themes/base/css/molecules/MessageComposer.css
rename to skins/base/css/molecules/MessageComposer.css
diff --git a/themes/base/css/molecules/MessageTile.css b/skins/base/css/molecules/MessageTile.css
similarity index 100%
rename from themes/base/css/molecules/MessageTile.css
rename to skins/base/css/molecules/MessageTile.css
diff --git a/themes/base/css/molecules/ProgressBar.css b/skins/base/css/molecules/ProgressBar.css
similarity index 100%
rename from themes/base/css/molecules/ProgressBar.css
rename to skins/base/css/molecules/ProgressBar.css
diff --git a/themes/base/css/molecules/RoomHeader.css b/skins/base/css/molecules/RoomHeader.css
similarity index 100%
rename from themes/base/css/molecules/RoomHeader.css
rename to skins/base/css/molecules/RoomHeader.css
diff --git a/themes/base/css/molecules/RoomTile.css b/skins/base/css/molecules/RoomTile.css
similarity index 100%
rename from themes/base/css/molecules/RoomTile.css
rename to skins/base/css/molecules/RoomTile.css
diff --git a/themes/base/css/molecules/SenderProfile.css b/skins/base/css/molecules/SenderProfile.css
similarity index 100%
rename from themes/base/css/molecules/SenderProfile.css
rename to skins/base/css/molecules/SenderProfile.css
diff --git a/themes/base/css/organisms/RoomList.css b/skins/base/css/organisms/RoomList.css
similarity index 100%
rename from themes/base/css/organisms/RoomList.css
rename to skins/base/css/organisms/RoomList.css
diff --git a/themes/base/css/organisms/RoomView.css b/skins/base/css/organisms/RoomView.css
similarity index 100%
rename from themes/base/css/organisms/RoomView.css
rename to skins/base/css/organisms/RoomView.css
diff --git a/themes/base/css/pages/MatrixChat.css b/skins/base/css/pages/MatrixChat.css
similarity index 100%
rename from themes/base/css/pages/MatrixChat.css
rename to skins/base/css/pages/MatrixChat.css
diff --git a/themes/base/css/templates/Login.css b/skins/base/css/templates/Login.css
similarity index 100%
rename from themes/base/css/templates/Login.css
rename to skins/base/css/templates/Login.css
diff --git a/themes/base/views/atoms/LogoutButton.js b/skins/base/views/atoms/LogoutButton.js
similarity index 100%
rename from themes/base/views/atoms/LogoutButton.js
rename to skins/base/views/atoms/LogoutButton.js
diff --git a/themes/base/views/atoms/MessageTimestamp.js b/skins/base/views/atoms/MessageTimestamp.js
similarity index 100%
rename from themes/base/views/atoms/MessageTimestamp.js
rename to skins/base/views/atoms/MessageTimestamp.js
diff --git a/themes/base/views/molecules/MEmoteTile.js b/skins/base/views/molecules/MEmoteTile.js
similarity index 100%
rename from themes/base/views/molecules/MEmoteTile.js
rename to skins/base/views/molecules/MEmoteTile.js
diff --git a/themes/base/views/molecules/MNoticeTile.js b/skins/base/views/molecules/MNoticeTile.js
similarity index 100%
rename from themes/base/views/molecules/MNoticeTile.js
rename to skins/base/views/molecules/MNoticeTile.js
diff --git a/themes/base/views/molecules/MTextTile.js b/skins/base/views/molecules/MTextTile.js
similarity index 100%
rename from themes/base/views/molecules/MTextTile.js
rename to skins/base/views/molecules/MTextTile.js
diff --git a/themes/base/views/molecules/MatrixToolbar.js b/skins/base/views/molecules/MatrixToolbar.js
similarity index 100%
rename from themes/base/views/molecules/MatrixToolbar.js
rename to skins/base/views/molecules/MatrixToolbar.js
diff --git a/themes/base/views/molecules/MemberTile.js b/skins/base/views/molecules/MemberTile.js
similarity index 100%
rename from themes/base/views/molecules/MemberTile.js
rename to skins/base/views/molecules/MemberTile.js
diff --git a/themes/base/views/molecules/MessageComposer.js b/skins/base/views/molecules/MessageComposer.js
similarity index 100%
rename from themes/base/views/molecules/MessageComposer.js
rename to skins/base/views/molecules/MessageComposer.js
diff --git a/themes/base/views/molecules/MessageTile.js b/skins/base/views/molecules/MessageTile.js
similarity index 100%
rename from themes/base/views/molecules/MessageTile.js
rename to skins/base/views/molecules/MessageTile.js
diff --git a/themes/base/views/molecules/ProgressBar.js b/skins/base/views/molecules/ProgressBar.js
similarity index 100%
rename from themes/base/views/molecules/ProgressBar.js
rename to skins/base/views/molecules/ProgressBar.js
diff --git a/themes/base/views/molecules/RoomHeader.js b/skins/base/views/molecules/RoomHeader.js
similarity index 100%
rename from themes/base/views/molecules/RoomHeader.js
rename to skins/base/views/molecules/RoomHeader.js
diff --git a/themes/base/views/molecules/RoomTile.js b/skins/base/views/molecules/RoomTile.js
similarity index 100%
rename from themes/base/views/molecules/RoomTile.js
rename to skins/base/views/molecules/RoomTile.js
diff --git a/themes/base/views/molecules/SenderProfile.js b/skins/base/views/molecules/SenderProfile.js
similarity index 100%
rename from themes/base/views/molecules/SenderProfile.js
rename to skins/base/views/molecules/SenderProfile.js
diff --git a/themes/base/views/molecules/ServerConfig.js b/skins/base/views/molecules/ServerConfig.js
similarity index 100%
rename from themes/base/views/molecules/ServerConfig.js
rename to skins/base/views/molecules/ServerConfig.js
diff --git a/themes/base/views/molecules/UnknownMessageTile.js b/skins/base/views/molecules/UnknownMessageTile.js
similarity index 100%
rename from themes/base/views/molecules/UnknownMessageTile.js
rename to skins/base/views/molecules/UnknownMessageTile.js
diff --git a/themes/base/views/organisms/MemberList.js b/skins/base/views/organisms/MemberList.js
similarity index 100%
rename from themes/base/views/organisms/MemberList.js
rename to skins/base/views/organisms/MemberList.js
diff --git a/themes/base/views/organisms/RoomList.js b/skins/base/views/organisms/RoomList.js
similarity index 100%
rename from themes/base/views/organisms/RoomList.js
rename to skins/base/views/organisms/RoomList.js
diff --git a/themes/base/views/organisms/RoomView.js b/skins/base/views/organisms/RoomView.js
similarity index 100%
rename from themes/base/views/organisms/RoomView.js
rename to skins/base/views/organisms/RoomView.js
diff --git a/themes/base/views/pages/MatrixChat.js b/skins/base/views/pages/MatrixChat.js
similarity index 100%
rename from themes/base/views/pages/MatrixChat.js
rename to skins/base/views/pages/MatrixChat.js
diff --git a/themes/base/views/templates/Login.js b/skins/base/views/templates/Login.js
similarity index 100%
rename from themes/base/views/templates/Login.js
rename to skins/base/views/templates/Login.js
diff --git a/src/ComponentBroker.js b/src/ComponentBroker.js
index 7d6a435f..7d711e9b 100644
--- a/src/ComponentBroker.js
+++ b/src/ComponentBroker.js
@@ -19,7 +19,7 @@ limitations under the License.
var components = {};
function load(name) {
- var module = require("../themes/base/views/"+name);
+ var module = require("../skins/base/views/"+name);
components[name] = module;
return module;
};
@@ -41,22 +41,22 @@ module.exports = {
// otherwise browserify has no way of knowing what module to include
// Must be in this file (because the require is file-specific) and
// must be at the end because the components include this file.
-require('../themes/base/views/atoms/LogoutButton');
-require('../themes/base/views/atoms/MessageTimestamp');
-require('../themes/base/views/molecules/MatrixToolbar');
-require('../themes/base/views/molecules/RoomTile');
-require('../themes/base/views/molecules/MessageTile');
-require('../themes/base/views/molecules/SenderProfile');
-require('../themes/base/views/molecules/UnknownMessageTile');
-require('../themes/base/views/molecules/MTextTile');
-require('../themes/base/views/molecules/MNoticeTile');
-require('../themes/base/views/molecules/MEmoteTile');
-require('../themes/base/views/molecules/RoomHeader');
-require('../themes/base/views/molecules/MessageComposer');
-require('../themes/base/views/molecules/ProgressBar');
-require('../themes/base/views/molecules/ServerConfig');
-require('../themes/base/views/organisms/MemberList');
-require('../themes/base/views/molecules/MemberTile');
-require('../themes/base/views/organisms/RoomList');
-require('../themes/base/views/organisms/RoomView');
-require('../themes/base/views/templates/Login');
+require('../skins/base/views/atoms/LogoutButton');
+require('../skins/base/views/atoms/MessageTimestamp');
+require('../skins/base/views/molecules/MatrixToolbar');
+require('../skins/base/views/molecules/RoomTile');
+require('../skins/base/views/molecules/MessageTile');
+require('../skins/base/views/molecules/SenderProfile');
+require('../skins/base/views/molecules/UnknownMessageTile');
+require('../skins/base/views/molecules/MTextTile');
+require('../skins/base/views/molecules/MNoticeTile');
+require('../skins/base/views/molecules/MEmoteTile');
+require('../skins/base/views/molecules/RoomHeader');
+require('../skins/base/views/molecules/MessageComposer');
+require('../skins/base/views/molecules/ProgressBar');
+require('../skins/base/views/molecules/ServerConfig');
+require('../skins/base/views/organisms/MemberList');
+require('../skins/base/views/molecules/MemberTile');
+require('../skins/base/views/organisms/RoomList');
+require('../skins/base/views/organisms/RoomView');
+require('../skins/base/views/templates/Login');
diff --git a/src/index.js b/src/index.js
index 5c221211..febf8d0d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -16,4 +16,4 @@ limitations under the License.
'use strict';
-module.exports.MatrixChat = require("../themes/base/views/pages/MatrixChat");
+module.exports.MatrixChat = require("../skins/base/views/pages/MatrixChat");