Merged in styles (pull request #2)

Styles

package.json

@@ -112,7 +112,7 @@
     "supertest": "^3.1.0"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.49",
+    "@babel/runtime": "^7.0.0-beta.55",
     "@google-cloud/language": "^1.2.0",
     "@google-cloud/storage": "^1.7.0",
     "@google-cloud/vision": "^0.19.0",

packages/rocketchat-assets/server/assets.js

@@ -16,7 +16,8 @@ this.RocketChatAssetsInstance = RocketChatAssetsInstance;
 const assets = {
 	logo: {
 		label: 'logo (svg, png, jpg)',
-		defaultUrl: 'images/logo/logo.svg',
+		// defaultUrl: 'images/logo/logo.svg',
+		defaultUrl: 'images/logo/Logo_short.png',
 		constraints: {
 			type: 'image',
 			extensions: ['svg', 'png', 'jpg', 'jpeg'],

packages/rocketchat-lib/server/startup/settings.js

@@ -1627,7 +1627,7 @@ RocketChat.settings.addGroup('Layout', function() {
 			multiline: true,
 			public: true,
 		});
-		return this.add('Layout_Sidenav_Footer', '<a href="/home"><img src="assets/logo"/></a>', {
+		return this.add('Layout_Sidenav_Footer', '<a href="/home"><img src="images/logo/Logo.png"/></a>', {
 			type: 'code',
 			code: 'text/html',
 			public: true,

packages/rocketchat-theme/client/imports/general/base_old.css

@@ -4653,6 +4653,9 @@ body:not(.is-cordova) {
 	align-items: center;
 	flex-flow: row nowrap;
 
+	align-items: initial; /* Newly added */
+
+
 	& .wrapper {
 		position: relative;
 		z-index: 10;
@@ -4661,6 +4664,14 @@ body:not(.is-cordova) {
 		padding: 20px;
 
 		text-align: center;
+/* Newly added styles for ChatuRai app */
+		/* background-color: #00ffff; */
+		background-image:url('/images/bg_theme.png');
+		/* background: url(images/bg_theme.png) no-repeat center center; */
+		background-repeat:no-repeat;
+		background-size:cover;
+		background-position:center center;
+		/* Newly added styles for ChatuRai app */
 	}
 
 	& .logo {

packages/rocketchat-theme/client/imports/general/chaturai_theme.css

@@ -0,0 +1,126 @@
+.rc-old #login-card{
+  background: rgba(0,0,0,0.3);
+}
+
+.intl-tel-input.allow-dropdown .flag-container:hover .selected-flag{
+  background-color: rgba(0,0,0.5);
+}
+.intl-tel-input.separate-dial-code .selected-flag{
+  background-color: rgba(0,0,0,0.5);
+  color: #fff;
+}
+.intl-tel-input.separate-dial-code .selected-flag{
+  background: rgba(0,0,0,0.5) !important;
+}
+.intl-tel-input input, .intl-tel-input input[type=tel], .intl-tel-input input[type=text]{
+  color: #fff;
+}
+.rc-old.full-page .wrapper{
+  /* width: 200px;
+  height: 200px;   */
+  background-position: 0px 0px;
+  background-repeat: repeat-x;
+  background-size: contain;
+  animation: animatedBackground 80s linear infinite alternate; 
+  -webkit-transition: opacity 1s ease-in;
+  -moz-transition: opacity 1s ease-in;
+  -o-transition: opacity 1s ease-in;
+  transition: opacity 1s ease-in;
+}
+
+@keyframes animatedBackground {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 100% 0;
+  }
+}
+.rc-input__element#phoneNumber,.rc-input__element#otp{
+  color: #ffffff;
+}
+/* #animate-area {
+  width: 200px;
+  height: 200px;
+  background-image: url(http://placekitten.com/400/200);
+  background-position: 0px 0px;
+  background-repeat: repeat-x;
+  animation: animatedBackground 10s linear infinite alternate;
+} */
+.sidebar{
+  background-color: #fff;
+  border-right: 1px solid #f4f4f4;
+}
+.footer:not(:empty){
+  border-top:1px solid #f4f4f4;
+}
+.sidebar__footer{
+  border-top: 1px solid #f4f4f4;
+}
+
+.sidebar--medium .sidebar-item{
+  background-color: rebeccapurple;  
+
+/* 
+
+  background: rgb(170,7,107);
+background: -moz-linear-gradient(90deg, rgba(170,7,107,1) 0%, rgba(102,51,153,1) 100%);
+background: -webkit-linear-gradient(90deg, rgba(170,7,107,1) 0%, rgba(102,51,153,1) 100%);
+background: linear-gradient(90deg, rgba(170,7,107,1) 0%, rgba(102,51,153,1) 100%);
+filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#aa076b",endColorstr="#663399",GradientType=1); */
+
+
+background: rgb(170,7,107);
+background: -moz-linear-gradient(90deg, rgba(170,7,107,1) 0%, rgba(102,51,153,0.3071603641456583) 100%);
+background: -webkit-linear-gradient(90deg, rgba(170,7,107,1) 0%, rgba(102,51,153,0.3071603641456583) 100%);
+background: linear-gradient(90deg, rgba(170,7,107,1) 0%, rgba(102,51,153,0.3071603641456583) 100%);
+filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#aa076b",endColorstr="#663399",GradientType=1);
+}
+.sidebar--medium .sidebar-item:hover{
+  background-color: rgba(rebeccapurple,0.5);  
+}
+
+.rc-header__wrap{
+background: rgb(102,51,153);
+background: linear-gradient(90deg, rgba(102,51,153,1) 0%, rgba(170,7,107,1) 100%);
+color: #fff;
+}
+.sidebar__header{
+  background-color: #f4f4f4;
+  padding: 16px;
+  margin: 0;
+}
+.rc-header__name{
+  color: #fff;
+}
+.rc-room-actions__action.active, .rc-room-actions__action:hover, .rc-room-actions__more-action.active, .rc-room-actions__more-action:hover{
+  color: Gold;
+}
+.message{
+  background-color: #f4f4f4;
+}
+
+.message {
+  position: relative;
+  z-index: 1;
+  min-height: 40px;
+  padding: 15px 25px 15px 75px;
+  line-height: 20px;
+  margin: 10px 20px;
+  border-top-right-radius: 30px;
+  border-bottom-right-radius: 10px;
+  border-bottom-left-radius: 2px;
+  border-top-left-radius: 10px;
+  /* width: 50%; */
+}
+.sidebar-item{
+  color: #ffffff;
+  margin: 5px 7px;
+}
+.sidebar__header{
+  padding: 24px;
+}
+input[type="text"].rc-input__element#message-search{
+  color: #444;
+}
+.message-actions {top: 8px;right: 1.4rem;}

packages/rocketchat-theme/client/main.css

@@ -60,3 +60,6 @@
 
 /* RTL */
 @import 'imports/general/rtl.css';
+
+/* customized CSS file for Chaturai Theme */
+@import 'imports/general/chaturai_theme.css';

packages/rocketchat-theme/server/colors.less

@@ -957,3 +957,7 @@ label.required::after {
 		background-color: var(--rc-color-alert-message-warning);
 	}
 }
+
+.bg-transparant-color {
+	background-color: @bg-transparant-color;
+}

packages/rocketchat-theme/server/variables.js

@@ -40,6 +40,7 @@ const majorColors = {
 	'error-color': '#BC2031',
 	'selection-color': '#02ACEC',
 	'attention-color': '#9C27B0',
+	'bg-transparant-color':'transparant',
 };
 
 // Minor colours implement major colours by default, but can be overruled

packages/rocketchat-ui-login/client/login/form.html

@@ -10,10 +10,13 @@
 					<h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
 					<p>{{{_ "Wait_activation_warning"}}}</p>
 					<p>{{{_ "Please_wait_activation"}}}</p>
+
 				</header>
+
 			{{else}}
 				{{> loginServices }}
 				<div class="fields">
+					<h3 style="text-transform: uppercase;color: Gold; font-family: 'Comic Sans MS', cursive, sans-serif;font-weight: 800; word-spacing: 0.5em;">Connect with Friends</h3>
 					{{#if state 'otplogin'}}
 						<div class="rc-input">
 							<label class="rc-input__label" for="phoneNumber">

packages/rocketchat-ui-sidenav/client/sideNav.html

@@ -24,7 +24,10 @@
 				</div>
 			{{/if}}
 
-			<footer class="sidebar__footer">{{{footer}}}</footer>
+			<!-- <footer class="sidebar__footer">{{{footer}}}</footer> -->
+			<footer class="sidebar__footer">
+				<img src="images/Logo.png" alt="Chaturai App Logo">
+			</footer>
 		</aside>
 		<div class="sidebar-wrap"></div>
 </template>