e4fcf24f44
Merge remote-tracking branch 'origin/develop' into develop
2017-11-14 18:03:13 +00:00
bea95fde3a
Merge pull request #5567 from vector-im/rxl881/mixedContentWarnings
...
Center mixed content warnings in panel.
2017-11-14 18:03:08 +00:00
cf2850834e
Add apps drawer bottom margin.
2017-11-14 17:32:01 +00:00
e3bdcf4d0d
Remove unused edit_white icon
2017-11-14 15:42:29 +00:00
940f229102
Fix edit icon colors and add green edit icon.
2017-11-14 15:20:57 +00:00
a22cd487a0
Merge remote-tracking branch 'origin/develop' into develop
2017-11-14 15:17:41 +00:00
69b8ff8668
add fixme
2017-11-14 15:17:32 +00:00
03f1f7f75a
Merge remote-tracking branch 'origin/develop' into develop
2017-11-14 14:31:22 +00:00
e540fd40cb
Translated using Weblate (Slovak)
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
2017-11-14 14:31:21 +00:00
a7a9433ef9
fix 2ndary accent color on dark on FF
...
fixes https://github.com/vector-im/riot-web/issues/5583
2017-11-14 14:31:15 +00:00
977599a660
Use the SettingsStore to get the theme
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 13:14:29 -07:00
7570ce580f
Merge branch 'develop' into travis/granular
2017-11-13 12:25:56 -07:00
564ea8bfb2
Merge remote-tracking branch 'origin/develop' into develop
2017-11-13 19:22:44 +00:00
261f91da6e
Translated using Weblate (German)
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-11-13 19:22:44 +00:00
809dd0856f
add more fixmes
2017-11-13 16:35:39 +00:00
0a80774066
unstatusify redirects
2017-11-13 16:26:26 +00:00
5abee4fddc
replace some of the status.im theme with general config options
2017-11-11 23:47:03 +00:00
47d9e7f2a1
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-10 15:29:37 -08:00
d7ceddfe61
Revert unintended merge commit.
2017-11-10 21:43:34 +00:00
42bb54b202
Set widget menu bar background colour.
2017-11-10 21:41:35 +00:00
7a42e844d1
Remove unused styling.
2017-11-10 20:16:32 +00:00
43fb359d8f
Vertically align menu bar items.
2017-11-10 20:12:30 +00:00
31e0cde900
Improve hover border.
2017-11-10 20:12:12 +00:00
53143cb033
Center icons in menu bar.
2017-11-10 17:26:57 +00:00
7eeb7babc4
White edit icon (to avoid having to use css filters to invert).
2017-11-10 17:26:33 +00:00
883ec159e2
Add yellow warning triangle image.
2017-11-10 17:25:56 +00:00
1b21b8cce2
Merge remote-tracking branch 'origin/develop' into develop
2017-11-10 16:24:25 +00:00
83373bcf6e
Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/visualCue
2017-11-10 16:22:33 +00:00
29abb5eed0
Center mixed content warnings in panel.
2017-11-10 16:15:31 +00:00
277a6dee10
Make groups a fully-fleged baked-in feature
2017-11-10 15:38:50 +00:00
71d0ecf37d
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2017-11-10 14:14:56 +00:00
cf1beb1d94
Fix right marign.
2017-11-10 00:16:41 +00:00
bfa4f59f3d
Lint space.
2017-11-09 22:47:23 +00:00
63f520b5ee
Fix app tile margins.
2017-11-09 22:45:35 +00:00
a0b0b6f053
Merge pull request #5549 from vector-im/rxl881/roomTopic
...
Fix wrapping of long room topics (and overlap with apps)
2017-11-09 17:40:55 +00:00
88cd46bfcf
Merge pull request #5555 from vector-im/rxl881/widgetrendering
...
Don't display widget iframes whilst loading.
2017-11-09 17:36:56 +00:00
1f524f3085
Translated using Weblate (Slovak)
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
2017-11-09 16:49:31 +00:00
405504dca4
Translated using Weblate (Polish)
...
Currently translated at 98.6% (214 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
2017-11-09 16:49:31 +00:00
2bb13fba7e
Translated using Weblate (Czech)
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
2017-11-09 15:53:39 +00:00
d45940f204
Don't display widget iframes whilst loading.
2017-11-09 10:02:00 +00:00
81b085fbb8
Translated using Weblate (Galician)
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
2017-11-09 06:21:33 +00:00
910a5f7e6c
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2017-11-08 22:56:35 +00:00
092ec1cc6c
Prevent long topics from overflowing fixed height header.
2017-11-08 20:03:35 +00:00
106430f7b6
Move margin to AppTile elements so that it is only present with app tiles.
...
Comment unused classes.
2017-11-08 19:48:53 +00:00
76570a0f14
Make long topics overflow in to a second, hidden column.
2017-11-08 17:02:17 +00:00
e7fbad2236
Increase height to avoid content from overflowing (mx_RoomHeader_name.height + mx_RoomHeader_topic.max-height)
2017-11-08 16:44:45 +00:00
2fa1f16284
use new theme-aware tinter api
2017-11-08 06:55:30 -08:00
d4128af224
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-08 04:29:44 -08:00
e90419e40d
Translated using Weblate (Slovak)
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
2017-11-08 12:11:57 +00:00
16991a8f68
Added translation using Weblate (Slovak)
2017-11-08 12:10:20 +00:00
b788e759da
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 10:24:01 +00:00
3ee45b21b8
Merge pull request #5543 from vector-im/luke/groups-inviter-profile
...
Adjust CSS for GroupView
2017-11-08 10:23:57 +00:00
8af90b052b
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 10:04:44 +00:00
60de1dbffb
Merge pull request #5546 from vector-im/luke/groups-add-rooms-with-visibility
...
CSS for adding rooms to a group with visibility
2017-11-08 10:04:38 +00:00
38b5b27aa9
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 18:52:43 +00:00
26d9677bbe
CSS for adding rooms to a group with visibility
...
Also, make chat invite error looks slightly more normal
2017-11-07 18:49:28 +00:00
beddf3a2cb
Get rid of accidental merge stuff
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-07 11:05:29 -07:00
144cbd144e
Merge branch 'develop' into travis/more-pinned-css
2017-11-07 11:04:22 -07:00
1bdc666197
Adjust CSS for GroupView
...
Part of showing the group inviter profile: https://github.com/matrix-org/matrix-react-sdk/pull/1585
2017-11-07 16:43:02 +00:00
a72cc77e24
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 15:54:51 +00:00
4c22f9a549
Translated using Weblate (German)
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-11-07 15:54:50 +00:00
4c0e956cc1
Name things in a sane way
2017-11-07 15:13:17 +00:00
e1d16acddb
Implement general-purpose tooltip "(?)"-style
2017-11-07 14:09:04 +00:00
a45ae588e5
Translated using Weblate (German)
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-11-07 13:34:54 +00:00
c8edaf1ba9
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 10:44:07 +00:00
aa4feb0563
Info plinth CSS variables
2017-11-06 18:57:08 +00:00
d87d6cbc64
CSS for improving group creation UX, namely setting long description
2017-11-06 18:38:47 +00:00
3633f55e20
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 15:49:46 +00:00
a8bdde9f55
Merge pull request #5531 from vector-im/dbkr/composer_at_room_pills
...
CSS for room notif pills in composer
2017-11-06 15:49:41 +00:00
e1eba559fe
CSS for room notif pills in composer
2017-11-06 15:12:28 +00:00
01401fe4f8
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 14:10:32 +00:00
ba1ab9bdd1
Translated using Weblate (Ukrainian)
...
Currently translated at 99.5% (216 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
2017-11-06 14:10:32 +00:00
25782404d4
Translated using Weblate (German)
...
Currently translated at 98.6% (214 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-11-06 14:10:32 +00:00
cd26f63315
Do not init a group store when no groupId specified
...
(in RightPanel), otherwise the store will happily send requests to the server for the `undefined` group.
2017-11-06 10:16:03 +00:00
68bb61d281
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2017-11-05 18:49:35 +00:00
63607f29e7
Use SettingsStore for notification settings
...
Signed-off-by: Travis Ralstron <travpc@gmail.com>
2017-11-04 22:27:34 -07:00
d14285eb08
fix secondary accent color tinting
2017-11-05 02:20:12 +00:00
555847e5e9
make default theme actually work
2017-11-05 00:40:13 +00:00
816042d3a8
Merge branch 'develop' into matthew/status
2017-11-04 23:51:20 +00:00
9a0bbfb871
tint the colours in the theme rather than hardcode vector green
2017-11-04 23:43:34 +00:00
adedf23cfb
remove unnamespaced CSS fail
2017-11-04 22:19:06 +00:00
b4b4fefffb
Translated using Weblate (Russian)
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-11-04 08:11:22 +00:00
2b49b68ba5
Translated using Weblate (French)
...
Currently translated at 100.0% (217 of 217 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-11-04 07:26:28 +00:00
69939e2fe3
Merge branch 'develop' into travis/granular
2017-11-03 21:56:46 -06:00
5a1498dec3
CSS for pinned indicators
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 20:01:54 -06:00
441aa91831
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 23:10:35 +00:00
31c5122fa6
Merge pull request #5293 from turt2live/travis/pinned-led-css
...
CSS for new pinned events indicator
2017-11-03 23:10:31 +00:00
f290569487
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 23:10:05 +00:00
c0b343c89f
Merge pull request #5471 from vector-im/t3chguy/devtools-1
...
T3chguy/devtools 1
2017-11-03 23:10:00 +00:00
a42414eabd
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 22:44:46 +00:00
c90834114b
Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms
...
Use margin to separate "perms" in the room directory
2017-11-03 22:44:41 +00:00
038b3ed1eb
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 16:14:59 +00:00
290a501523
Use prefixed class names to avoid collisions with other libraries
2017-11-03 16:02:25 +00:00
67bc346ebb
Add CSS for CreateGroupDialog to give group ID input suffix and prefix style
2017-11-03 15:39:24 +00:00
923295973b
Merge branch 'develop' into matthew/status
2017-11-03 15:11:23 +00:00
8518e2b056
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 14:40:10 +00:00
04c866ce9c
Fix #5359 - unbreakable topics not breaking
...
The room directory CSS has `word-break: break-word` applied to the entire mx_RoomDirectory, which is questionable. For now, add the same rule to RoomDetailList
2017-11-03 14:39:24 +00:00
f59ea648f0
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 14:11:16 +00:00
3192c345be
rethemedex
...
Needed, having removed _GroupInviteTile.scss
2017-11-03 14:11:07 +00:00
6432792d86
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 13:54:01 +00:00
Weblate