From 2163ba8aebd9aed449c6374bc4fd81decb5b77db Mon Sep 17 00:00:00 2001 From: Álvaro Fernando Date: Thu, 3 Sep 2015 14:01:44 -0300 Subject: [PATCH] Fixing box-2 and box-3 to work with box-4 --- css/left-bar.css | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- css/software-pages.css | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 211 insertions(+), 23 deletions(-) diff --git a/css/left-bar.css b/css/left-bar.css index 3c23699..c26a2d8 100644 --- a/css/left-bar.css +++ b/css/left-bar.css @@ -1,10 +1,12 @@ /******************** Box-2 ********************/ -.box-2{ +/*** WARNING - WITHOUT BOX-4 ***/ + +.template-leftbar .box-2 { width:150px; } -#content .box-2 .block-outer .block-title { +.template-leftbar #content .box-2 .block-outer .block-title { background: #eee; color: #4562b1; border-top: 4px solid #4562b1; @@ -13,14 +15,86 @@ /*** Menus - Link list block ***/ -#content .box-2 .link-list-block li { +.template-leftbar #content .box-2 .link-list-block li { + margin: 0; + padding: 0; + border-bottom: 1px solid #ddd; + border-top: none; +} + +.template-leftbar #content .box-2 .link-list-block li a { + width: auto; + padding: 6px 5px 8px 18px; + background-color: #fff; + background-position: 0px 50%; + color: #2C66CE; + border-right: none; + border-top: 0px solid #64946E; + border-radius: 0 0 0 0; + font-weight: normal; + font-size: 14px; + line-height: 17px; +} + +.template-leftbar #content .box-2 .link-list-block h3.empty + ul { + border-top: 1px solid #ddd; +} + +.template-leftbar #content .box-2 .link-list-block h3.empty + ul li a { + padding-left: 0px; + padding-right: 0px; + background-image: none; +} + +.template-leftbar #content .box-2 .link-list-block li a.link-this-page, +.template-leftbar #content .box-2 .link-list-block li a.link-this-page:hover { + border-right: none; +} + +.template-leftbar #content .box-2 .link-list-block li a:hover { + background-color: #FFFFFF; + color: #000; +} +.template-leftbar #content .box-2 .link-list-block li a.link-this-page { + width: auto; + margin-left: 0px; + background-color: #ffffff; + font-weight: bold; +} + +/*** END OF WARNING - WITHOUT BOX-4 ***/ + +/*** WARNING - WITH BOX-4 ***/ + +/************ DUPLICATE ************ + + This part of the code is duplicated because, if there is + a change of layout from template-leftbar to lefttopright + the CSS fit without many complication. + + */ + +.template-lefttopright .box-3 { + width:150px; +} + +.template-lefttopright #content .box-3 .block-outer .block-title { + background: #eee; + color: #4562b1; + border-top: 4px solid #4562b1; + line-height: 15px; +} + +/*** Menus - Link list block ***/ + +.template-lefttopright #content .box-3 .link-list-block li { margin: 0; padding: 0; border-bottom: 1px solid #ddd; border-top: none; } -#content .box-2 .link-list-block li a { +.template-lefttopright #content .box-3 .link-list-block li a { width: auto; padding: 6px 5px 8px 18px; background-color: #fff; @@ -34,32 +108,36 @@ line-height: 17px; } -#content .box-2 .link-list-block h3.empty + ul { +.template-lefttopright #content .box-3 .link-list-block h3.empty + ul { border-top: 1px solid #ddd; } -#content .box-2 .link-list-block h3.empty + ul li a { +.template-lefttopright #content .box-3 .link-list-block h3.empty + ul li a { padding-left: 0px; padding-right: 0px; background-image: none; } -#content .box-2 .link-list-block li a.link-this-page, -#content .box-2 .link-list-block li a.link-this-page:hover { +.template-lefttopright #content .box-3 .link-list-block li a.link-this-page, +.template-lefttopright #content .box-3 .link-list-block li a.link-this-page:hover { border-right: none; } -#content .box-2 .link-list-block li a:hover { +.template-lefttopright #content .box-3 .link-list-block li a:hover { background-color: #FFFFFF; color: #000; } -#content .box-2 .link-list-block li a.link-this-page { +.template-lefttopright #content .box-3 .link-list-block li a.link-this-page { width: auto; margin-left: 0px; background-color: #ffffff; font-weight: bold; } +/************ END OF DUPLICATE ************ + +/*** END OF WARNING - WITH BOX-4 ***/ + /*** Statistics block **/ .statistics-block-data ul { margin-top: 10px; @@ -83,6 +161,9 @@ span.amount { span.label { font-size: 14px; } + /*** end of statistics block **/ +/*** WARNING - WITH BOX-4 ***/ + /******************** end Box-2 ********************/ diff --git a/css/software-pages.css b/css/software-pages.css index 1788718..faa25cf 100644 --- a/css/software-pages.css +++ b/css/software-pages.css @@ -221,22 +221,24 @@ /*** Right bar ***/ +/*** WARNING - WHITOUT BOX-4 ***/ + /* Link-list block */ -#content .box-3 .block-title { +.template-leftbar #content .box-3 .block-title { border-top: 4px solid #4562b1; line-height: 15px; background: #eee; color: #4562b1; } -#content .box-3 .link-list-block li { +.template-leftbar #content .box-3 .link-list-block li { margin: 0px; padding: 0px; border-bottom: 1px solid #ddd; border-top: none; } -#content .box-3 .link-list-block li a { +.template-leftbar #content .box-3 .link-list-block li a { border-right: none; border-top: 0px solid #64946E; border-radius: 0px 0px 0px 0px; @@ -250,21 +252,21 @@ font-size: 14px; } -#content .box-3 .link-list-block h3.empty + ul { +.template-leftbar #content .box-3 .link-list-block h3.empty + ul { border-top: 1px solid #ddd; } -#content .box-3 .link-list-block li a.link-this-page, -#content .box-3 .link-list-block li a.link-this-page:hover { +.template-leftbar #content .box-3 .link-list-block li a.link-this-page, +.template-leftbar #content .box-3 .link-list-block li a.link-this-page:hover { border-right: none; } -#content .box-3 .link-list-block li a:hover { +.template-leftbar #content .box-3 .link-list-block li a:hover { background-color: #FFFFFF; color: #000; } -#content .box-3 .link-list-block li a.link-this-page { +.template-leftbar #content .box-3 .link-list-block li a.link-this-page { margin-left: 0px; width: auto; background-color: #ffffff; @@ -272,9 +274,9 @@ } /* Repository block */ -.box-3 #bt_repositorio, -.box-3 #bt_repositorio:active, -.box-3 #bt_repositorio:visited { +.template-leftbar .box-3 #bt_repositorio, +.template-leftbar .box-3 #bt_repositorio:active, +.template-leftbar .box-3 #bt_repositorio:visited { border-radius: 4px; padding: 12px 10px; background: #EAEBEE; @@ -284,7 +286,7 @@ position: relative; } -.box-3 #bt_repositorio::after { +.template-leftbar .box-3 #bt_repositorio::after { margin-top: -2px; padding: 4px 0px 4px 2px; border-radius: 4px; @@ -299,13 +301,118 @@ content: url('../images/right-arrow.png'); } -.box-3 #content #bt_repositorio:hover { +.template-leftbar .box-3 #content #bt_repositorio:hover { color: #FFF; background: #2C66CE; text-decoration: none; } +/*** END - WARNING - WHITOUT BOX-4 ***/ + /*** end of right bar ***/ +/************ DUPLICATE ************/ + +/* + This part of the code is duplicated because, if there is + a change of layout from template-leftbar to lefttopright + the CSS fit without many complication. + */ + +/*** Right bar ***/ + +/*** WARNING - WITH BOX-4 ***/ + +/* Link-list block */ +.template-lefttopright #content .box-2 .block-title { + border-top: 4px solid #4562b1; + line-height: 15px; + background: #eee; + color: #4562b1; +} + +.template-lefttopright #content .box-2 .link-list-block li { + margin: 0px; + padding: 0px; + border-bottom: 1px solid #ddd; + border-top: none; +} + +.template-lefttopright #content .box-2 .link-list-block li a { + border-right: none; + border-top: 0px solid #64946E; + border-radius: 0px 0px 0px 0px; + padding: 6px 5px 8px 18px; + width: auto; + line-height: 17px; + background-color: #fff; + background-position: 0px 50%; + color: #2C66CE; + font-weight: normal; + font-size: 14px; +} + +.template-lefttopright #content .box-2 .link-list-block h3.empty + ul { + border-top: 1px solid #ddd; +} + +.template-lefttopright #content .box-2 .link-list-block li a.link-this-page, +.template-lefttopright #content .box-2 .link-list-block li a.link-this-page:hover { + border-right: none; +} + +.template-lefttopright #content .box-2 .link-list-block li a:hover { + background-color: #FFFFFF; + color: #000; +} + +.template-lefttopright #content .box-2 .link-list-block li a.link-this-page { + margin-left: 0px; + width: auto; + background-color: #ffffff; + font-weight: bold; +} + +/* Repository block */ +.template-lefttopright .box-2 #bt_repositorio, +.template-lefttopright .box-2 #bt_repositorio:active, +.template-lefttopright .box-2 #bt_repositorio:visited { + border-radius: 4px; + padding: 12px 10px; + background: #EAEBEE; + font: normal normal bold 12px 'open_sansbold', arial, helvetica, sans-serif; + text-transform: uppercase; + display: block; + position: relative; +} + +.template-lefttopright .box-2 #bt_repositorio::after { + margin-top: -2px; + padding: 4px 0px 4px 2px; + border-radius: 4px; + width: 18px; + right: 10px; + line-height: 20px; + position: absolute; + background: #2C66CE; + color: #FFF; + font-size: 16px; + text-align: center; + content: url('../images/right-arrow.png'); +} + +.template-lefttopright .box-2 #content #bt_repositorio:hover { + color: #FFF; + background: #2C66CE; + text-decoration: none; +} + +/*** WARNING - WITH BOX-4 ***/ + +/*** end of right bar ***/ + +/************ END DUPLICATE ************/ + + /*** Software internal pages ***/ /* FAQ page */ -- libgit2 0.21.2