diff --git a/css/swad21.70.1.css b/css/swad21.70.7.css similarity index 99% rename from css/swad21.70.1.css rename to css/swad21.70.7.css index 17de3bd8d..2d58c358f 100644 --- a/css/swad21.70.1.css +++ b/css/swad21.70.7.css @@ -1879,10 +1879,16 @@ a:hover img.CENTER_PHOTO_SHOW background-size:20px 20px; background-repeat:no-repeat; font-size:12pt; - color:#632921; text-align:left; overflow:hidden; } +.ALERT_TXT_WHITE {color:#632921;} +.ALERT_TXT_GREY {color:#632921;} +.ALERT_TXT_PURPLE {color:#632921;} +.ALERT_TXT_BLUE {color:#632921;} +.ALERT_TXT_YELLOW {color:#632921;} +.ALERT_TXT_PINK {color:#632921;} +.ALERT_TXT_DARK {color:white;} /*********************************** Icons ***********************************/ .ICOx16 { height:16px; vertical-align:middle;} diff --git a/swad_alert.c b/swad_alert.c index 7466f55c2..4f43c3690 100644 --- a/swad_alert.c +++ b/swad_alert.c @@ -360,6 +360,7 @@ void Ale_ShowAlertAndButton1 (Ale_AlertType_t AlertType,const char *fmt,...) static void Ale_ShowFixAlertAndButton1 (Ale_AlertType_t AlertType,const char *Txt) { extern const char *The_ClassAlertBackground[The_NUM_THEMES]; + extern const char *The_ClassAlertTxtColor[The_NUM_THEMES]; extern const char *Txt_Close; char IdAlert[Frm_MAX_BYTES_ID + 1]; static const bool AlertClosable[Ale_NUM_ALERT_TYPES] = @@ -414,9 +415,11 @@ static void Ale_ShowFixAlertAndButton1 (Ale_AlertType_t AlertType,const char *Tx /***** Write message *****/ if (AlertType == Ale_NONE) - HTM_DIV_Begin ("class=\"ALERT_TXT\""); + HTM_DIV_Begin ("class=\"ALERT_TXT %s\"", + The_ClassAlertTxtColor[Gbl.Prefs.Theme]); else - HTM_DIV_Begin ("class=\"ALERT_TXT\" style=\"background-image:url('%s/%s');\"", + HTM_DIV_Begin ("class=\"ALERT_TXT %s\" style=\"background-image:url('%s/%s');\"", + The_ClassAlertTxtColor[Gbl.Prefs.Theme], Cfg_URL_ICON_PUBLIC,Ale_AlertIcons[AlertType]); HTM_Txt (Txt); HTM_DIV_End (); diff --git a/swad_changelog.h b/swad_changelog.h index 68f30b3d4..63d20da2a 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -602,12 +602,13 @@ TODO: FIX BUG, URGENT! En las fechas como par TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo. */ -#define Log_PLATFORM_VERSION "SWAD 21.70.6 (2021-12-20)" -#define CSS_FILE "swad21.70.1.css" +#define Log_PLATFORM_VERSION "SWAD 21.70.7 (2021-12-20)" +#define CSS_FILE "swad21.70.7.css" #define JS_FILE "swad21.67.4.js" /* // TODO: al ver los resultados de un juego como profesor, el rol del estudiante sale como desconocido y no se puede ver el DNI + Version 21.70.7: Dec 20, 2021 Working on design of dark theme. (321926 lines) Version 21.70.6: Dec 20, 2021 Working on design of dark theme. (321886 lines) Version 21.70.5: Dec 19, 2021 Working on design of dark theme. (321748 lines) Version 21.70.4: Dec 18, 2021 Working on design of dark theme. (321634 lines) diff --git a/swad_theme.c b/swad_theme.c index 6e0b0ba37..5e77b7bc6 100644 --- a/swad_theme.c +++ b/swad_theme.c @@ -403,6 +403,16 @@ const char *The_ClassAlertBackground[The_NUM_THEMES] = [The_THEME_PINK ] = "ALERT_BG_PINK", [The_THEME_DARK ] = "ALERT_BG_DARK", }; +const char *The_ClassAlertTxtColor[The_NUM_THEMES] = + { + [The_THEME_WHITE ] = "ALERT_TXT_WHITE", + [The_THEME_GREY ] = "ALERT_TXT_GREY", + [The_THEME_PURPLE] = "ALERT_TXT_PURPLE", + [The_THEME_BLUE ] = "ALERT_TXT_BLUE", + [The_THEME_YELLOW] = "ALERT_TXT_YELLOW", + [The_THEME_PINK ] = "ALERT_TXT_PINK", + [The_THEME_DARK ] = "ALERT_TXT_DARK", + }; /*****************************************************************************/ /****************************** Private prototypes ***************************/