gaelle morin
20e27997d6
fix: fix bugs due to merge
2020-05-29 18:12:29 +02:00
gaelle morin
b32cf018d5
bugfix : admin-circle-create - conflict resolved + accurate styles added + update of form.scss
2020-05-29 14:15:05 +02:00
gaelle morin
e72b5693b4
upate: Style for sib-form-autocompletion > select added
2020-05-29 14:15:05 +02:00
gaelle morin
ff12a9d68c
upate: margin of fieldset resolved
2020-05-29 14:15:05 +02:00
gaelle morin
581d89709d
upate: .no-sidebar separated into .no-sidebar + .with-padding
2020-05-29 14:15:03 +02:00
gaelle morin
e26b5f45f5
bugfix: icon of join buttons are aligned
2020-05-29 14:09:42 +02:00
gaelle morin
99bafed78c
update: useless for filters and how-to buttons files deleted
2020-05-29 14:09:42 +02:00
gaelle morin
85f7dfcb62
update: Main header responsive: start
2020-05-29 14:09:42 +02:00
gaelle morin
5e33021818
update: .customer-logo moved to main.scss
2020-05-29 14:09:42 +02:00
gaelle morin
5d69d1a4ee
update: .position-end and box-button are in the same class
2020-05-29 14:09:42 +02:00
gaelle morin
c950d27d47
update: css for form elements are outside the .with-form context
2020-05-29 14:09:42 +02:00
gaelle morin
56f9151345
update: flex class added in other files + %padding removed
2020-05-29 14:09:29 +02:00
gaelle morin
af1d40cbd4
update: classes for avatar, logo and flex added + css for elements from main header are outside the styles for that header
2020-05-29 14:07:44 +02:00
gaelle morin
21d078bda9
update: label for form reviewed + class added for input
2020-05-29 14:07:44 +02:00
gaelle morin
80d3a22cf6
update: clean-up form css
2020-05-29 14:07:44 +02:00
gaelle morin
e79ddc3f37
update: clean-up form css
2020-05-29 14:07:44 +02:00
gaelle morin
f9300d2120
bugfix: buttons in circle-admin
2020-05-29 14:07:44 +02:00
gaelle morin
f01f00732c
update: main css clean up
2020-05-29 14:07:44 +02:00
gaelle morin
3b6121ace9
update: useless styles removed from project-profile
2020-05-29 14:07:44 +02:00
gaelle morin
23412b691f
admin-header css file removed
2020-05-29 14:07:44 +02:00
gaelle morin
c6e4325b34
update: h3 used instead of a class
2020-05-29 14:07:44 +02:00
gaelle morin
6fed12bc01
update: comments added to user-thumb
2020-05-29 14:07:44 +02:00
gaelle morin
6fefd17c9b
update: frameworkisation of user-thumb
2020-05-29 14:07:44 +02:00
gaelle morin
cf30a0e363
update: groups removed
2020-05-29 14:07:44 +02:00
gaelle morin
ef8ad357f7
update: header ok
2020-05-29 14:07:44 +02:00
gaelle morin
ffd384aa87
update: frameworkisation of forms
2020-05-29 14:07:44 +02:00
maxime_senza
b0be741980
add space betwween text and cta's
2020-05-29 10:16:53 +02:00
maxime_senza
bf2bddeb32
feature : css for about page : colors & make clean on mobile
2020-05-29 00:28:53 +02:00
maxime_senza
3ca338e4c6
css for about page
2020-05-28 23:49:21 +02:00
maxime_senza
5ce5f5523b
add css files for about page
2020-05-28 23:16:23 +02:00
Jean-Baptiste Pasquier
4e2fccdb60
feature: my profile
2020-05-27 06:44:54 +00:00
Jean-Baptiste Pasquier
f9653163ed
fix: MR155
2020-05-20 16:42:11 +02:00
Jean-Baptiste Pasquier
7c00d2391a
feature: status icon on left menu
2020-05-19 19:42:32 +02:00
Jean-Baptiste Pasquier
120af5b322
feature: add search bar
2020-05-19 19:09:59 +02:00
Jean-Baptiste Pasquier
9f32a4dc9b
feature: private circles
2020-05-19 18:22:00 +02:00
Jean-Baptiste Pasquier
beed19cb42
feature: css variables
2020-05-11 18:20:13 +00:00
Jean-Baptiste Pasquier
40792273fe
Fixes & Hubl branding
2020-05-08 13:27:44 +00:00
gaelle morin
3d2802ba05
feature: add a user translated
2020-04-24 14:35:37 +00:00
Jean-Baptiste Pasquier
65f08ae339
Merge branch 'master' of git.startinblox.com:applications/sib-app into release/dashboard
2020-04-20 17:34:03 +02:00
Gaëlle Morin
92c8ace547
update: fix user admin icon
2020-04-16 14:30:31 +02:00
Jean-Baptiste Pasquier
019e8b99a6
feature: user administration
2020-04-16 14:30:31 +02:00
Gaëlle Morin
6c8224c0f2
update: clear unused and fixes CSS
2020-04-16 14:30:28 +02:00
gaelle morin
896bd2dc6c
update: some CSS added
2020-04-15 16:19:39 +02:00
gaelle morin
55c8b2019c
update: wip on the 'Leave button'
2020-04-15 16:11:39 +02:00
Matthieu Fesselier
6983039f9e
update: test badge removal
2020-03-12 08:53:39 +01:00
gaelle morin
68961182ff
CSS fixup
2020-02-24 15:10:02 +01:00
Jean-Baptiste Pasquier
3e14cb91a4
update: redirect to login and hide page on logged out
2020-02-19 17:03:47 +01:00
Jean-Baptiste Pasquier
31bd34df98
sorted src, activate condition for public directory and job offers, dev parameter for local lib folder
2020-02-10 13:59:23 +01:00
Marjolaine Le Bon
815e5a69b5
ui : update fonts + colors
2020-02-04 15:27:13 +01:00
Marjolaine Le Bon
78637dea70
ui : update Fonts + colors
2020-02-04 13:38:28 +01:00
Marjolaine Le Bon
75d87bd632
init css file + font
2020-02-04 12:25:58 +01:00
Jean-Baptiste Pasquier
9562289e53
fix: css for left menu
2020-01-27 13:29:54 +01:00
Jean-Baptiste Pasquier
fb703e7246
fix: move next to parent
2020-01-27 13:18:28 +01:00
Jean-Baptiste Pasquier
7277983e08
fix: left menu circle on widget
2020-01-24 19:30:36 +01:00
gaelle morin
3042c8efe2
project: admin tag displayed when it is needed + some CSS
2020-01-22 16:33:07 +01:00
Jean-Baptiste Pasquier
83e6957934
fix a lot of problems and add js for menus
2020-01-20 13:57:03 +01:00
gaelle morin
5a20cfe3a8
header is responsive
2020-01-19 13:57:34 +01:00
gaelle morin
3e281edc5c
Sidebar is responsive
2020-01-19 13:19:25 +01:00
gaelle morin
56953601e1
Left menu is responsive
2020-01-19 10:48:22 +01:00
gaelle morin
90a92cc832
scrollbars are customised
2020-01-18 21:43:41 +01:00
gaelle morin
cd9e478264
scrollbars on left menu and content added
2020-01-18 15:51:43 +01:00
gaelle morin
b0e7584a07
css for project-edit added + refactoring
2020-01-16 18:48:21 +01:00
Jean-Baptiste Pasquier
07abdce85c
Merge branch 'staging' into project-admin
2020-01-09 11:34:17 +01:00
Calum Mackervoy
c17912b03f
project team displaying is_admin and avatar correctly
2020-01-09 09:03:48 +00:00
Calum Mackervoy
1ae56e77cf
Don't display null customer details
2020-01-09 09:00:21 +00:00
gaelle morin
74fe061e9a
CSS: styles of table refactored
2020-01-08 17:29:23 +01:00
gaelle morin
5affa10a7c
admin-project: hashtag added to project's name
2020-01-08 11:10:42 +01:00
gaelle morin
52dc49fcd2
'fieldset' added to admin-project-create
2020-01-08 10:58:59 +01:00
gaelle morin
1ca894298e
admin-project: table ok + icon added in sidebar
2020-01-08 00:59:44 +01:00
gaelle morin
ebfd1fe44b
admin-project-create: form stylized (part 1)
2020-01-06 17:40:58 +01:00
gaelle morin
4fb569b9ef
Left menu: css improved for the projects tab
2020-01-06 12:19:08 +01:00
Calum Mackervoy
f3890f49e0
avatar displayed correctly
2019-12-20 23:22:59 +00:00
Gaëlle Morin
2e7d8f5ec9
Gm fixbug
2019-12-20 15:29:05 +00:00
gaelle morin
7fae8e6387
feature: members' name of a project now displayed
2019-12-20 16:21:42 +01:00
Calum Mackervoy
65c6b77fbc
feature: admin of a circle displayed
...
- CSS added
- architecture reworked
- new field 'is-admin' used
- members field used instead of team field.
2019-12-20 16:18:58 +01:00
Gaëlle Morin
68335ab8d8
Gm fixbug
2019-12-19 13:10:09 +00:00
Gaëlle Morin
40e103fc00
feature: project-profile page
...
- css added or reviewed
- templates added or reviewed (customer, business provider, team)
- modal added and stylised
- routes reviewed
- navbar reviewed (adapted according to the content of the main section
- admin status added
- new staging added.
2019-12-18 18:50:47 +00:00
Gaëlle Morin
40143009aa
admin-circles: buttons are centered with the right color
2019-12-16 10:48:05 +01:00
Gaëlle Morin
fa50142438
fix: overflow on menu and content
2019-12-12 17:57:05 +01:00
Gaëlle Morin
9762f8b0f9
Left navbar: modifications according to the wireframe update
2019-12-12 12:51:04 +01:00
Jean-Baptiste Pasquier
db2985857e
bugfix: cancel 2ba08635 css changes
2019-12-10 15:56:06 +01:00
Jean-Baptiste Pasquier
bc45d421f8
Merge branch 'feat/manager_deploy' into 'staging'
...
Deploy sibapp with managers
See merge request startinblox/applications/sib-app!74
2019-12-10 13:57:41 +00:00
Gaëlle Morin
4d40e538a2
modifications according to the changes in the wireframe
2019-12-04 14:53:18 +01:00
Jean-Baptiste Pasquier
1b8f3e7b7f
update: fixes for development usage
2019-12-02 15:22:25 +01:00
Gaëlle Morin
1ade7ded23
Left-nav bar: new styles + overflow and hovering to handle long names
2019-11-29 17:02:55 +01:00
Calum Mackervoy
89f62025b4
circles not collapsable
...
in line with mockup
2019-11-15 12:29:41 +00:00
Jean-Baptiste Pasquier
0c3b74bcaf
update: making join leave works
2019-11-14 13:27:04 +01:00
Gaëlle Morin
772e1e456b
Tables ok
2019-11-13 12:00:38 +01:00
Gaëlle Morin
03df657caf
full css rework on tables. Need refactor
2019-11-12 23:16:56 +01:00
Jean-Baptiste Pasquier
30de8eed82
fix: @gaelle target wrong class
2019-11-12 13:25:39 +01:00
Jean-Baptiste Pasquier
809978ecc8
fix: last one @gaelle
2019-11-12 13:22:23 +01:00
Jean-Baptiste Pasquier
8784ae7641
fix: selector for admin css
2019-11-12 13:13:52 +01:00
Jean-Baptiste Pasquier
aa46aeed78
fix: clear cache
2019-11-12 12:49:12 +01:00
Jean-Baptiste Pasquier
0566f34ec4
fix: @gaelle
2019-11-12 12:34:33 +01:00
Jean-Baptiste Pasquier
e60c6d6d1f
fix: @gaelle
2019-11-12 12:31:06 +01:00
Jean-Baptiste Pasquier
9795498944
fix: selector @gaelle
2019-11-12 12:26:34 +01:00
Gaëlle Morin
1eb83f2a80
match the mock-ups ok
2019-11-11 11:50:10 +01:00
Gaëlle Morin
5da381ce93
circle-create form ok
2019-11-11 11:22:37 +01:00
Gaëlle Morin
493a1a8525
rework on table with 2 columns: flex to grid + wip on the column for buttons in the 3-col table
2019-11-09 14:33:02 +01:00
Gaëlle Morin
62bb5a7fff
Clean-up circle-profile.scss
2019-11-08 13:26:00 +01:00
Gaëlle Morin
e274ad20d1
Clean-up circle-edit.scss
2019-11-08 12:52:41 +01:00
Gaëlle Morin
f3409274ee
Clean-up circle-admin.scss
2019-11-08 12:36:56 +01:00
Gaëlle Morin
52377dc92a
Clean-up main.scss
2019-11-08 11:34:30 +01:00
Gaëlle Morin
70e238d230
admin-circle table: wip => problem with multiple-members
2019-11-07 18:04:01 +01:00
Gaëlle Morin
2b4e256f98
mistake on icon fixed
2019-11-07 12:07:43 +01:00
Gaëlle Morin
4a8f76c646
new icon for circle-admin added
2019-11-07 12:05:17 +01:00
Gaëlle Morin
6ba3ef525d
fix bug on field alignment + buttons in admin ok
2019-11-06 21:28:25 +01:00
Gaëlle Morin
d4b4a176cd
creation date and edit button: OK + form's save button ok
2019-11-06 18:44:02 +01:00
Gaëlle Morin
b5dbbf7384
creation date and edit button wip
2019-11-06 15:44:53 +01:00
Gaëlle Morin
db352b31fc
button 'edit and add member' ok
2019-11-06 11:18:59 +01:00
Gaëlle Morin
b4911cfbb9
buttons 'join, leave, delete circle' ok + button to add member ok
2019-11-06 10:46:09 +01:00
Gaëlle Morin
372ee5c6e8
sidebar corrected
2019-11-05 19:58:40 +01:00
Jean-Baptiste Pasquier
3c7700e966
update: semantic css for buttons
2019-11-05 16:52:34 +00:00
Gaëlle Morin
3b49ddadee
ok title + button.
2019-11-05 15:00:10 +01:00
Gaëlle Morin
12ffa2467a
create circle button ok
2019-11-04 15:12:11 +01:00
Gaëlle Morin
ff2b07afb4
buttons centered
2019-11-04 14:34:03 +01:00
Gaëlle Morin
2661be13b6
styles for admins ok. Need padding ? + refactoring
2019-11-04 14:14:19 +01:00
Gaëlle Morin
57045b44e3
create-circle: table-headers ok
2019-10-30 16:42:51 +01:00
Gaëlle Morin
2c4ce4127b
create-button ok
2019-10-30 15:29:23 +01:00
Gaëlle Morin
db7b1116c3
circle-admin: header ok
2019-10-30 14:34:34 +01:00
Gaëlle Morin
fda9e3dd22
circle-info buttons styled + form buttons refactored
2019-10-30 11:47:39 +01:00
Jean-Baptiste Pasquier
7e0653f14b
Merge branch 'jbpasquier/circle-information' into circle-wip-merge
2019-10-29 15:03:48 +01:00
Gaëlle Morin
250ad6c395
fix add member button (need refactoring)
2019-10-29 14:48:53 +01:00
Jean-Baptiste Pasquier
a5a63bd162
Merge branch 'circle-admin' into circle-wip-merge
2019-10-29 14:43:37 +01:00
Christophe Henry
5eb9b6aad8
feat: add template for circle admin page
2019-10-29 14:22:42 +01:00
Gaëlle Morin
1489f1b1cb
edit button ok
2019-10-29 13:34:29 +01:00
Gaëlle Morin
71dc40a7f4
header modified: dash and description added
2019-10-29 11:33:26 +01:00
Jean-Baptiste Pasquier
9db2e1b99b
update: Cleanup circle information
2019-10-29 11:31:48 +01:00
Gaëlle Morin
30ce7d3bfd
header modified: dash and description added
2019-10-28 18:38:14 +01:00
Gaëlle Morin
6139c5df19
fix: double vertical scrollbar on chat fixed
2019-10-28 16:28:09 +01:00
Jean-Baptiste Pasquier
4de5229960
fix: css merge
2019-10-25 19:25:06 +02:00
Jean-Baptiste Pasquier
09f35bd3c0
update: add administration & circle creation
2019-10-25 19:15:45 +02:00
Jean-Baptiste Pasquier
1c2789812e
Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into jbpasquier/admin
2019-10-25 19:08:54 +02:00
Gaëlle Morin
1170e8b619
fix: CSS fix on circle-edit page
2019-10-25 18:20:48 +02:00
Jean-Baptiste Pasquier
d4279b0c7a
update: Cleanup circle information
2019-10-25 15:35:14 +02:00
Jean-Baptiste Pasquier
48075b2419
update: imbricate edit in profile & fix css
2019-10-24 22:03:15 +02:00
Jean-Baptiste Pasquier
9e3dc8fe8c
fix: edit template dup name
2019-10-24 21:44:35 +02:00
Jean-Baptiste Pasquier
7086dbd931
Merge branch '201-right-column-missing-on-the-circles' of git.happy-dev.fr:startinblox/applications/sib-app into gm-missing-edit-circle
2019-10-24 21:44:14 +02:00
Jean-Baptiste Pasquier
a4314210b4
update: working form + back link
2019-10-24 21:23:11 +02:00
Jean-Baptiste Pasquier
a71fbf1b78
Merge branch 'staging' into gm-missing-edit-circle
2019-10-24 16:22:06 +02:00
Gaëlle Morin
5a865693a1
feature: new page to display info about a circle and add members
...
- New styles for "add users" drodown
- New custom widget to display members
- Use of the permission system
2019-10-23 22:20:59 +02:00
Gaëlle Morin
45064062fd
wip
2019-10-23 13:55:42 +02:00
Gaëlle Morin
397e0a4dc3
wip
2019-10-23 09:57:34 +02:00
Gaëlle Morin
a7faff9b88
members block OK + delete-circle button added
2019-10-22 15:50:15 +02:00
Gaëlle Morin
afa5fa0451
new architecture for member list yeah
2019-10-21 15:02:12 +02:00
Gaëlle Morin
6d4b863e3b
delete button ok
2019-10-21 13:12:04 +02:00
Gaëlle Morin
57885c6655
wip
2019-10-18 15:39:56 +02:00
Gaëlle Morin
ba6e21a71c
wip
2019-10-18 10:26:08 +02:00
Gaëlle Morin
4d2566abe0
wip table
2019-10-17 16:06:22 +02:00
Jean-Baptiste Pasquier
b71d79e608
Merge branch '145' into 'staging'
...
Solves #145 : add project captains to project page
See merge request startinblox/applications/sib-app!68
2019-10-16 13:22:06 +00:00
