Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 14.50.1

This commit is contained in:
Antonio Cañas Vargas 2014-12-31 21:45:29 +01:00
parent 1a04994f6e
commit 0ed9ecd1aa
3 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
css/swad_desktop.css
View File

@ -235,9 +235,9 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
.TAB_OFF
{
float:left;
width:86px;height:59px;
width:86px;height:61px;
margin:1px 1px 0 1px;
padding:2px 1px 0 1px;
padding:0 1px 0 1px;
border-radius:6px 6px 0 0;
box-shadow:inset -2px -2px 1px 0 rgba(50, 50, 50, 0.2);
text-align:center;
@ -248,9 +248,9 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
.TAB_ON
{
float:left;
width:88px;height:60px;
width:88px;height:62px;
margin:0;
padding:3px 1px 0 1px;
padding:1px 1px 0 1px;
border-radius:6px 6px 0 0;
box-shadow:inset -2px -2px 1px 0 rgba(50, 50, 50, 0.2);
text-align:center;
@ -261,7 +261,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
.WHITE_TAB_OFF
{
color:#707070;
font-size:7pt;
font-size:7.5pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
@ -270,7 +270,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
.GREY_TAB_OFF
{
color:#505050;
font-size:7pt;
font-size:7.5pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
@ -279,7 +279,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
.BLUE_TAB_OFF
{
color:#365E6E;
font-size:7pt;
font-size:7.5pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
@ -288,7 +288,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
.YELLOW_TAB_OFF
{
color:#7C4D2A;
font-size:7pt;
font-size:7.5pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
@ -297,7 +297,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
.WHITE_TAB_ON
{
color:#4D88A1;
font-size:7pt;
font-size:7.5pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
@ -306,7 +306,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
.GREY_TAB_ON
{
color:#606060;
font-size:7pt;
font-size:7.5pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
@ -315,7 +315,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
.BLUE_TAB_ON
{
color:#4D88A1;
font-size:7pt;
font-size:7.5pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
@ -324,7 +324,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
.YELLOW_TAB_ON
{
color:#BD4815;
font-size:7pt;
font-size:7.5pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
@ -577,33 +577,35 @@ a:hover img.CENTRE_PHOTO_SHOW
.ICON_HIGHLIGHT:hover
{
opacity:1;
transform:scale(1.1,1.1);
}
.ICON_SCALING:hover
{
opacity:1;
transform:scale(1.15,1.15);
}
.ICON_SCALED
{
opacity:1;
transform:scale(1.1,1.1);
transform:scale(1.15,1.15);
}
/***************************** Horizontal menu *******************************/
#submenu_container ul
#horizontal_menu_container ul
{
display:table;
border:0;
margin:0 auto;
padding:0;
padding:0 0 20px; 0;
list-style-type:none;
text-align:center;
vertical-align:middle;
}
#submenu_container ul li
#horizontal_menu_container li
{
display:table-cell;
height:60px;
vertical-align:middle;
}
#submenu_container li
{
display:inline-block;
width:100px;height:60px;
border:0;
margin:0;
padding:0;
text-align:center;
vertical-align:middle;
}
.MENU_OFF
@ -628,7 +630,7 @@ a:hover img.CENTRE_PHOTO_SHOW
}
/******************************** Menu options *******************************/
#menu
#vertical_menu_container
{
list-style-type:none;
padding:0;
@ -652,7 +654,7 @@ a:hover img.CENTRE_PHOTO_SHOW
display:table-cell;
vertical-align:middle;
}
.WHITE_MENU_OFF {color:#707070; font-size:10pt; font-weight:bold; line-height:110%;}
.WHITE_MENU_OFF {color:#4D88A1; font-size:10pt; font-weight:bold; line-height:110%;}
.GREY_MENU_OFF {color:#707070; font-size:10pt; font-weight:bold; line-height:110%;}
.BLUE_MENU_OFF {color:#4D88A1; font-size:10pt; font-weight:bold; line-height:110%;}
.YELLOW_MENU_OFF {color:#BD4815; font-size:10pt; font-weight:bold; line-height:110%;}

1
swad_changelog.h
View File

@ -40,6 +40,7 @@
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1
/*
Version 14.50.1 :Dec 31, 2014 Horizontal menu (not finished). (172736 lines)
Version 14.50 :Dec 31, 2014 Horizontal menu (not finished). (172735 lines)
Version 14.49.2 :Dec 31, 2014 Removed text of menu options with BR. (172611 lines)
Version 14.49.1 :Dec 31, 2014 Changes in layout. (174432 lines)

12
swad_layout.c
View File

@ -337,7 +337,7 @@ void Lay_WriteStartOfPage (void)
#ifdef HORIZONTAL_MENU
fprintf (Gbl.F.Out,"<div id=\"submenu_container\" style=\"display:table; margin:0 auto;\">");
fprintf (Gbl.F.Out,"<div id=\"horizontal_menu_container\">");
Lay_WriteHorizontalMenuThisTabDesktop ();
fprintf (Gbl.F.Out,"</div>");
@ -944,9 +944,7 @@ static void Lay_DrawTabsDeskTop (void)
if (ICanViewTab)
{
fprintf (Gbl.F.Out,"<div"); // This div must be present even in current tab in order to render properly the tab
if (NumTab == Gbl.CurrentTab)
fprintf (Gbl.F.Out," class=\"ICON_SCALED\"");
else
if (NumTab != Gbl.CurrentTab)
fprintf (Gbl.F.Out," class=\"ICON_HIGHLIGHT\"");
fprintf (Gbl.F.Out,">");
Act_FormStart (ActMnu);
@ -956,7 +954,7 @@ static void Lay_DrawTabsDeskTop (void)
The_ClassTabOff[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s32x32.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON28x28\" style=\"margin:4px;\" />"
" class=\"ICON32x32\" style=\"margin:4px;\" />"
"<div>%s</div>"
"</a>"
"</form>",
@ -1153,7 +1151,7 @@ static void Lay_WriteVerticalMenuThisTabDesktop (void)
bool PreviousVisibleOptions = false;
/***** List start *****/
fprintf (Gbl.F.Out,"<ul id=\"menu\">");
fprintf (Gbl.F.Out,"<ul id=\"vertical_menu_container\">");
/***** Loop to write all options in menu. Each row holds an option *****/
for (NumOptInMenu = 0;
@ -1269,7 +1267,7 @@ static void Lay_WriteHorizontalMenuThisTabDesktop (void)
if (IsTheSelectedAction)
fprintf (Gbl.F.Out,"<div class=\"ICON_SCALED\" style=\"display:inline-block;\">");
else
fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT\" style=\"display:inline-block;\">");
fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT ICON_SCALING\" style=\"display:inline-block;\">");
/***** Start of form and link *****/
Act_FormStart (NumAct);