diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index dd50e24c8e6..c4f9ff2b206 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -47,6 +47,8 @@ $(document).ready(function () {
+
+
@@ -197,7 +199,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file -
+ google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLI } ?> + +
+ diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 7331a81ead0..61c0bbe6cfc 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -43,7 +43,10 @@ $(document).ready(function () { +
+
+ @@ -132,7 +135,7 @@ if (! empty($hookmanager->resArray['options'])) { -
+
-
- diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 7ba1a9b136b..6be69acd912 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -180,7 +180,7 @@ margin-top: 10px; font-size:16px; font-weight: normal; color: #4965B3; -text-shadow: 2px 1px 2px #c0c0c0; +text-shadow: 1px 1px 1px #c0c0c0; } tr.bg1 { diff --git a/htdocs/support/default.css b/htdocs/support/default.css index d535ab0ea70..14454a19245 100644 --- a/htdocs/support/default.css +++ b/htdocs/support/default.css @@ -18,7 +18,7 @@ body { font-size:12px; font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; -background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat; +background: #f9f9f9; /* background-color: #F4F4F4; */ margin: 5px 10px; } diff --git a/htdocs/support/dolibarr_logo2.png b/htdocs/support/dolibarr_logo2.png deleted file mode 100644 index 7abd0ae8494..00000000000 Binary files a/htdocs/support/dolibarr_logo2.png and /dev/null differ diff --git a/htdocs/support/headbg.jpg b/htdocs/support/headbg.jpg deleted file mode 100644 index 5491c6e4acb..00000000000 Binary files a/htdocs/support/headbg.jpg and /dev/null differ diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 1159e40ff0a..f4832bddac8 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -64,7 +64,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global- // Define image path files and other constants $fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; $img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1); -$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); +$img_head=''; $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); $dol_hide_topmenu=$conf->dol_hide_topmenu; $dol_hide_leftmenu=$conf->dol_hide_leftmenu; @@ -108,7 +108,7 @@ body { background-color: #FFFFFF; - background: #ffffff url() 0 0 no-repeat; + background-color: #FCFCFC; color: #101010; font-size: px; diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index bfb64ab09a0..41dc3b57179 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -85,7 +85,7 @@ body { background-color: #FFFFFF; - /*background: #ffffff url() 0 0 no-repeat;*/ + background-color: #FCFCFC; color: #101010; font-size: px; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3eef3bd840e..25ff8cad3e0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -64,7 +64,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global- // Define image path files and other constants $fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; -$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); +$img_head=''; $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); $dol_hide_topmenu=$conf->dol_hide_topmenu; $dol_hide_leftmenu=$conf->dol_hide_leftmenu; @@ -812,7 +812,10 @@ foreach($mainmenuusedarray as $val) .bodylogin { - background: #ffffff url() 0 0 no-repeat; + background: #f9f9f9; +} +.login_vertical_align { + padding: 10px; } form#login { margin-top: px; @@ -836,22 +839,18 @@ form#login { padding-top:12px; padding-bottom:12px; max-width: 540px; - border: 1px solid #C0C0C0; - background-color: #E0E0E0; + border: 1px solid #A0A0A0; -moz-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD; box-shadow: 3px 3px 4px #DDD; border-radius: 8px; - border:solid 1px rgba(168,168,168,.4); - border-top:solid 1px f8f8f8; - background-color: #f8f8f8; - background-image: -o-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); - background-image: -moz-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); - background-image: -webkit-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); - background-image: -ms-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); - background-image: linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); + border:solid 1px rgba(90,90,90,.4); + -webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); + box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); + + background-color: #FFFFFF; } div#login_left, div#login_right { display: inline-block;