From c889ba20f71c1a8ad0c5c95e19e32afec13d0d2b Mon Sep 17 00:00:00 2001 From: acanas Date: Wed, 27 Apr 2022 13:56:32 +0200 Subject: [PATCH] Version 21.95: Apr 27, 2022 Fixing design of dark theme. --- css/{swad21.94.2.css => swad21.95.css} | 31 ++++++++++++++++---------- swad_changelog.h | 7 +++--- swad_icon.c | 18 +++------------ swad_icon.h | 3 ++- swad_layout.c | 2 +- swad_timeline_form.c | 1 + swad_timeline_note.c | 2 +- swad_timeline_user.c | 14 ++++++------ 8 files changed, 38 insertions(+), 40 deletions(-) rename css/{swad21.94.2.css => swad21.95.css} (99%) diff --git a/css/swad21.94.2.css b/css/swad21.95.css similarity index 99% rename from css/swad21.94.2.css rename to css/swad21.95.css index 7569a895..3bdb14cd 100644 --- a/css/swad21.94.2.css +++ b/css/swad21.95.css @@ -29,14 +29,14 @@ body font-size:1em; overflow-y:scroll; /* force vertical scrollbar */ } -.BODY_BG_WHITE, -.BODY_BG_GREY, -.BODY_BG_PURPLE, -.BODY_BG_BLUE, -.BODY_BG_YELLOW, -.BODY_BG_PINK {background-color:white;} -.BODY_BG_DARK {background-color:#383838;} - +.BODY_WHITE, +.BODY_GREY, +.BODY_PURPLE, +.BODY_BLUE, +.BODY_YELLOW, +.BODY_PINK {background-color:white;} +.BODY_DARK {background-color:#383838;} + input { font-size:12pt; @@ -93,9 +93,16 @@ address } /*********************** Text decoration of links ****************************/ +.BODY_WHITE a, +.BODY_GREY a, +.BODY_PURPLE a, +.BODY_BLUE a, +.BODY_YELLOW a, +.BODY_PINK a {color:#4d88a1;} +.BODY_DARK a {color:#afc4cc;} a { - color:#4d88a1;text-decoration:none; + text-decoration:none; } a:link, a:visited, a:active { @@ -2352,13 +2359,13 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .ZOOM_YELLOW, .ZOOM_PINK { - background-color:rgba(255,255,255,0.95); + background-color:rgba(255,255,255,0.9); border-color:#c0c0c0; box-shadow:2px 5px 15px #888; } .ZOOM_DARK { - background-color:rgba(0,0,0,0.95); + background-color:rgba(0,0,0,0.9); border-color:#c0c0c0; box-shadow:2px 5px 15px #888; } @@ -4411,7 +4418,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} } .Tml_ICO_DISABLED { - opacity:0.1; + opacity:0.2; } .Tml_SHARER { diff --git a/swad_changelog.h b/swad_changelog.h index f4ff3b4d..0e289a74 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -606,11 +606,12 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate TODO: Attach pdf files in multimedia. */ -#define Log_PLATFORM_VERSION "SWAD 21.94.3 (2022-04-25)" -#define CSS_FILE "swad21.94.2.css" +#define Log_PLATFORM_VERSION "SWAD 21.95 (2022-04-27)" +#define CSS_FILE "swad21.95.css" #define JS_FILE "swad21.92.js" /* - Version 21.94.3: Apr 25, 2022 Working on design of dark theme. (323402 lines) + Version 21.95: Apr 27, 2022 Fixing design of dark theme. (323404 lines) + Version 21.94.3: Apr 25, 2022 Fixing design of dark theme. (323402 lines) Version 21.94.2: Apr 25, 2022 Fixed bug in pagination. Reported by Javier Fernández Baldomero. (323400 lines) Version 21.94.1: Apr 25, 2022 Bugs related to dark theme fixed. (323399 lines) Version 21.94: Apr 25, 2022 Working on design of dark theme. diff --git a/swad_icon.c b/swad_icon.c index b072f560..06759b33 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -402,23 +402,11 @@ void Ico_PutContextualIconToZIP (Act_Action_t NextAction, /**************** Show an icon inside a div (without text) *******************/ /*****************************************************************************/ -void Ico_PutDivIcon (const char *DivClass,const char *Icon,Ico_Color_t Color,const char *Title) +void Ico_PutDivIcon (const char *DivClass, + const char *Icon,Ico_Color_t Color,const char *Title) { - char *Class; - HTM_DIV_Begin ("class=\"%s\"",DivClass); - - if (Color == Ico_UNCHANGED) - Ico_PutIcon (Icon,Color,Title,"CONTEXT_ICO16x16"); - else - { - if (asprintf (&Class,"CONTEXT_ICO16x16 ICO_%s_%s", - Ico_GetPreffix (Color),The_GetSuffix ()) < 0) - Err_NotEnoughMemoryExit (); - Ico_PutIcon (Icon,Color,Title,Class); - free (Class); - } - + Ico_PutIcon (Icon,Color,Title,"CONTEXT_ICO16x16"); HTM_DIV_End (); } diff --git a/swad_icon.h b/swad_icon.h index afd06be3..6b18a6dc 100644 --- a/swad_icon.h +++ b/swad_icon.h @@ -97,7 +97,8 @@ void Ico_PutContextualIconToShowAttendanceList (Act_Action_t NextAction, void Ico_PutContextualIconToZIP (Act_Action_t NextAction, void (*FuncParams) (void *Args),void *Args); -void Ico_PutDivIcon (const char *DivClass,const char *Icon,Ico_Color_t Color,const char *Title); +void Ico_PutDivIcon (const char *DivClass, + const char *Icon,Ico_Color_t Color,const char *Title); void Ico_PutIconLink (const char *Icon,Ico_Color_t Color,const char *Title); void Ico_PutIconTextLink (const char *Icon,Ico_Color_t Color,const char *Text); void Ico_PutSettingIconLink (const char *Icon,Ico_Color_t Color,const char *Title); diff --git a/swad_layout.c b/swad_layout.c index fd32391d..2b5cce1f 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -260,7 +260,7 @@ void Lay_WriteStartOfPage (void) switch (BrowserTab) { case Act_BRW_1ST_TAB: - HTM_TxtF ("\n", + HTM_TxtF ("\n", The_GetSuffix ()); HTM_DIV_Begin ("id=\"zoomLyr\" class=\"ZOOM ZOOM_%s\"", The_GetSuffix ()); diff --git a/swad_timeline_form.c b/swad_timeline_form.c index f550eac9..8eccdce3 100644 --- a/swad_timeline_form.c +++ b/swad_timeline_form.c @@ -212,6 +212,7 @@ void TmlFrm_PutFormToSeeAllFaversSharers (TmlFrm_Action_t Action, .ParamFormat = ParamFormat, .ParamCod = ParamCod, .Icon = TmlFrm_ICON_ELLIPSIS, + .Color = Ico_BLACK, .Title = Txt_View_all_USERS, }; diff --git a/swad_timeline_note.c b/swad_timeline_note.c index cb93b9ea..8733db8b 100644 --- a/swad_timeline_note.c +++ b/swad_timeline_note.c @@ -687,7 +687,7 @@ static void TmlNot_PutFormGoToAction (const struct TmlNot_Note *Not, /***** Icon and link to go to action *****/ /* Begin button */ HTM_BUTTON_Submit_Begin (Txt_TIMELINE_NOTE[Not->Type], - "class=\"BT_LINK FORM_IN_WHITE %s ICO_HIGHLIGHT\"", + "class=\"BT_LINK FORM_IN_%s ICO_HIGHLIGHT\"", The_GetSuffix ()); /* Icon and text */ diff --git a/swad_timeline_user.c b/swad_timeline_user.c index c53a9d70..42472337 100644 --- a/swad_timeline_user.c +++ b/swad_timeline_user.c @@ -52,17 +52,17 @@ extern struct Globals Gbl; /*****************************************************************************/ static void TmlUsr_GetAndShowSharersOrFavers (TmlUsr_FavSha_t FavSha, - long Cod,long UsrCod,unsigned NumUsrs, - TmlUsr_HowManyUsrs_t HowManyUsrs); + long Cod,long UsrCod,unsigned NumUsrs, + TmlUsr_HowManyUsrs_t HowManyUsrs); static void TmlUsr_ShowNumSharersOrFavers (unsigned NumUsrs); static void TmlUsr_ListSharersOrFavers (MYSQL_RES **mysql_res, - unsigned NumUsrs,unsigned NumFirstUsrs); + unsigned NumUsrs,unsigned NumFirstUsrs); static unsigned TmlUsr_GetListFaversOrSharers (TmlUsr_FavSha_t FavSha, - long Cod,long UsrCod,unsigned MaxUsrs, - MYSQL_RES **mysql_res); + long Cod,long UsrCod,unsigned MaxUsrs, + MYSQL_RES **mysql_res); static void TmlUsr_PutDisabledIconFavSha (TmlUsr_FavSha_t FavSha, - unsigned NumUsrs); + unsigned NumUsrs); /*****************************************************************************/ /*************** Remove all content of a user from database ******************/ @@ -303,7 +303,7 @@ void TmlUsr_PutIconFavSha (TmlUsr_FavSha_t FavSha, /*****************************************************************************/ static void TmlUsr_PutDisabledIconFavSha (TmlUsr_FavSha_t FavSha, - unsigned NumUsrs) + unsigned NumUsrs) { extern const char *Txt_TIMELINE_Favourited_by_X_USERS; extern const char *Txt_TIMELINE_Not_favourited_by_anyone;