561 Commits

Author	SHA1	Message	Date
Marjolaine Le Bon	3a682d87b4	update: cleaning integration	2020-09-11 14:06:01 +02:00
Marjolaine Le Bon	1a8caf8fa6	update; polls page integration	2020-09-10 18:06:25 +02:00
Marjolaine Le Bon	7a72c12b94	update: integration polls step2	2020-09-10 14:51:44 +02:00
Marjolaine Le Bon	f53fed4755	update: integration pollspage - step 1	2020-09-10 00:20:49 +02:00
Marjolaine Le Bon	ae97bec8bf	update : integration add polls form	2020-09-09 00:17:26 +02:00
Marjolaine Le Bon	ebc0455855	Merge branch 'master' of https://git.startinblox.com/applications/hubl into feature/resource-component	2020-09-08 11:43:30 +02:00
Marjolaine Le Bon	2f49e3a5a2	Merge branch 'feature/resource-component' of https://git.startinblox.com/applications/hubl into feature/resource-component	2020-09-08 11:42:50 +02:00
Marjolaine Le Bon	6475a09323	bugfix: event detail img	2020-09-08 11:42:42 +02:00
Benoit Alessandroni	e38e8d17c1	Merge branch 'master' into feature/resource-component	2020-09-03 14:21:24 +02:00
Jean-Baptiste Pasquier	b61bcc54be	update: fix project and circles	2020-09-03 12:15:47 +02:00
Jean-Baptiste Pasquier	cc44afd83d	Merge branch 'master' into feature/projects	2020-09-03 11:11:28 +02:00
senza	1aac23cf4e	Merge remote-tracking branch 'origin' into feature/projects	2020-09-01 12:24:09 +02:00
gaelle morin	ed76354912	loader moved to components	2020-08-31 15:55:31 +02:00
gaelle morin	0d9f149054	loaders for admin pages moved	2020-08-31 10:24:12 +02:00
Marjolaine Le Bon	523fba94be	bugfix: bug css due to merge	2020-08-31 10:22:54 +02:00
Marjolaine Le Bon	f7fc5b1dab	Merge branch 'feature/resource-component' of https://git.startinblox.com/applications/hubl into feature/resource-component	2020-08-31 10:04:58 +02:00
Marjolaine Le Bon	fc758cd01c	Merge branch 'master' of https://git.startinblox.com/applications/hubl into feature/resource-component	2020-08-31 10:04:43 +02:00
gaelle morin	4379359bff	loader for circle admin list added	2020-08-28 11:31:11 +02:00
gaelle morin	70418f75b3	loader for left-menu members added	2020-08-28 09:39:59 +02:00
Benoit Alessandroni	55623c2dd1	feature: adding proper dynamic prefix on resources and events module	2020-08-27 18:13:50 +02:00
gaelle morin	ad88494af8	feature: add loader to left-menu > members	2020-08-26 17:41:14 +02:00
Jean-Baptiste Pasquier	c44c2d6f53	update: color of the left menu font	2020-08-24 13:45:01 +02:00
Marjolaine Le Bon	778950a38a	update: integration polls - step 1	2020-08-20 01:59:24 +02:00
Marjolaine Le Bon	eb07bebdd1	update: uniformisation events/resources	2020-08-19 18:23:18 +02:00
Marjolaine Le Bon	1ae859e896	Merge branch 'feature/resource-component' of https://git.startinblox.com/applications/hubl into feature/resource-component	2020-08-11 19:55:19 +02:00
Marjolaine Le Bon	5785f4b640	update: menu left with polls	2020-08-11 19:55:14 +02:00
Benoit Alessandroni	907f516732	Switch from sib-resource to solid-resource	2020-08-11 19:11:42 +02:00
Benoit Alessandroni	3bec1062ff	Switch from sib-event to solid-event	2020-08-11 19:09:14 +02:00
Benoit Alessandroni	04821836b7	Merge branch 'feature/sib-poll' into feature/resource-component	2020-08-11 17:10:55 +02:00
Benoit Alessandroni	268169ddc9	Merge branch 'master' into feature/resource-component	2020-08-11 16:38:37 +02:00
Marjolaine Le Bon	250192ef51	update: integrations events and resources on circles	2020-08-11 13:01:13 +02:00
senza	7309aa310c	tag css of poll page	2020-08-08 14:46:31 +02:00
senza	5a323381cc	feature : implementing solid-poll + css customisations	2020-08-08 14:11:18 +02:00
Jean-Baptiste Pasquier	59f2b4414f	fix: remove solid-fix-badge	2020-08-05 13:47:05 +00:00
Marjolaine Le Bon	415f06c36e	update: right menu circles	2020-08-04 12:34:17 +02:00
gaelle morin	8ff7994089	feature: notification - default avatar + styles added (ter)	2020-07-16 13:51:52 +02:00
gaelle morin	4b52f0a49e	feature: notification - default avatar + styles added	2020-07-10 16:38:55 +02:00
gaelle morin	da4c1cf69c	feature: notification - dynamic icons added	2020-07-10 11:43:21 +02:00
Marjolaine Le Bon	8da51ec9fa	update: etuc design + component design	2020-07-09 17:51:54 +02:00
gaelle morin	218e74955b	feature: notification - templates for circle and private notification added	2020-07-09 16:01:42 +02:00
gaelle morin	f83b458240	feature: notification - ok on mobile	2020-07-09 14:31:14 +02:00
gaelle morin	897dc336c2	feature: notification - top triangle ok on desktop	2020-07-09 12:30:23 +02:00
gaelle morin	efae21e6c2	feature: project: modify image - refactoring	2020-07-08 18:26:23 +02:00
gaelle morin	7ee2f8e14b	feature: project: modify image - positioning new try	2020-07-07 19:42:52 +02:00
gaelle morin	2b314116a4	feature: project: modify image - positioning	2020-07-03 16:47:54 +02:00
Marjolaine Le Bon	bfbd9f3605	Merge branch 'master' of https://git.startinblox.com/applications/hubl into feature/resource-component	2020-07-02 18:04:11 +02:00
Marjolaine Le Bon	6b390c975a	update: global layout	2020-07-02 18:03:56 +02:00
gaelle morin	7cfea37b1e	feature: notification - typo	2020-07-02 12:23:02 +02:00
gaelle morin	03dc7a4251	fix: project-picture-edit - wip	2020-06-30 17:36:14 +02:00
gaelle morin	7dbbe51c6e	wip	2020-06-30 13:07:29 +02:00
gaelle morin	5d5ae81d84	fearture: project-picture-edit - positioning	2020-06-30 13:06:39 +02:00
gaelle morin	053a7972c5	wip	2020-06-29 18:51:51 +02:00
gaelle morin	c322b1109f	feature: notification full height	2020-06-29 14:33:02 +02:00
gaelle morin	1ce47b03dd	feature: notification responsive	2020-06-29 11:15:31 +02:00
gaelle morin	9cb7977d3b	feature: color for counter number	2020-06-27 17:23:08 +02:00
gaelle morin	a797804bdf	feature: box-shadow added + new margins and paddongs	2020-06-26 15:44:02 +02:00
gaelle morin	f41970dadc	feature: styling scrollbar end	2020-06-26 15:09:41 +02:00
gaelle morin	f8c43b74f3	feature: notifications__item styling scrollbar	2020-06-26 14:10:51 +02:00
gaelle morin	70b430b39d	feature: notifications__item stylized	2020-06-26 11:17:44 +02:00
gaelle morin	cd63ab9656	fix: old css replaced	2020-06-26 09:19:21 +02:00
gaelle morin	179f72216c	notification on local	2020-06-25 23:20:17 +02:00
gaelle morin	747eb622b3	first try to display the picture of project on edit-page	2020-06-25 18:52:15 +02:00
Jean-Baptiste Pasquier	2ae8db7429	minor: Implement core 0.10	2020-06-18 20:02:54 +02:00
Jean-Baptiste Pasquier	772c65dfe1	Merge branch 'feature/fix-from-rework-css' of git.startinblox.com:applications/hubl into release/0.10	2020-06-18 17:04:16 +02:00
Jean-Baptiste Pasquier	8189c7fbcc	Merge branch 'release/project' of git.startinblox.com:applications/hubl into release/0.10	2020-06-18 17:00:33 +02:00
Jean-Baptiste Pasquier	5169af8381	Merge branch 'release/job-board' into feature/job-board	2020-06-16 17:25:45 +02:00
gaelle morin	c810863500	fix: button register on mobile	2020-06-16 15:52:10 +02:00
gaelle morin	cf93abcd5c	update: style for sib-form-file on mobile	2020-06-16 13:02:42 +02:00
gaelle morin	4f7635e8d2	update: style for sib-form-file added	2020-06-16 12:38:09 +02:00
maxime_senza	f25ca6557f	feature: job board : colors variables	2020-06-16 02:01:21 +02:00
gaelle morin	985764874a	fix: new classes added to admin-project (end)	2020-06-15 19:30:27 +02:00
gaelle morin	18bea2e3e6	Merge branch 'release/project' of git.startinblox.com:applications/sib-app into fix/project	2020-06-15 18:57:13 +02:00
Jean-Baptiste Pasquier	b8e5ef316e	Merge branch 'master' into release/project	2020-06-15 18:50:51 +02:00
Jean-Baptiste Pasquier	70de29a517	fix: contact width on about page	2020-06-15 17:59:05 +02:00
gaelle morin	aafc8654f5	fix: circle leave fixed	2020-06-15 17:48:36 +02:00
gaelle morin	c263beb6b4	fix: important added	2020-06-15 17:18:03 +02:00
gaelle morin	4e0f307a83	fix: colors moved to client.sample.happy-dev.css	2020-06-15 16:32:47 +02:00
gaelle morin	54da12c7a3	fix: new classes added to admin-project	2020-06-15 16:06:01 +02:00
gaelle morin	d70fd6dac8	fix: new classes added to project-edit + fixbug on table for project- and circle-edit	2020-06-15 14:27:49 +02:00
gaelle morin	9a084d5cae	fix: colors for directory with hubl colors	2020-06-15 10:15:19 +02:00
Jean-Baptiste Pasquier	e603b3f87e	hotfix: variable color	2020-06-13 16:50:43 +02:00
Jean-Baptiste Pasquier	c598a79a85	Merge branch 'master' into release/rework-css	2020-06-13 16:04:52 +02:00
gaelle morin	99ea055f03	fix: colors for directory	2020-06-13 01:50:44 +02:00
gaelle morin	0927041e4a	bugfix: header inner borders + depreciated .box-button + chat textarea + width of buttons	2020-06-12 20:24:22 +02:00
gaelle morin	fe35c4f5df	bugfix: notification kist display on small screen (positionning of other views	2020-06-12 15:32:38 +02:00
gaelle morin	c38c62b656	bugfix: notification kist display on small screen	2020-06-12 15:05:12 +02:00
gaelle morin	fb8e923ec9	bugfix: left-menu responsive + button responsive	2020-06-12 12:19:45 +02:00
gaelle morin	c09cc4e525	bugfix: multiple fixes	2020-06-11 15:20:20 +02:00
gaelle morin	fbdd79ded5	Merge branch 'feature/utility-classes' of git.startinblox.com:applications/sib-app into feature/utility-classes	2020-06-10 17:49:25 +02:00
gaelle morin	2b49bc6eec	update: left-menu : hover removed	2020-06-10 16:37:48 +02:00
Jean-Baptiste Pasquier	c6dc4d8f93	Merge branch 'release/rework-css' into feature/utility-classes	2020-06-10 15:44:38 +02:00
gaelle morin	a468fe2377	update: height of pages + bug on project edit form	2020-06-10 15:36:45 +02:00
gaelle morin	213c6a78ab	update: table - some padding added to user-thulb in table + new width for table's columns	2020-06-10 13:27:57 +02:00
gaelle morin	3629c0c20b	update: table - scrollvar ok	2020-06-10 12:22:22 +02:00
gaelle morin	e6d1ddc33c	update: table - responsive ok. Need rework of scroll bar and breakpoints	2020-06-10 11:25:36 +02:00
gaelle morin	741eff85ce	update: table - responsive for admin-project and project-edit (wip)	2020-06-10 00:59:45 +02:00
gaelle morin	7e655e054a	update: table - responsive for admin-user and admin-circle	2020-06-10 00:03:58 +02:00
gaelle morin	74cec30974	update: circle-admin - leave and join button clickable	2020-06-09 16:51:15 +02:00
gaelle morin	d8879c4f12	update: table - wip	2020-06-09 15:32:00 +02:00
gaelle morin	5441686d8e	update: table - wip	2020-06-09 15:15:34 +02:00
gaelle morin	eaa7478196	update: better look of user panel on mobile	2020-06-09 12:10:13 +02:00
gaelle morin	57d775fa01	update: header + fix for webkit for mobile	2020-06-09 11:43:40 +02:00
gaelle morin	58e2f3b2ea	update: user's panel responsive + height of chat view	2020-06-08 15:50:42 +02:00
gaelle morin	797728b743	update: sub-menu - is responsive	2020-06-05 15:44:15 +02:00
gaelle morin	2f3bdaa2e5	update: sidebar - access when in admin on mobile	2020-06-05 11:25:57 +02:00
gaelle morin	8f49cbdcd7	update: left-menu - responsive ok	2020-06-04 18:15:43 +02:00
gaelle morin	9d83093165	update: left-menu and header : ellipsis and alignment	2020-06-03 17:36:01 +02:00
gaelle morin	898144fa9a	update: left-menu - ellipsis on large and small screens	2020-06-03 15:33:10 +02:00
gaelle morin	ec5326887e	update: left-menu - search input: positioning and width on small screens	2020-06-03 14:37:41 +02:00
gaelle morin	37a8e28793	update: header - responsive ok	2020-06-03 14:16:29 +02:00
gaelle morin	e266e5936e	update: left-menu - hover: comments + colors added	2020-06-03 10:31:45 +02:00
gaelle morin	db592c0dfd	update: left-menu - hover (need refactoring)	2020-06-02 19:03:31 +02:00
gaelle morin	9079b6c1c9	update: left-menu - hover (wip)	2020-06-02 09:29:42 +02:00
gaelle morin	1432011f34	update: responsive - general layout. Flex to grid	2020-06-01 17:11:24 +02:00
maxime_senza	65be45c777	feature: about sib - reduce padding size & add div in blocs	2020-06-01 16:14:00 +02:00
maxime_senza	cf166b71d7	feature: about sib | align center blocs & fix contact button	2020-06-01 16:05:23 +02:00
Jean-Baptiste Pasquier	5c361bdef9	small fixes, remove tabs	2020-06-01 12:42:35 +02:00
maxime_senza	623c715892	feature : merge updates on master branch & add new class to about page	2020-05-30 10:43:13 +02:00
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