From b9a0b82537382145e2ab1dfda0811111e223df34 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 3 Jan 2016 00:10:17 +0000 Subject: [PATCH] shuffle around all the CSS to de-atomify it and make it match the react components --- .../structures}/CreateRoom.css | 0 .../structures}/MatrixChat.css | 0 .../structures}/RoomView.css | 0 .../structures}/UploadBar.css | 0 .../structures}/UserSettings.css | 0 .../structures/login}/Login.css | 0 .../views/avatars}/MemberAvatar.css | 0 .../views/avatars}/RoomAvatar.css | 0 .../views/elements}/ProgressBar.css | 0 .../views/login}/ServerConfig.css | 0 .../views/messages/MImageBody.css} | 10 +++---- .../views/messages/MNoticeBody.css} | 2 +- .../views/messages/MTextBody.css} | 2 +- .../views/messages/TextualEvent.css} | 2 +- .../views/rooms}/EventTile.css | 26 +++++++++---------- .../views/rooms}/MemberInfo.css | 0 .../views/rooms}/MemberList.css | 0 .../views/rooms}/MemberTile.css | 0 .../views/rooms}/MessageComposer.css | 0 .../views/rooms}/RoomHeader.css | 0 .../views/rooms}/RoomList.css | 0 .../views/rooms}/RoomSettings.css | 0 .../views/rooms}/RoomTile.css | 0 .../views/rooms}/TabCompleteBar.css | 0 .../views}/voip/CallView.css | 0 .../views}/voip/IncomingCallbox.css | 0 .../views}/voip/VideoView.css | 0 .../structures}/CompatibilityPage.css | 0 .../structures}/LeftPanel.css | 0 .../structures}/RightPanel.css | 0 .../structures}/RoomDirectory.css | 0 .../structures}/RoomSubList.css | 0 .../structures}/ViewSource.css | 0 .../views/elements}/ImageView.css | 0 .../views/elements}/Spinner.css | 0 .../views/globals}/MatrixToolbar.css | 0 .../views/messages}/MessageTimestamp.css | 0 .../views/messages}/SenderProfile.css | 0 .../views/rooms}/RoomDropTarget.css | 0 .../views/rooms}/RoomTooltip.css | 0 .../views/rooms}/SearchBar.css | 0 41 files changed, 21 insertions(+), 21 deletions(-) rename src/skins/vector/css/{organisms => matrix-react-sdk/structures}/CreateRoom.css (100%) rename src/skins/vector/css/{pages => matrix-react-sdk/structures}/MatrixChat.css (100%) rename src/skins/vector/css/{organisms => matrix-react-sdk/structures}/RoomView.css (100%) rename src/skins/vector/css/{MOVE_ME => matrix-react-sdk/structures}/UploadBar.css (100%) rename src/skins/vector/css/{organisms => matrix-react-sdk/structures}/UserSettings.css (100%) rename src/skins/vector/css/{templates => matrix-react-sdk/structures/login}/Login.css (100%) rename src/skins/vector/css/{atoms => matrix-react-sdk/views/avatars}/MemberAvatar.css (100%) rename src/skins/vector/css/{atoms => matrix-react-sdk/views/avatars}/RoomAvatar.css (100%) rename src/skins/vector/css/{molecules => matrix-react-sdk/views/elements}/ProgressBar.css (100%) rename src/skins/vector/css/{molecules => matrix-react-sdk/views/login}/ServerConfig.css (100%) rename src/skins/vector/css/{molecules/MImageTile.css => matrix-react-sdk/views/messages/MImageBody.css} (87%) rename src/skins/vector/css/{molecules/MNoticeTile.css => matrix-react-sdk/views/messages/MNoticeBody.css} (97%) rename src/skins/vector/css/{molecules/MTextTile.css => matrix-react-sdk/views/messages/MTextBody.css} (97%) rename src/skins/vector/css/{molecules/EventAsTextTile.css => matrix-react-sdk/views/messages/TextualEvent.css} (96%) rename src/skins/vector/css/{molecules => matrix-react-sdk/views/rooms}/EventTile.css (86%) rename src/skins/vector/css/{molecules => matrix-react-sdk/views/rooms}/MemberInfo.css (100%) rename src/skins/vector/css/{organisms => matrix-react-sdk/views/rooms}/MemberList.css (100%) rename src/skins/vector/css/{molecules => matrix-react-sdk/views/rooms}/MemberTile.css (100%) rename src/skins/vector/css/{molecules => matrix-react-sdk/views/rooms}/MessageComposer.css (100%) rename src/skins/vector/css/{molecules => matrix-react-sdk/views/rooms}/RoomHeader.css (100%) rename src/skins/vector/css/{organisms => matrix-react-sdk/views/rooms}/RoomList.css (100%) rename src/skins/vector/css/{molecules => matrix-react-sdk/views/rooms}/RoomSettings.css (100%) rename src/skins/vector/css/{molecules => matrix-react-sdk/views/rooms}/RoomTile.css (100%) rename src/skins/vector/css/{molecules => matrix-react-sdk/views/rooms}/TabCompleteBar.css (100%) rename src/skins/vector/css/{molecules => matrix-react-sdk/views}/voip/CallView.css (100%) rename src/skins/vector/css/{molecules => matrix-react-sdk/views}/voip/IncomingCallbox.css (100%) rename src/skins/vector/css/{molecules => matrix-react-sdk/views}/voip/VideoView.css (100%) rename src/skins/vector/css/{pages => vector-web/structures}/CompatibilityPage.css (100%) rename src/skins/vector/css/{organisms => vector-web/structures}/LeftPanel.css (100%) rename src/skins/vector/css/{organisms => vector-web/structures}/RightPanel.css (100%) rename src/skins/vector/css/{organisms => vector-web/structures}/RoomDirectory.css (100%) rename src/skins/vector/css/{organisms => vector-web/structures}/RoomSubList.css (100%) rename src/skins/vector/css/{organisms => vector-web/structures}/ViewSource.css (100%) rename src/skins/vector/css/{atoms => vector-web/views/elements}/ImageView.css (100%) rename src/skins/vector/css/{atoms => vector-web/views/elements}/Spinner.css (100%) rename src/skins/vector/css/{molecules => vector-web/views/globals}/MatrixToolbar.css (100%) rename src/skins/vector/css/{atoms => vector-web/views/messages}/MessageTimestamp.css (100%) rename src/skins/vector/css/{molecules => vector-web/views/messages}/SenderProfile.css (100%) rename src/skins/vector/css/{molecules => vector-web/views/rooms}/RoomDropTarget.css (100%) rename src/skins/vector/css/{molecules => vector-web/views/rooms}/RoomTooltip.css (100%) rename src/skins/vector/css/{molecules => vector-web/views/rooms}/SearchBar.css (100%) diff --git a/src/skins/vector/css/organisms/CreateRoom.css b/src/skins/vector/css/matrix-react-sdk/structures/CreateRoom.css similarity index 100% rename from src/skins/vector/css/organisms/CreateRoom.css rename to src/skins/vector/css/matrix-react-sdk/structures/CreateRoom.css diff --git a/src/skins/vector/css/pages/MatrixChat.css b/src/skins/vector/css/matrix-react-sdk/structures/MatrixChat.css similarity index 100% rename from src/skins/vector/css/pages/MatrixChat.css rename to src/skins/vector/css/matrix-react-sdk/structures/MatrixChat.css diff --git a/src/skins/vector/css/organisms/RoomView.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css similarity index 100% rename from src/skins/vector/css/organisms/RoomView.css rename to src/skins/vector/css/matrix-react-sdk/structures/RoomView.css diff --git a/src/skins/vector/css/MOVE_ME/UploadBar.css b/src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css similarity index 100% rename from src/skins/vector/css/MOVE_ME/UploadBar.css rename to src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css diff --git a/src/skins/vector/css/organisms/UserSettings.css b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css similarity index 100% rename from src/skins/vector/css/organisms/UserSettings.css rename to src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css diff --git a/src/skins/vector/css/templates/Login.css b/src/skins/vector/css/matrix-react-sdk/structures/login/Login.css similarity index 100% rename from src/skins/vector/css/templates/Login.css rename to src/skins/vector/css/matrix-react-sdk/structures/login/Login.css diff --git a/src/skins/vector/css/atoms/MemberAvatar.css b/src/skins/vector/css/matrix-react-sdk/views/avatars/MemberAvatar.css similarity index 100% rename from src/skins/vector/css/atoms/MemberAvatar.css rename to src/skins/vector/css/matrix-react-sdk/views/avatars/MemberAvatar.css diff --git a/src/skins/vector/css/atoms/RoomAvatar.css b/src/skins/vector/css/matrix-react-sdk/views/avatars/RoomAvatar.css similarity index 100% rename from src/skins/vector/css/atoms/RoomAvatar.css rename to src/skins/vector/css/matrix-react-sdk/views/avatars/RoomAvatar.css diff --git a/src/skins/vector/css/molecules/ProgressBar.css b/src/skins/vector/css/matrix-react-sdk/views/elements/ProgressBar.css similarity index 100% rename from src/skins/vector/css/molecules/ProgressBar.css rename to src/skins/vector/css/matrix-react-sdk/views/elements/ProgressBar.css diff --git a/src/skins/vector/css/molecules/ServerConfig.css b/src/skins/vector/css/matrix-react-sdk/views/login/ServerConfig.css similarity index 100% rename from src/skins/vector/css/molecules/ServerConfig.css rename to src/skins/vector/css/matrix-react-sdk/views/login/ServerConfig.css diff --git a/src/skins/vector/css/molecules/MImageTile.css b/src/skins/vector/css/matrix-react-sdk/views/messages/MImageBody.css similarity index 87% rename from src/skins/vector/css/molecules/MImageTile.css rename to src/skins/vector/css/matrix-react-sdk/views/messages/MImageBody.css index 94f1c919..0f8c564b 100644 --- a/src/skins/vector/css/molecules/MImageTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/messages/MImageBody.css @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -.mx_MImageTile_thumbnail { +.mx_MImageBody_thumbnail { /* background-color: #fff; border: 2px solid #fff; @@ -22,16 +22,16 @@ limitations under the License. */ } -.mx_MImageTile_download { +.mx_MImageBody_download { color: #76cfa6; cursor: pointer; } -.mx_MImageTile_download a { +.mx_MImageBody_download a { color: #76cfa6; text-decoration: none; } -.mx_MImageTile_download img { +.mx_MImageBody_download img { padding-right: 8px; -} \ No newline at end of file +} diff --git a/src/skins/vector/css/molecules/MNoticeTile.css b/src/skins/vector/css/matrix-react-sdk/views/messages/MNoticeBody.css similarity index 97% rename from src/skins/vector/css/molecules/MNoticeTile.css rename to src/skins/vector/css/matrix-react-sdk/views/messages/MNoticeBody.css index 9fe5376a..653f8fa3 100644 --- a/src/skins/vector/css/molecules/MNoticeTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/messages/MNoticeBody.css @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -.mx_MNoticeTile { +.mx_MNoticeBody { white-space: pre-wrap; opacity: 0.6; } diff --git a/src/skins/vector/css/molecules/MTextTile.css b/src/skins/vector/css/matrix-react-sdk/views/messages/MTextBody.css similarity index 97% rename from src/skins/vector/css/molecules/MTextTile.css rename to src/skins/vector/css/matrix-react-sdk/views/messages/MTextBody.css index 96a9d1db..dccef95f 100644 --- a/src/skins/vector/css/molecules/MTextTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/messages/MTextBody.css @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -.mx_MTextTile { +.mx_MTextBody { white-space: pre-wrap; } diff --git a/src/skins/vector/css/molecules/EventAsTextTile.css b/src/skins/vector/css/matrix-react-sdk/views/messages/TextualEvent.css similarity index 96% rename from src/skins/vector/css/molecules/EventAsTextTile.css rename to src/skins/vector/css/matrix-react-sdk/views/messages/TextualEvent.css index da953522..183beae0 100644 --- a/src/skins/vector/css/molecules/EventAsTextTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/messages/TextualEvent.css @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -.mx_EventAsTextTile { +.mx_TextualEvent { opacity: 0.5; overflow-y: hidden; } diff --git a/src/skins/vector/css/molecules/EventTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css similarity index 86% rename from src/skins/vector/css/molecules/EventTile.css rename to src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css index 17d1599e..42a04399 100644 --- a/src/skins/vector/css/molecules/EventTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css @@ -63,7 +63,7 @@ limitations under the License. display: block; } -.mx_MessageTile_content { +.mx_EventTile_content { display: block; margin-right: 100px; overflow-y: hidden; @@ -71,7 +71,7 @@ limitations under the License. /* Various markdown overrides */ -.mx_MessageTile_content .markdown-body { +.mx_EventTile_content .markdown-body { font-family: inherit ! important; white-space: normal ! important; line-height: inherit ! important; @@ -79,34 +79,34 @@ limitations under the License. font-size: 15px; } -.mx_MessageTile_content .markdown-body h1, -.mx_MessageTile_content .markdown-body h2, -.mx_MessageTile_content .markdown-body h3, -.mx_MessageTile_content .markdown-body h4, -.mx_MessageTile_content .markdown-body h5, -.mx_MessageTile_content .markdown-body h6 +.mx_EventTile_content .markdown-body h1, +.mx_EventTile_content .markdown-body h2, +.mx_EventTile_content .markdown-body h3, +.mx_EventTile_content .markdown-body h4, +.mx_EventTile_content .markdown-body h5, +.mx_EventTile_content .markdown-body h6 { font-family: inherit ! important; } -.mx_MessageTile_content .markdown-body a { +.mx_EventTile_content .markdown-body a { color: #76cfa6; } -.mx_MessageTile_content .markdown-body .hljs { +.mx_EventTile_content .markdown-body .hljs { display: inherit ! important; } /* end of overrides */ -.mx_MessageTile_searchHighlight { +.mx_EventTile_searchHighlight { background-color: #76cfa6; color: #fff; border-radius: 5px; padding: 4px; } -.mx_MessageTile_searchHighlight a { +.mx_EventTile_searchHighlight a { background-color: #76cfa6; color: #fff; } @@ -139,7 +139,7 @@ limitations under the License. margin-top: -6px; } -.mx_MessageTimestamp { +.mx_EventTile .mx_MessageTimestamp { display: block; visibility: hidden; text-align: right; diff --git a/src/skins/vector/css/molecules/MemberInfo.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css similarity index 100% rename from src/skins/vector/css/molecules/MemberInfo.css rename to src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css diff --git a/src/skins/vector/css/organisms/MemberList.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css similarity index 100% rename from src/skins/vector/css/organisms/MemberList.css rename to src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css diff --git a/src/skins/vector/css/molecules/MemberTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberTile.css similarity index 100% rename from src/skins/vector/css/molecules/MemberTile.css rename to src/skins/vector/css/matrix-react-sdk/views/rooms/MemberTile.css diff --git a/src/skins/vector/css/molecules/MessageComposer.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css similarity index 100% rename from src/skins/vector/css/molecules/MessageComposer.css rename to src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css diff --git a/src/skins/vector/css/molecules/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css similarity index 100% rename from src/skins/vector/css/molecules/RoomHeader.css rename to src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css diff --git a/src/skins/vector/css/organisms/RoomList.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomList.css similarity index 100% rename from src/skins/vector/css/organisms/RoomList.css rename to src/skins/vector/css/matrix-react-sdk/views/rooms/RoomList.css diff --git a/src/skins/vector/css/molecules/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css similarity index 100% rename from src/skins/vector/css/molecules/RoomSettings.css rename to src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css diff --git a/src/skins/vector/css/molecules/RoomTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css similarity index 100% rename from src/skins/vector/css/molecules/RoomTile.css rename to src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css diff --git a/src/skins/vector/css/molecules/TabCompleteBar.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css similarity index 100% rename from src/skins/vector/css/molecules/TabCompleteBar.css rename to src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css diff --git a/src/skins/vector/css/molecules/voip/CallView.css b/src/skins/vector/css/matrix-react-sdk/views/voip/CallView.css similarity index 100% rename from src/skins/vector/css/molecules/voip/CallView.css rename to src/skins/vector/css/matrix-react-sdk/views/voip/CallView.css diff --git a/src/skins/vector/css/molecules/voip/IncomingCallbox.css b/src/skins/vector/css/matrix-react-sdk/views/voip/IncomingCallbox.css similarity index 100% rename from src/skins/vector/css/molecules/voip/IncomingCallbox.css rename to src/skins/vector/css/matrix-react-sdk/views/voip/IncomingCallbox.css diff --git a/src/skins/vector/css/molecules/voip/VideoView.css b/src/skins/vector/css/matrix-react-sdk/views/voip/VideoView.css similarity index 100% rename from src/skins/vector/css/molecules/voip/VideoView.css rename to src/skins/vector/css/matrix-react-sdk/views/voip/VideoView.css diff --git a/src/skins/vector/css/pages/CompatibilityPage.css b/src/skins/vector/css/vector-web/structures/CompatibilityPage.css similarity index 100% rename from src/skins/vector/css/pages/CompatibilityPage.css rename to src/skins/vector/css/vector-web/structures/CompatibilityPage.css diff --git a/src/skins/vector/css/organisms/LeftPanel.css b/src/skins/vector/css/vector-web/structures/LeftPanel.css similarity index 100% rename from src/skins/vector/css/organisms/LeftPanel.css rename to src/skins/vector/css/vector-web/structures/LeftPanel.css diff --git a/src/skins/vector/css/organisms/RightPanel.css b/src/skins/vector/css/vector-web/structures/RightPanel.css similarity index 100% rename from src/skins/vector/css/organisms/RightPanel.css rename to src/skins/vector/css/vector-web/structures/RightPanel.css diff --git a/src/skins/vector/css/organisms/RoomDirectory.css b/src/skins/vector/css/vector-web/structures/RoomDirectory.css similarity index 100% rename from src/skins/vector/css/organisms/RoomDirectory.css rename to src/skins/vector/css/vector-web/structures/RoomDirectory.css diff --git a/src/skins/vector/css/organisms/RoomSubList.css b/src/skins/vector/css/vector-web/structures/RoomSubList.css similarity index 100% rename from src/skins/vector/css/organisms/RoomSubList.css rename to src/skins/vector/css/vector-web/structures/RoomSubList.css diff --git a/src/skins/vector/css/organisms/ViewSource.css b/src/skins/vector/css/vector-web/structures/ViewSource.css similarity index 100% rename from src/skins/vector/css/organisms/ViewSource.css rename to src/skins/vector/css/vector-web/structures/ViewSource.css diff --git a/src/skins/vector/css/atoms/ImageView.css b/src/skins/vector/css/vector-web/views/elements/ImageView.css similarity index 100% rename from src/skins/vector/css/atoms/ImageView.css rename to src/skins/vector/css/vector-web/views/elements/ImageView.css diff --git a/src/skins/vector/css/atoms/Spinner.css b/src/skins/vector/css/vector-web/views/elements/Spinner.css similarity index 100% rename from src/skins/vector/css/atoms/Spinner.css rename to src/skins/vector/css/vector-web/views/elements/Spinner.css diff --git a/src/skins/vector/css/molecules/MatrixToolbar.css b/src/skins/vector/css/vector-web/views/globals/MatrixToolbar.css similarity index 100% rename from src/skins/vector/css/molecules/MatrixToolbar.css rename to src/skins/vector/css/vector-web/views/globals/MatrixToolbar.css diff --git a/src/skins/vector/css/atoms/MessageTimestamp.css b/src/skins/vector/css/vector-web/views/messages/MessageTimestamp.css similarity index 100% rename from src/skins/vector/css/atoms/MessageTimestamp.css rename to src/skins/vector/css/vector-web/views/messages/MessageTimestamp.css diff --git a/src/skins/vector/css/molecules/SenderProfile.css b/src/skins/vector/css/vector-web/views/messages/SenderProfile.css similarity index 100% rename from src/skins/vector/css/molecules/SenderProfile.css rename to src/skins/vector/css/vector-web/views/messages/SenderProfile.css diff --git a/src/skins/vector/css/molecules/RoomDropTarget.css b/src/skins/vector/css/vector-web/views/rooms/RoomDropTarget.css similarity index 100% rename from src/skins/vector/css/molecules/RoomDropTarget.css rename to src/skins/vector/css/vector-web/views/rooms/RoomDropTarget.css diff --git a/src/skins/vector/css/molecules/RoomTooltip.css b/src/skins/vector/css/vector-web/views/rooms/RoomTooltip.css similarity index 100% rename from src/skins/vector/css/molecules/RoomTooltip.css rename to src/skins/vector/css/vector-web/views/rooms/RoomTooltip.css diff --git a/src/skins/vector/css/molecules/SearchBar.css b/src/skins/vector/css/vector-web/views/rooms/SearchBar.css similarity index 100% rename from src/skins/vector/css/molecules/SearchBar.css rename to src/skins/vector/css/vector-web/views/rooms/SearchBar.css