Browse Source

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)

pull/1/head
Matthew Hodgson 7 years ago
parent
commit
aaa38d95ba
  1. 8
      package.json
  2. 0
      skins/base/css/atoms/MessageTimestamp.css
  3. 0
      skins/base/css/common.css
  4. 0
      skins/base/css/molecules/MNoticeTile.css
  5. 0
      skins/base/css/molecules/MessageComposer.css
  6. 0
      skins/base/css/molecules/MessageTile.css
  7. 0
      skins/base/css/molecules/ProgressBar.css
  8. 0
      skins/base/css/molecules/RoomHeader.css
  9. 0
      skins/base/css/molecules/RoomTile.css
  10. 0
      skins/base/css/molecules/SenderProfile.css
  11. 0
      skins/base/css/organisms/RoomList.css
  12. 0
      skins/base/css/organisms/RoomView.css
  13. 0
      skins/base/css/pages/MatrixChat.css
  14. 0
      skins/base/css/templates/Login.css
  15. 0
      skins/base/views/atoms/LogoutButton.js
  16. 0
      skins/base/views/atoms/MessageTimestamp.js
  17. 0
      skins/base/views/molecules/MEmoteTile.js
  18. 0
      skins/base/views/molecules/MNoticeTile.js
  19. 0
      skins/base/views/molecules/MTextTile.js
  20. 0
      skins/base/views/molecules/MatrixToolbar.js
  21. 0
      skins/base/views/molecules/MemberTile.js
  22. 0
      skins/base/views/molecules/MessageComposer.js
  23. 0
      skins/base/views/molecules/MessageTile.js
  24. 0
      skins/base/views/molecules/ProgressBar.js
  25. 0
      skins/base/views/molecules/RoomHeader.js
  26. 0
      skins/base/views/molecules/RoomTile.js
  27. 0
      skins/base/views/molecules/SenderProfile.js
  28. 0
      skins/base/views/molecules/ServerConfig.js
  29. 0
      skins/base/views/molecules/UnknownMessageTile.js
  30. 0
      skins/base/views/organisms/MemberList.js
  31. 0
      skins/base/views/organisms/RoomList.js
  32. 0
      skins/base/views/organisms/RoomView.js
  33. 0
      skins/base/views/pages/MatrixChat.js
  34. 0
      skins/base/views/templates/Login.js
  35. 40
      src/ComponentBroker.js
  36. 2
      src/index.js

8
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'"
},

0
themes/base/css/atoms/MessageTimestamp.css → skins/base/css/atoms/MessageTimestamp.css

0
themes/base/css/common.css → skins/base/css/common.css

0
themes/base/css/molecules/MNoticeTile.css → skins/base/css/molecules/MNoticeTile.css

0
themes/base/css/molecules/MessageComposer.css → skins/base/css/molecules/MessageComposer.css

0
themes/base/css/molecules/MessageTile.css → skins/base/css/molecules/MessageTile.css

0
themes/base/css/molecules/ProgressBar.css → skins/base/css/molecules/ProgressBar.css

0
themes/base/css/molecules/RoomHeader.css → skins/base/css/molecules/RoomHeader.css

0
themes/base/css/molecules/RoomTile.css → skins/base/css/molecules/RoomTile.css

0
themes/base/css/molecules/SenderProfile.css → skins/base/css/molecules/SenderProfile.css

0
themes/base/css/organisms/RoomList.css → skins/base/css/organisms/RoomList.css

0
themes/base/css/organisms/RoomView.css → skins/base/css/organisms/RoomView.css

0
themes/base/css/pages/MatrixChat.css → skins/base/css/pages/MatrixChat.css

0
themes/base/css/templates/Login.css → skins/base/css/templates/Login.css

0
themes/base/views/atoms/LogoutButton.js → skins/base/views/atoms/LogoutButton.js

0
themes/base/views/atoms/MessageTimestamp.js → skins/base/views/atoms/MessageTimestamp.js

0
themes/base/views/molecules/MEmoteTile.js → skins/base/views/molecules/MEmoteTile.js

0
themes/base/views/molecules/MNoticeTile.js → skins/base/views/molecules/MNoticeTile.js

0
themes/base/views/molecules/MTextTile.js → skins/base/views/molecules/MTextTile.js

0
themes/base/views/molecules/MatrixToolbar.js → skins/base/views/molecules/MatrixToolbar.js

0
themes/base/views/molecules/MemberTile.js → skins/base/views/molecules/MemberTile.js

0
themes/base/views/molecules/MessageComposer.js → skins/base/views/molecules/MessageComposer.js

0
themes/base/views/molecules/MessageTile.js → skins/base/views/molecules/MessageTile.js

0
themes/base/views/molecules/ProgressBar.js → skins/base/views/molecules/ProgressBar.js

0
themes/base/views/molecules/RoomHeader.js → skins/base/views/molecules/RoomHeader.js

0
themes/base/views/molecules/RoomTile.js → skins/base/views/molecules/RoomTile.js

0
themes/base/views/molecules/SenderProfile.js → skins/base/views/molecules/SenderProfile.js

0
themes/base/views/molecules/ServerConfig.js → skins/base/views/molecules/ServerConfig.js

0
themes/base/views/molecules/UnknownMessageTile.js → skins/base/views/molecules/UnknownMessageTile.js

0
themes/base/views/organisms/MemberList.js → skins/base/views/organisms/MemberList.js

0
themes/base/views/organisms/RoomList.js → skins/base/views/organisms/RoomList.js

0
themes/base/views/organisms/RoomView.js → skins/base/views/organisms/RoomView.js

0
themes/base/views/pages/MatrixChat.js → skins/base/views/pages/MatrixChat.js

0
themes/base/views/templates/Login.js → skins/base/views/templates/Login.js

40
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');

2
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");

Loading…
Cancel
Save