From 5a9f5d9009787f12b2d3c43fe990c2d9c0aa8d82 Mon Sep 17 00:00:00 2001 From: acanas Date: Wed, 8 Dec 2021 14:37:34 +0100 Subject: [PATCH] Version 21.68: Dec 08, 2021 Beginning design of dark theme. --- css/{swad21.67.4.css => swad21.68.css} | 71 ++++++++++++++++++++------ swad_changelog.h | 10 +++- swad_layout.c | 6 ++- swad_menu.c | 12 +++-- swad_tab.c | 1 + swad_theme.c | 53 +++++++++++++++++++ swad_theme.h | 5 +- 7 files changed, 134 insertions(+), 24 deletions(-) rename css/{swad21.67.4.css => swad21.68.css} (98%) diff --git a/css/swad21.67.4.css b/css/swad21.68.css similarity index 98% rename from css/swad21.67.4.css rename to css/swad21.68.css index 9cf4a628..b798f306 100644 --- a/css/swad21.67.4.css +++ b/css/swad21.68.css @@ -25,11 +25,18 @@ body { margin:0; - background-color:white; font-family:"Helvetica Neue",Helvetica,Arial,sans-serif; font-size:1em; overflow-y:scroll; /* force vertical scrollbar */ } +.BODY_BG_WHITE {background-color:white;} +.BODY_BG_GREY {background-color:white;} +.BODY_BG_PURPLE {background-color:white;} +.BODY_BG_BLUE {background-color:white;} +.BODY_BG_YELLOW {background-color:white;} +.BODY_BG_PINK {background-color:white;} +.BODY_BG_DARK {background-color:#404040;} + input { font-size:12pt; @@ -139,10 +146,10 @@ a:hover /* Default ==> underlined */ background-image:linear-gradient(#bf667f 0,#c86b85 100%); background-repeat:no-repeat; } -.HEAD_ROW_1_PINK +.HEAD_ROW_1_DARK { - background-image:-webkit-linear-gradient(#8e5e8f 0,#ab5c84 100%); /* Safari */ - background-image:linear-gradient(#8e5e8f 0,#ab5c84 100%); + background-image:-webkit-linear-gradient(#383838 0,#404040 100%); /* Safari */ + background-image:linear-gradient(#383838 0,#404040 100%); background-repeat:no-repeat; } @@ -196,6 +203,7 @@ a:hover /* Default ==> underlined */ .TAGLINE_BLUE {color:#bad2da;} .TAGLINE_YELLOW {color:#b3b0b3;} .TAGLINE_PINK {color:#e8e8e8;} +.TAGLINE_DARK {color:#e0e0e0;} #head_row_1_search { @@ -246,6 +254,7 @@ a:hover /* Default ==> underlined */ .USR_BLUE {color:white; font-size:15pt; font-weight:bold; white-space:nowrap;} .USR_YELLOW {color:#b3b0b3; font-size:15pt; font-weight:bold; white-space:nowrap;} .USR_PINK {color:white; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_BLACK {color:#e0e0e0; font-size:15pt; font-weight:bold; white-space:nowrap;} #head_row_1_right { @@ -298,6 +307,10 @@ a:hover /* Default ==> underlined */ background-image:linear-gradient(#ab5c84 0,#c86b85 100%); background-repeat:no-repeat; } +.HEAD_ROW_2_DARK + { + background-color:#404040; + } /******************************* Current time ********************************/ #head_row_2_time @@ -451,6 +464,7 @@ a:hover /* Default ==> underlined */ .BC_BLUE {color:#ffc040;} .BC_YELLOW {color:#ffb42e;} .BC_PINK {color:#ffc040;} +.BC_DARK {color:#ffb42e;} .BC_ICON { @@ -517,6 +531,7 @@ a:hover /* Default ==> underlined */ .MAIN_TITLE_BLUE {color:white;} .MAIN_TITLE_YELLOW {color:white;} .MAIN_TITLE_PINK {color:white;} +.MAIN_TITLE_DARK {color:#f7f6f5;} #my_courses { width:130px; @@ -554,11 +569,12 @@ a:hover /* Default ==> underlined */ } } .NOTIF_WHITE {color:#707070; font-size:12pt; white-space:nowrap;} -.NOTIF_GREY {color:#e0e0e0; font-size:12pt; white-space:nowrap;} +.NOTIF_GREY {color:#e0e0e0; font-size:12pt; white-space:nowrap;} .NOTIF_PURPLE {color:#e0e0e0; font-size:12pt; white-space:nowrap;} -.NOTIF_BLUE {color:white; font-size:12pt; white-space:nowrap;} +.NOTIF_BLUE {color:white; font-size:12pt; white-space:nowrap;} .NOTIF_YELLOW {color:#b3b0b3; font-size:12pt; white-space:nowrap;} -.NOTIF_PINK {color:white; font-size:12pt; white-space:nowrap;} +.NOTIF_PINK {color:white; font-size:12pt; white-space:nowrap;} +.NOTIF_DARK {color:#e0e0e0; font-size:12pt; white-space:nowrap;} /******************* Layout (third heading row with tabs) ********************/ .HEAD_ROW_3_WHITE @@ -590,7 +606,11 @@ a:hover /* Default ==> underlined */ background-image:-webkit-linear-gradient(#c86b85 0,#c86b85 54px,white 54px,white 100%); /* Safari */ background-image:linear-gradient(#c86b85 0,#c86b85 54px,white 54px,white 100%); } - +.HEAD_ROW_3_DARK + { + background-image:-webkit-linear-gradient(#404040 0,#404040 54px,white 54px,white 100%); /* Safari */ + background-image:linear-gradient(#404040 0,#404040 54px,#404040 54px,#404040 100%); + } .TAB_LIST { @@ -753,6 +773,7 @@ a:hover /* Default ==> underlined */ .TAB_ON_BLUE {background-color:#e8f3f6;} .TAB_ON_YELLOW {background-color:#faf0da;} .TAB_ON_PINK {background-color:#faf0e8;} +.TAB_ON_DARK {background-color:#606060;} .TAB_OFF_WHITE {background-color:#d4d4d4;} .TAB_OFF_GREY {background-color:#aea79f;} @@ -760,6 +781,7 @@ a:hover /* Default ==> underlined */ .TAB_OFF_BLUE {background-color:#cae1e8;} .TAB_OFF_YELLOW {background-color:#f4dfb2;} .TAB_OFF_PINK {background-color:#f3dcca;} +.TAB_OFF_DARK {background-color:#aea79f;} .TAB_OFF_TXT_WHITE {color:#707070;} .TAB_OFF_TXT_GREY {color:#505050;} @@ -767,6 +789,7 @@ a:hover /* Default ==> underlined */ .TAB_OFF_TXT_BLUE {color:#365e6e;} .TAB_OFF_TXT_YELLOW {color:#4a2e19;} .TAB_OFF_TXT_PINK {color:#505050;} +.TAB_OFF_TXT_DARK {color:#505050;} .TAB_ON_TXT_WHITE {color:#4d88A1;} .TAB_ON_TXT_GREY {color:#606060;} @@ -774,6 +797,7 @@ a:hover /* Default ==> underlined */ .TAB_ON_TXT_BLUE {color:#4d88A1;} .TAB_ON_TXT_YELLOW {color:#7c4d2a;} .TAB_ON_TXT_PINK {color:#63474e;} +.TAB_ON_TXT_DARK {color:#606060;} .TAB_ICO { @@ -927,10 +951,13 @@ a:hover /* Default ==> underlined */ transform:scale(1.286,1.286); } +#main_horizontal .MENU_ICO_TXT + { + } #main_horizontal .MENU_ICO { box-sizing:border-box; - padding:26px 0 0 0; + padding:28px 0 0 0; background-size:auto 26px; background-repeat:no-repeat; background-position:center top; @@ -986,10 +1013,13 @@ a:hover /* Default ==> underlined */ opacity:1; transform:scale(1.286,1.286); } + #main_vertical .MENU_ICO_TXT + { + } #main_vertical .MENU_ICO { box-sizing:border-box; - padding:26px 0 0 0; + padding:28px 0 0 0; background-size:auto 26px; background-repeat:no-repeat; background-position:center top; @@ -1042,9 +1072,14 @@ a:hover /* Default ==> underlined */ { opacity:1; } - #main_vertical .MENU_ICO + #main_vertical .MENU_ICO_TXT { display:table-cell; + vertical-align:middle; + } + #main_vertical .MENU_ICO + { + display:inline-block; box-sizing:border-box; height:40px; vertical-align:middle; @@ -1081,8 +1116,9 @@ a:hover /* Default ==> underlined */ /********************************* Menu fonts ********************************/ @media only screen and (max-width: 800px) { /* For mobile-phones */ - .MENU_TEXT + .MENU_TXT { + display:inline; font-size:12pt; font-weight:bold; line-height:110%; @@ -1095,8 +1131,9 @@ a:hover /* Default ==> underlined */ } @media only screen and (min-width: 800px) { /* For tablets and desktop */ - .MENU_TEXT + .MENU_TXT { + display:inline; font-size:12pt; font-weight:bold; line-height:110%; @@ -1105,12 +1142,15 @@ a:hover /* Default ==> underlined */ } } +.MENU_ICO_DARK {filter:invert(1);} + .MENU_TXT_WHITE {color:#4D88a1;} .MENU_TXT_GREY {color:#606060;} .MENU_TXT_PURPLE {color:#573c4d;} .MENU_TXT_BLUE {color:#4D88a1;} .MENU_TXT_YELLOW {color:#7c4d2a;} .MENU_TXT_PINK {color:#63474e;} +.MENU_TXT_DARK {color:#c0c0c0;} /***************************** Users connected *******************************/ .CONNECTED @@ -2217,6 +2257,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .TITLE_BLUE {color:#4D88A1; font-size:18pt;} .TITLE_YELLOW {color:#7c4d2a; font-size:18pt;} .TITLE_PINK {color:#63474e; font-size:18pt;} +.TITLE_DARK {color:#505050; font-size:18pt;} /*********************** Icon and checkbox highlighting **********************/ .ICO_HIDDEN @@ -2250,6 +2291,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .FORM_IN_BLUE {color:#4d88a1; font-size:13pt;} .FORM_IN_YELLOW {color:#7c4d2a; font-size:13pt;} .FORM_IN_PINK {color:#4d88a1; font-size:13pt;} +.FORM_IN_DARK {color:#4d88a1; font-size:13pt;} /* Outside white box */ .FORM_OUT_WHITE {color:#4d88a1; font-size:13pt;} @@ -2258,6 +2300,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .FORM_OUT_BLUE {color:#4d88a1; font-size:13pt;} .FORM_OUT_YELLOW {color:#7c4d2a; font-size:13pt;} .FORM_OUT_PINK {color:#63474e; font-size:13pt;} +.FORM_OUT_DARK {color:#4d88a1; font-size:13pt;} .BOLD {font-weight:bold;} .NOWRAP {white-space:nowrap;} @@ -2440,11 +2483,9 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .DAT_SMALL_GREY {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:12pt;} .DAT_SMALL_RED {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#660000; font-size:12pt;} -.DAT_SMALL_PURPLE {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:12pt;} .DAT_SMALL_GREEN {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#246600; font-size:12pt;} .DAT_SMALL_BLUE {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#0080FF; font-size:12pt;} .DAT_SMALL_YELLOW {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#C0C000; font-size:12pt;} -.DAT_SMALL_PINK {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#707070; font-size:12pt;} /******************************** User's IDs *********************************/ .USR_ID {font-size:18pt; font-weight:bold;} diff --git a/swad_changelog.h b/swad_changelog.h index 2afdbbda..44b6dbd1 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -602,10 +602,16 @@ 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.67.4 (2021-12-07)" -#define CSS_FILE "swad21.67.4.css" +#define Log_PLATFORM_VERSION "SWAD 21.68 (2021-12-08)" +#define CSS_FILE "swad21.68.css" #define JS_FILE "swad21.67.4.js" /* + Version 21.68: Dec 08, 2021 Beginning design of dark theme. (320444 lines) +Copy the following icons to icon public directory: +sudo mkdir /var/www/html/swad/icon/theme/dark +sudo cp -a icon/theme/dark/theme_32x20.gif /var/www/html/swad/icon/theme/dark +sudo cp -a icon/theme/dark/sitemap.svg /var/www/html/swad/icon/theme/dark + Version 21.67.4: Dec 07, 2021 Fixed bug in CSS for photos. Reported by Cristina Sánchez Justicia. (320339 lines) Version 21.67.3: Dec 04, 2021 Help about user photo shapes. (320337 lines) Version 21.67.2: Dec 04, 2021 Renamed exam announcements to calls for exams in help wiki. (320316 lines) diff --git a/swad_layout.c b/swad_layout.c index ff9c4826..639e7c50 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -106,6 +106,7 @@ void Lay_WriteStartOfPage (void) { extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES]; extern const unsigned Txt_Current_CGI_SWAD_Language; + extern const char *The_ClassBodyBG[The_NUM_THEMES]; extern const char *The_TabOnBgColors[The_NUM_THEMES]; static const char *LayoutMainZone[Mnu_NUM_MENUS] = { @@ -257,7 +258,8 @@ void Lay_WriteStartOfPage (void) switch (BrowserTab) { case Act_BRW_1ST_TAB: - HTM_Txt ("\n"); + HTM_TxtF ("\n", + The_ClassBodyBG[Gbl.Prefs.Theme]); HTM_DIV_Begin ("id=\"zoomLyr\" class=\"ZOOM\""); HTM_IMG (Cfg_URL_ICON_PUBLIC,"usr_bl.jpg",NULL, "class=\"IMG_USR\" id=\"zoomImg\""); @@ -974,6 +976,7 @@ static void Lay_WritePageTopHeading (void) [The_THEME_BLUE ] = "HEAD_ROW_1_BLUE", [The_THEME_YELLOW] = "HEAD_ROW_1_YELLOW", [The_THEME_PINK ] = "HEAD_ROW_1_PINK", + [The_THEME_DARK ] = "HEAD_ROW_1_DARK", }; static const char *ClassHeadRow2[The_NUM_THEMES] = { @@ -983,6 +986,7 @@ static void Lay_WritePageTopHeading (void) [The_THEME_BLUE ] = "HEAD_ROW_2_BLUE", [The_THEME_YELLOW] = "HEAD_ROW_2_YELLOW", [The_THEME_PINK ] = "HEAD_ROW_2_PINK", + [The_THEME_DARK ] = "HEAD_ROW_2_DARK", }; /***** Begin header *****/ diff --git a/swad_menu.c b/swad_menu.c index 84bc3a78..fd05c7c3 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -209,6 +209,7 @@ Act_Action_t Mnu_GetFirstActionAvailableInCurrentTab (void) void Mnu_WriteMenuThisTab (void) { + extern const char *The_ClassIcoMenu[Ico_NUM_ICON_SETS][The_NUM_THEMES]; extern const char *The_ClassTxtMenu[The_NUM_THEMES]; extern const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB]; unsigned NumOptInMenu; @@ -249,10 +250,13 @@ void Mnu_WriteMenuThisTab (void) NULL); /***** Icon and text *****/ - HTM_DIV_Begin ("class=\"MENU_ICO\" style=\"background-image:url('%s/%s');\"", - Gbl.Prefs.URLIconSet, - Act_GetIcon (NumAct)); - HTM_DIV_Begin ("class=\"MENU_TEXT %s\"", + HTM_DIV_Begin ("class=\"MENU_ICO_TXT\""); + HTM_DIV_Begin ("class=\"MENU_ICO%s\" style=\"background-image:url('%s/%s');\"", + The_ClassIcoMenu[Gbl.Prefs.IconSet][Gbl.Prefs.Theme], + Gbl.Prefs.URLIconSet, + Act_GetIcon (NumAct)); + HTM_DIV_End (); + HTM_DIV_Begin ("class=\"MENU_TXT %s\"", The_ClassTxtMenu[Gbl.Prefs.Theme]); HTM_Txt (Txt_MENU_TITLE[Gbl.Action.Tab][NumOptInMenu]); HTM_DIV_End (); diff --git a/swad_tab.c b/swad_tab.c index abf7de1d..3d45e51f 100644 --- a/swad_tab.c +++ b/swad_tab.c @@ -67,6 +67,7 @@ void Tab_DrawTabs (void) [The_THEME_BLUE ] = "HEAD_ROW_3_BLUE", [The_THEME_YELLOW] = "HEAD_ROW_3_YELLOW", [The_THEME_PINK ] = "HEAD_ROW_3_PINK", + [The_THEME_DARK ] = "HEAD_ROW_3_DARK", }; /***** Begin tabs container *****/ diff --git a/swad_theme.c b/swad_theme.c index 30619ad9..a50b31ec 100644 --- a/swad_theme.c +++ b/swad_theme.c @@ -60,6 +60,7 @@ const char *The_ThemeId[The_NUM_THEMES] = [The_THEME_BLUE ] = "blue", [The_THEME_YELLOW] = "yellow", [The_THEME_PINK ] = "pink", + [The_THEME_DARK ] = "dark", }; const char *The_ThemeNames[The_NUM_THEMES] = @@ -70,6 +71,18 @@ const char *The_ThemeNames[The_NUM_THEMES] = [The_THEME_BLUE ] = "Blue", [The_THEME_YELLOW] = "Yellow", [The_THEME_PINK ] = "Pink", + [The_THEME_DARK ] = "Dark", + }; + +const char *The_ClassBodyBG[The_NUM_THEMES] = + { + [The_THEME_WHITE ] = "BODY_BG_WHITE", + [The_THEME_GREY ] = "BODY_BG_GREY", + [The_THEME_PURPLE] = "BODY_BG_PURPLE", + [The_THEME_BLUE ] = "BODY_BG_BLUE", + [The_THEME_YELLOW] = "BODY_BG_YELLOW", + [The_THEME_PINK ] = "BODY_BG_PINK", + [The_THEME_DARK ] = "BODY_BG_DARK", }; const char *The_TabOnBgColors[The_NUM_THEMES] = @@ -80,6 +93,7 @@ const char *The_TabOnBgColors[The_NUM_THEMES] = [The_THEME_BLUE ] = "TAB_ON_BLUE", [The_THEME_YELLOW] = "TAB_ON_YELLOW", [The_THEME_PINK ] = "TAB_ON_PINK", + [The_THEME_DARK ] = "TAB_ON_DARK", }; const char *The_TabOffBgColors[The_NUM_THEMES] = @@ -90,6 +104,7 @@ const char *The_TabOffBgColors[The_NUM_THEMES] = [The_THEME_BLUE ] = "TAB_OFF_BLUE", [The_THEME_YELLOW] = "TAB_OFF_YELLOW", [The_THEME_PINK ] = "TAB_OFF_PINK", + [The_THEME_DARK ] = "TAB_OFF_DARK", }; const char *The_ClassTagline[The_NUM_THEMES] = @@ -100,6 +115,7 @@ const char *The_ClassTagline[The_NUM_THEMES] = [The_THEME_BLUE ] = "BT_LINK TAGLINE_BLUE", [The_THEME_YELLOW] = "BT_LINK TAGLINE_YELLOW", [The_THEME_PINK ] = "BT_LINK TAGLINE_PINK", + [The_THEME_DARK ] = "BT_LINK TAGLINE_DARK", }; const char *The_ClassNotif[The_NUM_THEMES] = @@ -110,6 +126,7 @@ const char *The_ClassNotif[The_NUM_THEMES] = [The_THEME_BLUE ] = "BT_LINK NOTIF_BLUE", [The_THEME_YELLOW] = "BT_LINK NOTIF_YELLOW", [The_THEME_PINK ] = "BT_LINK NOTIF_PINK", + [The_THEME_DARK ] = "BT_LINK NOTIF_DARK", }; const char *The_ClassUsr[The_NUM_THEMES] = @@ -120,6 +137,7 @@ const char *The_ClassUsr[The_NUM_THEMES] = [The_THEME_BLUE ] = "USR_BLUE", [The_THEME_YELLOW] = "USR_YELLOW", [The_THEME_PINK ] = "USR_PINK", + [The_THEME_DARK ] = "USR_DARK", }; const char *The_ClassBreadcrumb[The_NUM_THEMES] = @@ -130,6 +148,7 @@ const char *The_ClassBreadcrumb[The_NUM_THEMES] = [The_THEME_BLUE ] = "BC_BLUE", [The_THEME_YELLOW] = "BC_YELLOW", [The_THEME_PINK ] = "BC_PINK", + [The_THEME_DARK ] = "BC_DARK", }; const char *The_ClassCourse[The_NUM_THEMES] = @@ -140,6 +159,26 @@ const char *The_ClassCourse[The_NUM_THEMES] = [The_THEME_BLUE ] = "MAIN_TITLE_BLUE", [The_THEME_YELLOW] = "MAIN_TITLE_YELLOW", [The_THEME_PINK ] = "MAIN_TITLE_PINK", + [The_THEME_DARK ] = "MAIN_TITLE_DARK", + }; + +const char *The_ClassIcoMenu[Ico_NUM_ICON_SETS][The_NUM_THEMES] = + { + [Ico_ICON_SET_AWESOME][The_THEME_WHITE ] = "", + [Ico_ICON_SET_AWESOME][The_THEME_GREY ] = "", + [Ico_ICON_SET_AWESOME][The_THEME_PURPLE] = "", + [Ico_ICON_SET_AWESOME][The_THEME_BLUE ] = "", + [Ico_ICON_SET_AWESOME][The_THEME_YELLOW] = "", + [Ico_ICON_SET_AWESOME][The_THEME_PINK ] = "", + [Ico_ICON_SET_AWESOME][The_THEME_DARK ] = " MENU_ICO_DARK", + + [Ico_ICON_SET_NUVOLA ][The_THEME_WHITE ] = "", + [Ico_ICON_SET_NUVOLA ][The_THEME_GREY ] = "", + [Ico_ICON_SET_NUVOLA ][The_THEME_PURPLE] = "", + [Ico_ICON_SET_NUVOLA ][The_THEME_BLUE ] = "", + [Ico_ICON_SET_NUVOLA ][The_THEME_YELLOW] = "", + [Ico_ICON_SET_NUVOLA ][The_THEME_PINK ] = "", + [Ico_ICON_SET_NUVOLA ][The_THEME_DARK ] = "", }; const char *The_ClassTxtMenu[The_NUM_THEMES] = @@ -150,6 +189,7 @@ const char *The_ClassTxtMenu[The_NUM_THEMES] = [The_THEME_BLUE ] = "MENU_TXT_BLUE", [The_THEME_YELLOW] = "MENU_TXT_YELLOW", [The_THEME_PINK ] = "MENU_TXT_PINK", + [The_THEME_DARK ] = "MENU_TXT_DARK", }; const char *The_ClassTxtTabOff[The_NUM_THEMES] = @@ -160,6 +200,7 @@ const char *The_ClassTxtTabOff[The_NUM_THEMES] = [The_THEME_BLUE ] = "TAB_OFF_TXT_BLUE", [The_THEME_YELLOW] = "TAB_OFF_TXT_YELLOW", [The_THEME_PINK ] = "TAB_OFF_TXT_PINK", + [The_THEME_DARK ] = "TAB_OFF_TXT_DARK", }; const char *The_ClassTxtTabOn[The_NUM_THEMES] = @@ -170,6 +211,7 @@ const char *The_ClassTxtTabOn[The_NUM_THEMES] = [The_THEME_BLUE ] = "TAB_ON_TXT_BLUE", [The_THEME_YELLOW] = "TAB_ON_TXT_YELLOW", [The_THEME_PINK ] = "TAB_ON_TXT_PINK", + [The_THEME_DARK ] = "TAB_ON_TXT_DARK", }; const char *The_ClassTitle[The_NUM_THEMES] = @@ -180,6 +222,7 @@ const char *The_ClassTitle[The_NUM_THEMES] = [The_THEME_BLUE ] = "TITLE_BLUE", [The_THEME_YELLOW] = "TITLE_YELLOW", [The_THEME_PINK ] = "TITLE_PINK", + [The_THEME_DARK ] = "TITLE_DARK", }; const char *The_ClassFormLinkInBox[The_NUM_THEMES] = @@ -190,6 +233,7 @@ const char *The_ClassFormLinkInBox[The_NUM_THEMES] = [The_THEME_BLUE ] = "BT_LINK FORM_IN_BLUE", [The_THEME_YELLOW] = "BT_LINK FORM_IN_YELLOW", [The_THEME_PINK ] = "BT_LINK FORM_IN_PINK", + [The_THEME_DARK ] = "BT_LINK FORM_IN_DARK", }; const char *The_ClassFormInBox[The_NUM_THEMES] = @@ -200,6 +244,7 @@ const char *The_ClassFormInBox[The_NUM_THEMES] = [The_THEME_BLUE ] = "FORM_IN_BLUE", [The_THEME_YELLOW] = "FORM_IN_YELLOW", [The_THEME_PINK ] = "FORM_IN_PINK", + [The_THEME_DARK ] = "FORM_IN_DARK", }; const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES] = @@ -210,6 +255,7 @@ const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES] = [The_THEME_BLUE ] = "BT_LINK FORM_IN_BLUE BOLD", [The_THEME_YELLOW] = "BT_LINK FORM_IN_YELLOW BOLD", [The_THEME_PINK ] = "BT_LINK FORM_IN_PINK BOLD", + [The_THEME_DARK ] = "BT_LINK FORM_IN_DARK BOLD", }; const char *The_ClassFormInBoxBold[The_NUM_THEMES] = @@ -220,6 +266,7 @@ const char *The_ClassFormInBoxBold[The_NUM_THEMES] = [The_THEME_BLUE ] = "FORM_IN_BLUE BOLD", [The_THEME_YELLOW] = "FORM_IN_YELLOW BOLD", [The_THEME_PINK ] = "FORM_IN_PINK BOLD", + [The_THEME_DARK ] = "FORM_IN_DARK BOLD", }; const char *The_ClassFormLinkInBoxNoWrap[The_NUM_THEMES] = @@ -230,6 +277,7 @@ const char *The_ClassFormLinkInBoxNoWrap[The_NUM_THEMES] = [The_THEME_BLUE ] = "BT_LINK FORM_IN_BLUE NOWRAP", [The_THEME_YELLOW] = "BT_LINK FORM_IN_YELLOW NOWRAP", [The_THEME_PINK ] = "BT_LINK FORM_IN_PINK NOWRAP", + [The_THEME_DARK ] = "BT_LINK FORM_IN_DARK NOWRAP", }; const char *The_ClassFormInBoxNoWrap[The_NUM_THEMES] = @@ -240,6 +288,7 @@ const char *The_ClassFormInBoxNoWrap[The_NUM_THEMES] = [The_THEME_BLUE ] = "FORM_IN_BLUE NOWRAP", [The_THEME_YELLOW] = "FORM_IN_YELLOW NOWRAP", [The_THEME_PINK ] = "FORM_IN_PINK NOWRAP", + [The_THEME_DARK ] = "FORM_IN_DARK NOWRAP", }; const char *The_ClassFormLinkOutBox[The_NUM_THEMES] = @@ -250,6 +299,7 @@ const char *The_ClassFormLinkOutBox[The_NUM_THEMES] = [The_THEME_BLUE ] = "BT_LINK FORM_OUT_BLUE", [The_THEME_YELLOW] = "BT_LINK FORM_OUT_YELLOW", [The_THEME_PINK ] = "BT_LINK FORM_OUT_PINK", + [The_THEME_DARK ] = "BT_LINK FORM_OUT_DARK", }; const char *The_ClassFormOutBox[The_NUM_THEMES] = @@ -260,6 +310,7 @@ const char *The_ClassFormOutBox[The_NUM_THEMES] = [The_THEME_BLUE ] = "FORM_OUT_BLUE", [The_THEME_YELLOW] = "FORM_OUT_YELLOW", [The_THEME_PINK ] = "FORM_OUT_PINK", + [The_THEME_DARK ] = "FORM_OUT_DARK", }; const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES] = @@ -270,6 +321,7 @@ const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES] = [The_THEME_BLUE ] = "BT_LINK FORM_OUT_BLUE BOLD", [The_THEME_YELLOW] = "BT_LINK FORM_OUT_YELLOW BOLD", [The_THEME_PINK ] = "BT_LINK FORM_OUT_PINK BOLD", + [The_THEME_DARK ] = "BT_LINK FORM_OUT_DARK BOLD", }; const char *The_ClassFormOutBoxBold[The_NUM_THEMES] = @@ -280,6 +332,7 @@ const char *The_ClassFormOutBoxBold[The_NUM_THEMES] = [The_THEME_BLUE ] = "FORM_OUT_BLUE BOLD", [The_THEME_YELLOW] = "FORM_OUT_YELLOW BOLD", [The_THEME_PINK ] = "FORM_OUT_PINK BOLD", + [The_THEME_DARK ] = "FORM_OUT_DARK BOLD", }; /*****************************************************************************/ diff --git a/swad_theme.h b/swad_theme.h index 1aa51893..acfe9318 100644 --- a/swad_theme.h +++ b/swad_theme.h @@ -27,7 +27,7 @@ /***************************** Public constants ******************************/ /*****************************************************************************/ -#define The_NUM_THEMES 6 +#define The_NUM_THEMES 7 /*****************************************************************************/ /******************************* Public types ********************************/ @@ -41,8 +41,9 @@ typedef enum The_THEME_BLUE = 3, The_THEME_YELLOW = 4, The_THEME_PINK = 5, + The_THEME_DARK = 6, } The_Theme_t; -#define The_THEME_DEFAULT The_THEME_PINK +#define The_THEME_DEFAULT The_THEME_GREY /*****************************************************************************/ /***************************** Public prototypes *****************************/