Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NEW] Rocket.Chat UI Redesign #7643

Merged
merged 228 commits into from
Aug 14, 2017
Merged
Show file tree
Hide file tree
Changes from 199 commits
Commits
Show all changes
228 commits
Select commit Hold shift + click to select a range
8e5fd7f
add new variables to db
May 31, 2017
a06c861
render colors
ggazzo May 31, 2017
bbd9d85
fix observer
ggazzo May 31, 2017
98a5e80
.
Jun 1, 2017
f591d30
Fix sending 'property' field setting to client on update
sampaiodiego Jun 1, 2017
3f3b209
final dynamicCss injector
Jun 1, 2017
72f3f46
change sidebar background color
Jun 1, 2017
9951e53
account-box
Jun 1, 2017
4d752f3
sidebar style
Jun 1, 2017
49cbcb4
forms
Jun 6, 2017
807eb3a
sidebar rooms-list
Jun 8, 2017
d3a51ad
Merge branch 'color-variables' of https://github.com/RocketChat/Rocke…
ggazzo Jun 8, 2017
95d1e09
wrap old css
ggazzo Jun 8, 2017
fabacf1
sidebar style
Jun 8, 2017
28f7b16
unread group
ggazzo Jun 8, 2017
5cce44c
Merge branch 'color-variables' of https://github.com/RocketChat/Rocke…
ggazzo Jun 8, 2017
17dfe01
fix the problem about same room on unread and another list
ggazzo Jun 9, 2017
7eb97aa
user avatar
Jun 9, 2017
6b73cd8
rc-tooltip
ggazzo Jun 9, 2017
62fe72e
svg
Jun 9, 2017
968b659
tooltip
Jun 10, 2017
619d123
fix name/username height
Jun 10, 2017
bbc660c
swipe to open menu
ggazzo Jun 12, 2017
229b5a5
close menu on click body
ggazzo Jun 12, 2017
36dabc0
popover
Jun 13, 2017
80ee07e
popover
Jun 13, 2017
c86b879
fix room icons
Jun 13, 2017
87ba549
fix popover margin
Jun 14, 2017
503d010
fix sidebar
ggazzo Jun 14, 2017
84de5da
fix popover margin
Jun 14, 2017
c279300
font-weigth adjustment
Jun 14, 2017
6e6f829
sidebar
ggazzo Jun 16, 2017
9153920
merge
ggazzo Jun 16, 2017
a63f37c
merge develop
karlprieb Jun 16, 2017
efe5617
sidebar adjustments and new flexnav
karlprieb Jun 16, 2017
2a81e32
develop merge
karlprieb Jun 19, 2017
23fd756
fix toolbar search
karlprieb Jun 21, 2017
96a8b2b
just to sync
karlprieb Jun 22, 2017
00524d3
just to sync
karlprieb Jun 22, 2017
a106dea
sidebarItem
karlprieb Jun 22, 2017
c42936c
sort list by lastmessage
ggazzo Jun 22, 2017
2580b03
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo Jun 23, 2017
fca3fc1
fix sidebarItem
karlprieb Jun 23, 2017
ee78348
fix sidebar--flex opening
karlprieb Jun 23, 2017
52b43d6
subscriptions lastActivity
ggazzo Jun 23, 2017
c9033b9
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo Jun 23, 2017
6922be2
sort by activity dict
ggazzo Jun 23, 2017
63d2b27
fix chatroomitem
karlprieb Jun 23, 2017
b0a506f
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb Jun 23, 2017
8094cd9
create new channel page
karlprieb Jun 27, 2017
968c7ad
create channel
karlprieb Jun 28, 2017
c0d669a
create channel
karlprieb Jun 28, 2017
fa8cdb6
fix admin search
karlprieb Jun 28, 2017
1f187e4
create channel validation
ggazzo Jun 28, 2017
e6858c2
input error
karlprieb Jun 28, 2017
3e6f3d3
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb Jun 28, 2017
2da75ad
create channel calling the method, making the redirect and some impro…
ggazzo Jun 29, 2017
d5030d2
selectdropdown
ggazzo Jul 3, 2017
10fa852
rc-tags
karlprieb Jul 3, 2017
a293882
fix svg icons
karlprieb Jul 3, 2017
180a446
adjust font-weight
karlprieb Jul 3, 2017
7cdf0ba
fix memberslist
karlprieb Jul 3, 2017
512b350
Remove bundle-visualizer
karlprieb Jul 5, 2017
1f7150a
Merge branch 'develop' into color-variables
karlprieb Jul 5, 2017
73385f6
autocomplete
ggazzo Jul 5, 2017
a0204c4
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo Jul 5, 2017
9036dfe
remove some consts from autocomplete
karlprieb Jul 5, 2017
cc64898
change sidebar footer padding
karlprieb Jul 5, 2017
0bcd3c7
Add translated strings to "create new channel"
karlprieb Jul 5, 2017
6195689
Fix toolbar search and sidebar footer
karlprieb Jul 6, 2017
60d1b41
Fix paddings and username size
karlprieb Jul 6, 2017
2b7a7d4
filter roomTypes by condition
ggazzo Jul 6, 2017
a03a0a9
Fix account box and add items do livechat, my account and logout menu…
karlprieb Jul 6, 2017
1ad7c93
Fix login/register page height
karlprieb Jul 7, 2017
5b808f0
remove console.log
karlprieb Jul 7, 2017
f5c63b4
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into colo…
ggazzo Jul 7, 2017
d8d59ef
new account profile
ggazzo Jul 11, 2017
09e7d09
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into colo…
ggazzo Jul 13, 2017
75a186c
Add CircleCI
sampaiodiego Jul 16, 2017
402c3de
Remove lints from CI
sampaiodiego Jul 16, 2017
0ffc117
Add phantom hack
sampaiodiego Jul 16, 2017
8db769f
Add remove Docker
sampaiodiego Jul 16, 2017
89b2675
Fix Docker build and add $HOME .meteor to cache
sampaiodiego Jul 16, 2017
86ea519
Fix yml
sampaiodiego Jul 16, 2017
cd9c7af
Remove $HOME .meteor from cache
sampaiodiego Jul 16, 2017
7eeacd7
Fix CircleCI Dockerfile
sampaiodiego Jul 16, 2017
f418d48
Fix Dockerfile
sampaiodiego Jul 16, 2017
e841298
Filter CircleCI to build only color-variables branch
sampaiodiego Jul 18, 2017
39bfbbf
message box
ggazzo Jul 24, 2017
d98c14d
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo Jul 24, 2017
ac676d5
Merge branch 'develop' into color-variables
karlprieb Jul 24, 2017
6e79b6d
grid
karlprieb Jul 24, 2017
70c8e97
Merge branch 'fix-emojis' into color-variables
karlprieb Jul 24, 2017
fe7d775
Merge branch 'remove-sanstorm-login-method' of github.com:RocketChat/…
ggazzo Jul 24, 2017
4fc85eb
Merge branch 'remove-sanstorm-login-method' into color-variables
karlprieb Jul 24, 2017
21ca3b6
smile icon
karlprieb Jul 24, 2017
8c2cf18
message box popover
karlprieb Jul 25, 2017
38c0d8b
profile details
ggazzo Jul 25, 2017
35bf105
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo Jul 25, 2017
1fce50f
firt implementation of md on textarea
ggazzo Jul 26, 2017
0070062
fix width main content, messagebox autogrow transition
ggazzo Jul 27, 2017
e53a977
Merge branch 'develop' into color-variables
karlprieb Jul 28, 2017
76c0253
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb Jul 28, 2017
eeea651
fix editing color messagebox
ggazzo Jul 31, 2017
03d0c4c
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo Jul 31, 2017
c7371a2
custom fields on profile configs
ggazzo Jul 31, 2017
adc6e69
fix channel list new users
ggazzo Jul 31, 2017
a3c5472
md commands undo
ggazzo Jul 31, 2017
24950af
messageBox actions
karlprieb Aug 1, 2017
4bf5a46
messageBox actions startup
karlprieb Aug 1, 2017
fddaedc
messageBox actions
ggazzo Aug 1, 2017
519501a
message actions filtered by conditions
ggazzo Aug 1, 2017
1378bdd
fix bold
karlprieb Aug 1, 2017
b7a3b18
fix spaces between groups (messagebox)
ggazzo Aug 1, 2017
5fd408d
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo Aug 1, 2017
619c920
markdown helper icons
karlprieb Aug 1, 2017
cef0ce3
markdown helper icons align
karlprieb Aug 1, 2017
890ccb6
fix reply and quote message
ggazzo Aug 2, 2017
22d38ed
rename selectedText
ggazzo Aug 2, 2017
e0631f7
Remove markdown on toolbar click
sampaiodiego Aug 2, 2017
8b0a46a
fileupload message box action
karlprieb Aug 2, 2017
8386f57
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb Aug 2, 2017
32ce2a8
Remove markdown even if nothing selected
sampaiodiego Aug 2, 2017
9bec704
fix cmd + k loses element focus and throws Uncaught TypeError: Cannot…
ggazzo Aug 2, 2017
eba29af
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo Aug 2, 2017
e6eb546
close popover on file upload
karlprieb Aug 2, 2017
1e00401
fix stylelint
karlprieb Aug 2, 2017
e080e0d
Notify new build
sampaiodiego Aug 3, 2017
b3cc053
Fix notify
sampaiodiego Aug 3, 2017
29bb7fc
fix emojipicker
ggazzo Aug 3, 2017
713b4e6
Fix notify
sampaiodiego Aug 3, 2017
d395d7a
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo Aug 3, 2017
e3708a0
Merge branch 'develop' into color-variables
karlprieb Aug 3, 2017
bfd7544
move messageBoxActions startup to ui-message package
karlprieb Aug 3, 2017
07b491b
fix username overlay
karlprieb Aug 3, 2017
d0645fd
remove admin menu icons
karlprieb Aug 3, 2017
1b385ad
action audio and video
ggazzo Aug 3, 2017
a71e2ec
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo Aug 3, 2017
02cb915
fix livechat layout
karlprieb Aug 3, 2017
c86df34
fix codacy
karlprieb Aug 3, 2017
bb3d361
fix flextab on mobile
karlprieb Aug 3, 2017
e926f57
align markdown helpers
karlprieb Aug 3, 2017
f388096
fix private room icon
karlprieb Aug 3, 2017
ffaa607
fix eslint
karlprieb Aug 4, 2017
d3905bf
fix tab on sidenav
ggazzo Aug 4, 2017
08dcc73
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo Aug 4, 2017
5610bbb
fix avatar upload icons and add burger menu back
karlprieb Aug 4, 2017
bc0d898
fix Channel preview mode hint is broken
ggazzo Aug 4, 2017
5cf694d
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo Aug 4, 2017
180459a
remove 22 char channel name limit
karlprieb Aug 4, 2017
b1fbdd1
add send icon
karlprieb Aug 4, 2017
ec71dcc
add editing message background
karlprieb Aug 4, 2017
c3ec2ec
send button
ggazzo Aug 4, 2017
86b384a
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo Aug 4, 2017
fe602fb
fix safari
karlprieb Aug 4, 2017
137884e
try to fix tests
MartinSchoeler Aug 4, 2017
35477ed
fix dark overlay not being removed
MartinSchoeler Aug 4, 2017
51cb924
text ellipsis, alert offline
ggazzo Aug 4, 2017
7200238
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo Aug 4, 2017
01c02e0
css variables
karlprieb Aug 4, 2017
7af89f7
Fix Burger Menu Not Showing
MartinSchoeler Aug 7, 2017
4859f79
add @media to last commit
MartinSchoeler Aug 7, 2017
75141e2
fix empty messagebox action menu
MartinSchoeler Aug 7, 2017
bbc4240
fix identation
MartinSchoeler Aug 7, 2017
27c0b61
message box readonly and blocked
ggazzo Aug 7, 2017
0392572
remove less files
karlprieb Aug 7, 2017
74c3523
user status color
karlprieb Aug 7, 2017
24ab3c5
fix offline users on search
ggazzo Aug 7, 2017
2af44c8
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
ggazzo Aug 7, 2017
5ffcd90
focus on messagebox
ggazzo Aug 7, 2017
dce3f2d
fix status on channel
ggazzo Aug 7, 2017
b6cfa7c
fix anonymous user preferences
MartinSchoeler Aug 7, 2017
f3aa6e0
variables
karlprieb Aug 7, 2017
9dd4b69
fix Accounts_AllowUserAvatarChange setting
MartinSchoeler Aug 7, 2017
c8dc6ac
update sidebar-item variables
karlprieb Aug 7, 2017
f955d28
fix merge
ggazzo Aug 7, 2017
98d23ad
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb Aug 7, 2017
bfe3fb3
update modal variables
karlprieb Aug 7, 2017
2184b54
update avatar variables
karlprieb Aug 7, 2017
d645ad8
update badge variables
karlprieb Aug 7, 2017
da79322
update flexnav variables
karlprieb Aug 7, 2017
3fb24f2
update popover variables
karlprieb Aug 7, 2017
1e45ecb
update tooltip variables
karlprieb Aug 7, 2017
04d9978
fix accountbox colors
karlprieb Aug 7, 2017
62825ee
fix input colors
karlprieb Aug 7, 2017
b7a527b
fix button variables
karlprieb Aug 7, 2017
b805059
fix popup-list variables
karlprieb Aug 7, 2017
00d55d4
fix select-avatar variables
karlprieb Aug 7, 2017
eeb1edb
fix tags variables
karlprieb Aug 7, 2017
9f19484
fix variables and remove dynamic-css inject
karlprieb Aug 7, 2017
8e1e069
fix error Unexpected trailing comma comma-dangle
engelgabriel Aug 8, 2017
36bba3b
variable customization
ggazzo Aug 8, 2017
32e3760
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo Aug 8, 2017
71e5310
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo Aug 8, 2017
c96aab2
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb Aug 8, 2017
6c48d0d
Merge branch 'develop' into color-variables
karlprieb Aug 8, 2017
2aa991f
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo Aug 8, 2017
0ba4e4b
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb Aug 8, 2017
26ae0b1
Merge branch 'develop' into color-variables
karlprieb Aug 8, 2017
a0bc613
fix unexpected token
MartinSchoeler Aug 9, 2017
15b35ec
Fix some review requests
karlprieb Aug 9, 2017
6bbdff2
Fix arrow not turning
MartinSchoeler Aug 9, 2017
a13e7a5
Merge remote-tracking branch 'origin/color-variables' into color-vari…
MartinSchoeler Aug 9, 2017
01c9fd5
use new naming
MartinSchoeler Aug 9, 2017
3b82e67
fix Waiting for server connection alert
MartinSchoeler Aug 9, 2017
a47886b
fix tests
MartinSchoeler Aug 9, 2017
a327f39
fix katex link
karlprieb Aug 9, 2017
ca37bc8
fix room icon alignment
karlprieb Aug 9, 2017
1b88be3
added Karl and Gazzo to contributors list
karlprieb Aug 9, 2017
b5f6de2
auto focus, activity order
ggazzo Aug 9, 2017
3ef36d0
Merge remote-tracking branch 'origin/color-variables' into color-vari…
ggazzo Aug 9, 2017
b2428f5
remove unused code
karlprieb Aug 9, 2017
ae1ab81
font-weight
karlprieb Aug 9, 2017
6443059
change livechat icons
karlprieb Aug 9, 2017
4d241e4
fix eslint errors
karlprieb Aug 9, 2017
6f0d1a7
Fix Livechat icon height
MartinSchoeler Aug 10, 2017
468f080
Merge branch 'develop' into color-variables
MartinSchoeler Aug 10, 2017
f5393b5
fix removed package
MartinSchoeler Aug 10, 2017
77c6c23
change icons
karlprieb Aug 11, 2017
a38c663
fix tests
MartinSchoeler Aug 11, 2017
b743193
fix icons
karlprieb Aug 11, 2017
7a31237
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb Aug 11, 2017
0a9d965
fix tests again
MartinSchoeler Aug 11, 2017
d2a7b4e
add menu icon to account-box
karlprieb Aug 11, 2017
cde6f59
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat i…
karlprieb Aug 11, 2017
4af2012
remove arrow size variable
karlprieb Aug 11, 2017
ff2d308
fix tests
MartinSchoeler Aug 11, 2017
22ce7e9
Merge remote-tracking branch 'origin/color-variables' into color-vari…
MartinSchoeler Aug 11, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .circleci/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM node:4

ADD . /app

ENV RC_VERSION=0.57.0-designpreview \
DEPLOY_METHOD=docker \
NODE_ENV=production \
PORT=3000 \
ROOT_URL=http://localhost:3000

RUN set -x \
&& cd /app/bundle/programs/server \
&& npm install \
&& npm cache clear

WORKDIR /app/bundle

EXPOSE 3000

CMD ["node", "main.js"]
77 changes: 77 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# Javascript Node CircleCI 2.0 configuration file
#
# Check https://circleci.com/docs/2.0/language-javascript/ for more details
#
version: 2
jobs:
build:
docker:
# specify the version you desire here
- image: circleci/node:7.10

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
# - image: circleci/mongo:3.4.4

working_directory: ~/repo

steps:
- checkout

- run:
name: Install Meteor
command: if [ ! -e "$HOME/.meteor/meteor" ]; then curl https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh; fi
filters:
branches:
only: color-variables

# Download and cache dependencies
- restore_cache:
key: dependency-cache-{{ checksum "package.json" }}
filters:
branches:
only: color-variables

- run:
name: Build Rocket.Chat
command: |
meteor npm install
set +e
meteor add rocketchat:lib
set -e
meteor build --server-only --directory /tmp/build
filters:
branches:
only: color-variables

- save_cache:
key: dependency-cache-{{ checksum "package.json" }}
paths:
- ./node_modules
- ./.meteor
- $HOME/.meteor
filters:
branches:
only: color-variables

- setup_remote_docker

- run:
name: Build Docker image
command: |
docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
cp .circleci/Dockerfile /tmp/build
cd /tmp/build
docker build -t rocketchat/rocket.chat:designpreview .
docker push rocketchat/rocket.chat:designpreview
filters:
branches:
only: color-variables
- run:
name: Notify on demo
command: |
curl -X POST -H 'Content-Type: application/json' --data "{\"text\":\"@here Nova [build](${CIRCLE_BUILD_URL}) pronta :marioparty:\"}" $WEBHOOK_URL
filters:
branches:
only: color-variables
5 changes: 5 additions & 0 deletions .postcssrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"plugins": {
"postcss-smart-import": {},
"postcss-cssnext": {
"features": {
"customProperties": {
"preserve": true
}
},
"browsers": [
"ie > 10",
"last 2 Edge versions",
Expand Down
221 changes: 219 additions & 2 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"rules": {
"plugins": [
"stylelint-order"
],
"rules": {
"at-rule-empty-line-before": [ "always", {
except: [
"blockless-after-same-name-blockless",
Expand Down Expand Up @@ -43,7 +46,6 @@
"declaration-colon-newline-after": "always-multi-line",
"declaration-colon-space-after": "always-single-line",
"declaration-colon-space-before": "never",
"declaration-empty-line-before": "never",
"font-family-no-duplicate-names": true,
"function-calc-no-unspaced-operator": true,
"function-comma-newline-after": "always-multi-line",
Expand Down Expand Up @@ -107,5 +109,220 @@
"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never",
"value-list-max-empty-lines": 0,
"order/properties-order": [
[
{
"emptyLineBefore": "always",
"order": "strict",
"properties": [
"position",
"z-index",
"top",
"right",
"bottom",
"left"
]
},
{
"emptyLineBefore": "always",
"order": "strict",
"properties": [
"display",
"visibility",
"float",
"clear",
"overflow",
"overflow-x",
"overflow-y",
"clip",
"zoom",
"flex-direction",
"flex-order",
"flex-pack",
"flex-align",
"flex"
]
},
{
"emptyLineBefore": "always",
"order": "strict",
"properties": [
"box-sizing",
"width",
"min-width",
"max-width",
"height",
"min-height",
"max-height",
"margin",
"margin-top",
"margin-right",
"margin-bottom",
"margin-left",
"padding",
"padding-top",
"padding-right",
"padding-bottom",
"padding-left"
]
},
{
"emptyLineBefore": "always",
"order": "strict",
"properties": [
"table-layout",
"empty-cells",
"caption-side",
"border-spacing",
"border-collapse",
"list-style",
"list-style-position",
"list-style-type",
"list-style-image"
]
},
{
"emptyLineBefore": "always",
"order": "strict",
"properties": [
"content",
"quotes",
"counter-reset",
"counter-increment",
"resize",
"cursor",
"user-select",
"nav-index",
"nav-up",
"nav-right",
"nav-down",
"nav-left",
"transition",
"transition-delay",
"transition-timing-function",
"transition-duration",
"transition-property",
"transform",
"transform-origin",
"animation",
"animation-name",
"animation-duration",
"animation-play-state",
"animation-timing-function",
"animation-delay",
"animation-iteration-count",
"animation-direction",
"text-align",
"text-align-last",
"vertical-align",
"white-space",
"text-decoration",
"text-emphasis",
"text-emphasis-color",
"text-emphasis-style",
"text-emphasis-position",
"text-indent",
"text-justify",
"text-transform",
"letter-spacing",
"word-spacing",
"text-outline",
"text-transform",
"text-wrap",
"text-overflow",
"text-overflow-ellipsis",
"text-overflow-mode",
"word-wrap",
"word-break",
"tab-size",
"hyphens",
"pointer-events"
]
},
{
"emptyLineBefore": "always",
"order": "strict",
"properties": [
"opacity",
"filter:progid:DXImageTransform.Microsoft.Alpha(Opacity",
"color",
"border",
"border-collapse",
"border-width",
"border-style",
"border-color",
"border-top",
"border-top-width",
"border-top-style",
"border-top-color",
"border-right",
"border-right-width",
"border-right-style",
"border-right-color",
"border-bottom",
"border-bottom-width",
"border-bottom-style",
"border-bottom-color",
"border-left",
"border-left-width",
"border-left-style",
"border-left-color",
"border-radius",
"border-top-left-radius",
"border-top-right-radius",
"border-bottom-right-radius",
"border-bottom-left-radius",
"border-image",
"border-image-source",
"border-image-slice",
"border-image-width",
"border-image-outset",
"border-image-repeat",
"outline",
"outline-width",
"outline-style",
"outline-color",
"outline-offset",
"background",
"filter:progid:DXImageTransform.Microsoft.AlphaImageLoader",
"background-color",
"background-image",
"background-repeat",
"background-attachment",
"background-position",
"background-position-x",
"background-position-y",
"background-clip",
"background-origin",
"background-size",
"box-decoration-break",
"box-shadow",
"filter:progid:DXImageTransform.Microsoft.gradient",
"text-shadow"
]
},
{
"emptyLineBefore": "always",
"order": "strict",
"properties": [
"font",
"font-family",
"font-size",
"font-weight",
"font-style",
"font-variant",
"font-size-adjust",
"font-stretch",
"font-effect",
"font-emphasize",
"font-emphasize-position",
"font-emphasize-style",
"font-smooth",
"line-height"
]
}
],
{ unspecified: "bottomAlphabetical" }
]
}
}
19 changes: 11 additions & 8 deletions client/routes/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ FlowRouter.route('/home', {
}
});

FlowRouter.route('/changeavatar', {
name: 'changeAvatar',

action() {
BlazeLayout.render('main', {center: 'avatarPrompt'});
}
});
// FlowRouter.route('/changeavatar', {
// name: 'changeAvatar',
//
// action() {
// BlazeLayout.render('main', {center: 'avatarPrompt'});
// }
// });
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove commented code


FlowRouter.route('/account/:group?', {
name: 'account',
Expand All @@ -85,7 +85,10 @@ FlowRouter.route('/account/:group?', {
}
params.group = _.capitalize(params.group, true);
BlazeLayout.render('main', { center: `account${ params.group }` });
}
},
triggersExit: [function() {
$('.main-content').addClass('rc-old');
}]
});

FlowRouter.route('/history/private', {
Expand Down
Loading