diff --git a/css/swad21.93.4.css b/css/swad21.93.6.css similarity index 99% rename from css/swad21.93.4.css rename to css/swad21.93.6.css index 82f0d8fc..118265a5 100644 --- a/css/swad21.93.4.css +++ b/css/swad21.93.6.css @@ -1934,7 +1934,6 @@ a:hover img.CENTER_PHOTO_SHOW .BANNER {width:150px; height:50px;} .BANNER_SMALL {width:75px; height:25px;} -.ICO_BLACK {color:#404040;} .ICO_DARKRED {color:#660000;} /****** Contextual links with small icons and text to go to some action ******/ @@ -2002,6 +2001,14 @@ a:hover img.CENTER_PHOTO_SHOW .ICO_WHITE_PINK {filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(194deg) brightness(106%) contrast(105%);} /* #ffffff */ .ICO_WHITE_DARK {filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(194deg) brightness(106%) contrast(105%);} /* #ffffff */ +.ICO_YELLOW_WHITE, +.ICO_YELLOW_GREY, +.ICO_YELLOW_PURPLE, +.ICO_YELLOW_BLUE, +.ICO_YELLOW_YELLOW, +.ICO_YELLOW_PINK {filter: invert(61%) sepia(96%) saturate(366%) hue-rotate(352deg) brightness(103%) contrast(101%);} /* #ffb42e */ +.ICO_YELLOW_DARK {filter: invert(61%) sepia(96%) saturate(366%) hue-rotate(352deg) brightness(103%) contrast(101%);} /* #ffb42e */ + /********************************** Frame ************************************/ .FRAME_INLINE { diff --git a/icon/check-circle-green.svg b/icon/check-circle-green.svg new file mode 100644 index 00000000..ccdcad29 --- /dev/null +++ b/icon/check-circle-green.svg @@ -0,0 +1 @@ + diff --git a/icon/check-circle.svg b/icon/check-circle.svg index 6aaa9742..ccdcad29 100644 --- a/icon/check-circle.svg +++ b/icon/check-circle.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/icon/info-circle-blue.svg b/icon/info-circle-blue.svg new file mode 100644 index 00000000..026e71af --- /dev/null +++ b/icon/info-circle-blue.svg @@ -0,0 +1 @@ + diff --git a/swad_alert.c b/swad_alert.c index 90431076..3561a05e 100644 --- a/swad_alert.c +++ b/swad_alert.c @@ -375,8 +375,8 @@ static void Ale_ShowFixAlertAndButton1 (Ale_AlertType_t AlertType,const char *Tx { [Ale_NONE ] = NULL, [Ale_CLIPBOARD] = "clipboard.svg", - [Ale_INFO ] = "info-circle.svg", - [Ale_SUCCESS ] = "check-circle.svg", + [Ale_INFO ] = "info-circle-blue.svg", + [Ale_SUCCESS ] = "check-circle-green.svg", [Ale_QUESTION ] = "question64x64.gif", // animated gif [Ale_WARNING ] = "warning64x64.gif", // animated gif [Ale_ERROR ] = "error64x64.gif", // animated gif diff --git a/swad_changelog.h b/swad_changelog.h index 84b46b8f..70b872fb 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -606,10 +606,15 @@ 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.93.5 (2022-04-23)" -#define CSS_FILE "swad21.93.4.css" +#define Log_PLATFORM_VERSION "SWAD 21.93.6 (2022-04-25)" +#define CSS_FILE "swad21.93.6.css" #define JS_FILE "swad21.92.js" /* + Version 21.93.6: Apr 25, 2022 Working on design of dark theme. (323358 lines) +Copy the following icons to icon public directory: +sudo cp icon/info-circle-blue.svg.svg /var/www/html/swad/icon/ +sudo cp icon/check-circle-green.svg /var/www/html/swad/icon/ + Version 21.93.5: Apr 23, 2022 Working on design of dark theme. (323346 lines) Version 21.93.4: Apr 22, 2022 Working on design of dark theme. (323313 lines) Version 21.93.3: Apr 22, 2022 Working on design of dark theme. (323259 lines) diff --git a/swad_course_config.c b/swad_course_config.c index 22c491eb..be7f05da 100644 --- a/swad_course_config.c +++ b/swad_course_config.c @@ -446,7 +446,7 @@ static void CrsCfg_Indicators (void) Ico_PutIcon ("check-circle.svg",Ico_GREEN, Title,"ICO16x16"); else - Ico_PutIcon ("exclamation-triangle.svg",Ico_RED, // TODO: Change to Ico_YELLOW + Ico_PutIcon ("exclamation-triangle.svg",Ico_YELLOW, Title,"ICO16x16"); HTM_BUTTON_End (); free (Title); diff --git a/swad_icon.c b/swad_icon.c index 5ae080ff..8818259f 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -87,6 +87,7 @@ const char *Ico_GetPreffix (Ico_Color_t Color) [Ico_GREEN ] = "GREEN", [Ico_RED ] = "RED", [Ico_WHITE ] = "WHITE", + [Ico_YELLOW ] = "YELLOW", }; return Ico_CSS_Preffix[Color]; diff --git a/swad_icon.h b/swad_icon.h index e63bb45f..afd06be3 100644 --- a/swad_icon.h +++ b/swad_icon.h @@ -40,7 +40,7 @@ typedef enum } Ico_IconSet_t; #define Ico_ICON_SET_DEFAULT Ico_ICON_SET_AWESOME -#define Ico_NUM_COLORS 5 +#define Ico_NUM_COLORS 6 typedef enum { Ico_UNCHANGED = 0, @@ -48,6 +48,7 @@ typedef enum Ico_GREEN = 2, Ico_RED = 3, Ico_WHITE = 4, + Ico_YELLOW = 5, } Ico_Color_t; /*****************************************************************************/ diff --git a/swad_match.c b/swad_match.c index 750849c1..86147ae7 100644 --- a/swad_match.c +++ b/swad_match.c @@ -3301,7 +3301,8 @@ static void Mch_PutBigButton (Act_Action_t NextAction,const char *Id, /***** Put icon with link *****/ HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\""); HTM_BUTTON_Submit_Begin (Txt, - "class=\"BT_LINK MCH_BUTTON_ON ICO_BLACK\""); + "class=\"BT_LINK MCH_BUTTON_ON ICO_BLACK_%s\"", + The_GetSuffix ()); HTM_TxtF ("",Icon); HTM_BUTTON_End (); HTM_DIV_End (); @@ -3318,7 +3319,8 @@ static void Mch_PutBigButtonHidden (const char *Icon) { /***** Put inactive icon *****/ HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\""); - HTM_BUTTON_Begin (NULL,"class=\"BT_LINK_OFF MCH_BUTTON_HIDDEN ICO_BLACK\""); + HTM_BUTTON_Begin (NULL,"class=\"BT_LINK_OFF MCH_BUTTON_HIDDEN ICO_BLACK_%s\"", + The_GetSuffix ()); HTM_TxtF ("",Icon); HTM_BUTTON_End (); HTM_DIV_End (); diff --git a/swad_project.c b/swad_project.c index 71b97cba..8effbf58 100644 --- a/swad_project.c +++ b/swad_project.c @@ -471,7 +471,7 @@ static void Prj_ShowPrjsInCurrentPage (void *Projects) Prj_PutIconsListProjects,Projects, Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE); - /***** Put forms to choice which projects to show *****/ + /***** Put filters to choice which projects to show *****/ /* 1st. row */ Set_BeginSettingsHead (); Prj_ShowFormToFilterByMy_All ((struct Prj_Projects *) Projects); @@ -701,7 +701,7 @@ static void Prj_ShowFormToFilterByWarning (const struct Prj_Projects *Projects) Ico_Color_t Color; } FaultinessIcon[Prj_NUM_FAULTINESS] = { - [Prj_FAULTY ] = {"exclamation-triangle.svg",Ico_RED }, + [Prj_FAULTY ] = {"exclamation-triangle.svg",Ico_YELLOW}, [Prj_FAULTLESS] = {"check-circle.svg" ,Ico_GREEN}, }; diff --git a/swad_test_visibility.c b/swad_test_visibility.c index 354a3ef9..b0c5c77a 100644 --- a/swad_test_visibility.c +++ b/swad_test_visibility.c @@ -70,11 +70,12 @@ void TstVis_ShowVisibilityIcons (unsigned SelectedVisibility,bool Hidden) Txt_TST_STR_VISIBILITY[Visibility], Txt_TST_HIDDEN_VISIBLE[ItemVisible]) < 0) Err_NotEnoughMemoryExit (); - if (ItemVisible && !Hidden) - Ico_PutIconOn (Icons[Visibility],Ico_GREEN ,Title); - else + if (Hidden) Ico_PutIconOff (Icons[Visibility],ItemVisible ? Ico_GREEN : Ico_RED ,Title); + else + Ico_PutIconOn (Icons[Visibility],ItemVisible ? Ico_GREEN : + Ico_RED ,Title); free (Title); } }