Commit Graph

2870 Commits

Author SHA1 Message Date
Laurent Destailleur
3b4bcc67c9
Merge pull request #10780 from atm-john/theme_sidebarr_toggle
NEW/FIX Theme sidebarr toggle
2019-03-15 19:41:39 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Frédéric FRANCE
9be780f47d
Update style.css.php 2019-03-14 09:18:51 +01:00
Frédéric FRANCE
bb14562f7b
Update global.inc.php 2019-03-14 09:17:40 +01:00
Laurent Destailleur
68cc7f0e89 Fix css 2019-03-13 13:53:29 +01:00
John BOTELLA
4495f0a755 Fix decoration 2019-03-12 16:43:09 +01:00
John BOTELLA
0d631a932c change filename 2019-03-12 14:09:43 +01:00
John BOTELLA
240162b347 Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu_login 2019-03-12 14:00:52 +01:00
John BOTELLA
288ce5c553 add more info 2019-03-12 14:00:26 +01:00
John BOTELLA
ef241f70e7 Add action open close top dropdown menu 2019-03-12 11:49:56 +01:00
Laurent Destailleur
73b6ad733f Make font awesome 5.7 used by default 2019-03-12 10:34:19 +01:00
Laurent Destailleur
d762766a56 Font awesome 5 by default 2019-03-12 10:11:34 +01:00
John BOTELLA
be2885c75b Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_sidebarr_toggle 2019-03-12 09:24:42 +01:00
Laurent Destailleur
47e3fa2bbf Upgrade font awesome to 5.7.2 2019-03-12 09:13:16 +01:00
Laurent Destailleur
6daa262779 Files for variables of themes were renamed from graph-color.php into
theme_vars.inc.php to match naming convention of extension .inc.php for
files to be included.
2019-03-11 20:32:25 +01:00
Laurent Destailleur
c6a269e4c4 Fix select of menu entry 2019-03-11 19:53:27 +01:00
Laurent Destailleur
0480b7ee4a CSS 2019-03-11 18:29:01 +01:00
John BOTELLA
d8223bfe98 init dropdown 2019-03-11 18:03:39 +01:00
John BOTELLA
5d7118340b Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-11 14:40:19 +01:00
Laurent Destailleur
d3479bebbc CSS 2019-03-10 23:47:27 +01:00
Laurent Destailleur
1bd422b8b9 CSS 2019-03-10 14:45:16 +01:00
John BOTELLA
03724c7ba4 Fix travis errors 2019-03-08 14:41:47 +01:00
John BOTELLA
56a40c7de8 Fix sidebar collapse behavior 2019-03-08 14:06:37 +01:00
John BOTELLA
1127716abf add support for md theme 2019-03-07 17:50:26 +01:00
John BOTELLA
218690db00 add css behavior 2019-03-07 17:05:27 +01:00
John BOTELLA
74c8754092 fix travis 2019-03-07 15:49:16 +01:00
Laurent Destailleur
8d0a8d8263
Merge pull request #10758 from altatof/lf
NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER
2019-03-07 14:18:26 +01:00
John BOTELLA
89157234b7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-07 09:33:11 +01:00
Laurent Destailleur
9ffac1ca4a
Merge pull request #10750 from altatof/themefix
FIX : allow eldy theme stylesheet to be included in custom themes
2019-03-06 18:10:41 +01:00
Christophe Battarel
b4397806fc bad branching 2 2019-03-06 17:14:05 +01:00
Christophe Battarel
0f8f4fbc15 bad branching 2019-03-06 17:12:39 +01:00
John BOTELLA
efed7ae6aa Fix tabs badges 2019-03-06 16:00:09 +01:00
Laurent Destailleur
d4409ffb08 Restore menu MRP on new eldy code 2019-03-06 14:18:58 +01:00
Christophe Battarel
6c6a1a02f0 allow this script to be included in custom themes 2019-03-06 11:06:35 +01:00
Frédéric FRANCE
0c2a77cb53
Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-05 18:14:15 +01:00
John BOTELLA
6b98eecd32 fix compatibility status 2019-03-05 16:58:05 +01:00
John BOTELLA
7a4540088a Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-05 15:37:17 +01:00
John BOTELLA
95981ca14c PR feedback 2019-03-05 15:26:19 +01:00
Laurent Destailleur
7d37b4c46d CSS 2019-03-05 13:04:54 +01:00
Frédéric FRANCE
bdba88a6d5
remove warning 2019-03-04 18:23:52 +01:00
Frédéric FRANCE
5dc3cbcdfc
remove warning 2019-03-04 18:22:59 +01:00
Laurent Destailleur
27402f432a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/don/class/don.class.php
	htdocs/product/stock/card.php
	htdocs/theme/eldy/style.css.php
2019-03-04 16:29:16 +01:00
Laurent Destailleur
07dca25b96 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-04 16:20:49 +01:00
John BOTELLA
7cadaca8fc Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-04 11:37:16 +01:00
John BOTELLA
e70ca9f67e fix travis errors 2019-03-04 11:21:26 +01:00
Laurent Destailleur
d502d10da4 CSS 2019-03-03 21:05:33 +01:00
Laurent Destailleur
83fc10e917 css 2019-03-03 13:38:45 +01:00
Laurent Destailleur
03237d1730 NEW Look and feel v10 - Add CSS tabBarNoTop 2019-03-02 18:20:13 +01:00
Laurent Destailleur
5f6ca1119a Replace arrow picto with fontawesome 2019-03-02 14:07:13 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
John BOTELLA
421c009e58 Standardise new function name 2019-03-01 15:33:23 +01:00
John BOTELLA
162c3249cf Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-01 13:49:42 +01:00
John BOTELLA
8ca3049382 update badge doc 2019-03-01 12:06:25 +01:00
John BOTELLA
b222c44bb9 Add helper functions and little review size of badges 2019-03-01 12:01:25 +01:00
John BOTELLA
237bc23463 fix doc 2019-02-28 16:15:08 +01:00
John BOTELLA
2658e9d85e fix doc 2019-02-28 16:08:21 +01:00
John BOTELLA
3e30b9c03c add badge status generator and doc 2019-02-28 16:04:26 +01:00
John BOTELLA
51af399e82 Add color vars 2019-02-28 12:31:57 +01:00
Laurent Destailleur
fb726b99c7 Fix css 2019-02-27 14:28:46 +01:00
Laurent Destailleur
70744a8ca0 CSS 2019-02-27 13:58:26 +01:00
John BOTELLA
9f0a93f68f Add color lib for color automation 2019-02-26 17:44:16 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
John BOTELLA
3ff94fa5fc Fix travis 2019-02-26 10:14:15 +01:00
John BOTELLA
3e4983f073 Prepare badge standard 2019-02-25 17:38:04 +01:00
John BOTELLA
81aab86a67 Add fontawesome support for menu top btn 2019-02-25 15:21:59 +01:00
John BOTELLA
1da6a2bcee clean tooltip : remove drooling edge 2019-02-22 14:06:01 +01:00
John BOTELLA
1457b5d6d7 Add svg menu bg support for main feature level 2 only 2019-02-22 11:43:52 +01:00
John BOTELLA
f3f9fcbb1b Split style.css 2019-02-21 17:50:37 +01:00
John BOTELLA
0fa6b9cd6d factor css and allow use vars 2019-02-21 16:55:17 +01:00
Laurent Destailleur
e42487ae4e CSS 2019-02-20 05:26:27 +01:00
Laurent Destailleur
4296f959ca Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION
Reorganize levels of menu accountancy
2019-02-20 04:55:35 +01:00
Laurent Destailleur
72ec437447 Remove unwanted files 2019-02-15 16:42:51 +01:00
Laurent Destailleur
a40d4ddbaa Fix phpcs 2019-02-08 12:23:04 +01:00
Laurent Destailleur
5043aa7b35 Fix regression for icon of external menus 2019-02-08 12:17:11 +01:00
Laurent Destailleur
78fbeeaa62 Fix syntax error 2019-02-08 11:57:39 +01:00
Laurent Destailleur
b3f955e9a5 Fix syntax error 2019-02-08 11:55:27 +01:00
Laurent Destailleur
fbd2d368e4
Update style.css.php 2019-02-08 10:19:59 +01:00
Laurent Destailleur
8143acbadf
Merge branch 'develop' into feature/9429_top_menu_icons 2019-02-08 10:15:09 +01:00
Laurent De Coninck
48eba7c71b use font awesome for the top menu icons 2019-02-08 08:41:26 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
eb3621839a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/members.lang
	htdocs/langs/fr_FR/members.lang
2019-02-01 15:14:19 +01:00
Laurent Destailleur
189323ad58 Fix when using image into description 2019-01-31 18:12:34 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php
2019-01-30 16:54:38 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
0fbf578edb
Merge pull request #10425 from tarrsalah/fix-css-on-disable-topmenu-images
FIX css in the case of not showing topmenu images.
2019-01-30 16:15:40 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
tarrsalah
88da5f25d8 FIX css in the case of not showing topmenu images. 2019-01-27 13:18:50 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
f9686c47af Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/website/index.php
2019-01-23 19:22:42 +01:00
Laurent Destailleur
278b3e0b08 Fix css 2019-01-23 15:30:54 +01:00
Laurent Destailleur
c372b56a3a CSS 2019-01-17 17:23:37 +01:00
Laurent Destailleur
00706a5ad4 css 2019-01-17 12:58:15 +01:00
ATM-Nicolas
2a7b3c7d7d FIX : Check for old picture name if the new one was not found 2019-01-14 10:48:34 +01:00
Laurent Destailleur
db593bf45d CSS v10 2019-01-14 00:32:52 +01:00
ldestailleur
ab9fe1a757 Add option to use fontawesome 5 with fontawesome 4 2019-01-03 21:14:59 +01:00
Laurent Destailleur
af6a7446ee
Merge pull request #9871 from laudeco/feature/fontawesome_migration
migrate font awesome to 5.4.1
2018-12-22 19:52:39 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00