Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into admi…
Browse files Browse the repository at this point in the history
…n-refactor
  • Loading branch information
tassoevan committed May 5, 2020
2 parents e009ec8 + 0b1b0c2 commit d8a89cd
Show file tree
Hide file tree
Showing 8 changed files with 457 additions and 56 deletions.
2 changes: 1 addition & 1 deletion .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ raix:ui-dropped-event

rocketchat:tap-i18n
underscore@1.0.10
juliancwirko:postcss
littledata:synced-cron

edgee:slingshot
Expand All @@ -93,5 +92,6 @@ webapp@1.8.0
webapp-hashing@1.0.9
rocketchat:oauth2-server
rocketchat:i18n
rocketchat:postcss
dandv:caret-position
facts-base
3 changes: 1 addition & 2 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ jparker:crypto-core@0.1.0
jparker:crypto-md5@0.1.1
jparker:gravatar@0.5.1
jquery@1.11.11
juliancwirko:postcss@2.0.3
kadira:blaze-layout@2.3.0
kadira:flow-router@2.12.1
keepnox:perfect-scrollbar@0.6.8
Expand Down Expand Up @@ -126,6 +125,7 @@ rocketchat:i18n@0.0.1
rocketchat:livechat@0.0.1
rocketchat:mongo-config@0.0.1
rocketchat:oauth2-server@2.1.0
rocketchat:postcss@1.0.0
rocketchat:streamer@1.1.0
rocketchat:tap-i18n@1.9.1
rocketchat:version@1.0.0
Expand All @@ -144,7 +144,6 @@ templating@1.3.2
templating-compiler@1.3.3
templating-runtime@1.3.2
templating-tools@1.1.2
tmeasday:check-npm-versions@0.3.2
tracker@1.2.0
twitter-oauth@1.2.0
typescript@3.7.5
Expand Down
4 changes: 2 additions & 2 deletions app/theme/client/imports/general/base_old.css
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@ rc-old select,
}

.rc-old .new-room-highlight a {
animation: highlight 2s infinite;
animation: highlight 6s infinite;
}

.rc-old .fixed-title {
Expand Down Expand Up @@ -2649,7 +2649,7 @@ rc-old select,
}

&.highlight {
animation: highlight 3s;
animation: highlight 6s;
}

&:nth-child(1) {
Expand Down
Loading

0 comments on commit d8a89cd

Please sign in to comment.