Commit 8d367ef95ccbc64fd444370106f6f2eee9c5b709
1 parent
2ed24855
Exists in
master
and in
79 other branches
Adjusts to mantain compatibility of general and especific page style definitions
Showing
2 changed files
with
52 additions
and
18 deletions
Show diff stats
css/main-content.css
| 1 | /*** Box ***/ | 1 | /*** Box ***/ |
| 2 | .box-1 .block, | 2 | .box-1 .block, |
| 3 | .no-boxes .block { | 3 | .no-boxes .block { |
| 4 | - margin-top: 50px; | 4 | + margin-top: 50px; |
| 5 | } | 5 | } |
| 6 | 6 | ||
| 7 | -.block-outer { | ||
| 8 | - margin-bottom: 45px; | ||
| 9 | - clear: both; | 7 | +.box-2 .block-outer, |
| 8 | +.box-3 .block-outer{ | ||
| 9 | + margin-bottom: 45px; | ||
| 10 | + clear: both; | ||
| 10 | } | 11 | } |
| 11 | 12 | ||
| 12 | /*** Block Title ***/ | 13 | /*** Block Title ***/ |
| @@ -41,13 +42,13 @@ | @@ -41,13 +42,13 @@ | ||
| 41 | #content .pagination a, | 42 | #content .pagination a, |
| 42 | #content .pagination em, | 43 | #content .pagination em, |
| 43 | #content .pagination span{ | 44 | #content .pagination span{ |
| 44 | - padding: 7px 11px 7px 11px; | 45 | + padding: 5px 9px; |
| 45 | margin-right: 4px; | 46 | margin-right: 4px; |
| 46 | color: #172738; | 47 | color: #172738; |
| 47 | border: 1px solid #D3D6DE; | 48 | border: 1px solid #D3D6DE; |
| 48 | border-radius: 4px; | 49 | border-radius: 4px; |
| 49 | letter-spacing: 0.6px; | 50 | letter-spacing: 0.6px; |
| 50 | - font-size: 15px; | 51 | + font-size: 12px; |
| 51 | font-weight: 700; | 52 | font-weight: 700; |
| 52 | text-decoration: none; | 53 | text-decoration: none; |
| 53 | display: inline-table; | 54 | display: inline-table; |
| @@ -59,13 +60,11 @@ | @@ -59,13 +60,11 @@ | ||
| 59 | } | 60 | } |
| 60 | 61 | ||
| 61 | #content .pagination .previous_page{ | 62 | #content .pagination .previous_page{ |
| 62 | - padding: 7px 11px 10px 11px; | ||
| 63 | float: left; | 63 | float: left; |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | #content .pagination .next_page{ | 66 | #content .pagination .next_page{ |
| 67 | float: right; | 67 | float: right; |
| 68 | - padding: 7px 11px 10px 11px; | ||
| 69 | } | 68 | } |
| 70 | 69 | ||
| 71 | #content .pagination .previous_page, | 70 | #content .pagination .previous_page, |
| @@ -80,5 +79,39 @@ | @@ -80,5 +79,39 @@ | ||
| 80 | opacity: 0.5; | 79 | opacity: 0.5; |
| 81 | } | 80 | } |
| 82 | 81 | ||
| 82 | +/*** Button ***/ | ||
| 83 | + | ||
| 84 | +#content a.button.with-text, | ||
| 85 | +#content #article-actions a.button.with-text{ | ||
| 86 | + height: 32px; | ||
| 87 | + padding: 5px 15px; | ||
| 88 | + background: #FFF none; | ||
| 89 | + color: #3E67B1; | ||
| 90 | + border-radius: 4px; | ||
| 91 | + border: 1px solid #3E67B1; | ||
| 92 | + font-size: 14px; | ||
| 93 | + line-height: 32px; | ||
| 94 | + text-transform: uppercase; | ||
| 95 | +} | ||
| 96 | + | ||
| 97 | +#content form input.button.with-text{ | ||
| 98 | + height: 42px; | ||
| 99 | + max-height: 42px; | ||
| 100 | + padding: 5px 15px; | ||
| 101 | + background: #FFF none; | ||
| 102 | + color: #3E67B1; | ||
| 103 | + border-radius: 4px; | ||
| 104 | + border: 1px solid #3E67B1; | ||
| 105 | + font-size: 14px; | ||
| 106 | + line-height: 32px; | ||
| 107 | + text-transform: uppercase; | ||
| 108 | +} | ||
| 109 | + | ||
| 110 | +#content a.button:hover, | ||
| 111 | +#content #article-actions a.button.with-text:hover, | ||
| 112 | +#content input.button.with-text:hover{ | ||
| 113 | + background: #3E67B1 none; | ||
| 114 | + color: #FFF; | ||
| 115 | +} | ||
| 83 | 116 | ||
| 84 | 117 |
css/overwriting-base-theme.css
| @@ -54,21 +54,22 @@ | @@ -54,21 +54,22 @@ | ||
| 54 | #content .main-block h2, | 54 | #content .main-block h2, |
| 55 | #content .main-block h3, | 55 | #content .main-block h3, |
| 56 | #content .main-block h4 { | 56 | #content .main-block h4 { |
| 57 | - font-family: 'Open Sans', Arial, Helvetica, sans-serif; | 57 | + font-family: Arial, Helvetica, sans-serif; |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | #content .main-block h1, | 60 | #content .main-block h1, |
| 61 | #not-found h1, | 61 | #not-found h1, |
| 62 | #access-denied h1, | 62 | #access-denied h1, |
| 63 | #content .no-boxes h1 { | 63 | #content .no-boxes h1 { |
| 64 | - color: #444; | ||
| 65 | - font-size: 1.7em; | ||
| 66 | - padding: 7px 0; | ||
| 67 | - margin-left: 0; | ||
| 68 | - padding-left: 0.3em; | ||
| 69 | - border-bottom: 1px solid #CCCCCC; | ||
| 70 | - border-top: 0px solid #172838; | 64 | + margin: 20px 0 10px 0; |
| 65 | + padding: 0; | ||
| 66 | + color: #172738; | ||
| 67 | + border-bottom: none; | ||
| 68 | + font-family: Arial; | ||
| 69 | + font-size: 34px; | ||
| 71 | font-weight: bold; | 70 | font-weight: bold; |
| 71 | + font-variant: normal; | ||
| 72 | + line-height: 37px; | ||
| 72 | } | 73 | } |
| 73 | 74 | ||
| 74 | #content .title { | 75 | #content .title { |
| @@ -77,8 +78,8 @@ | @@ -77,8 +78,8 @@ | ||
| 77 | } | 78 | } |
| 78 | 79 | ||
| 79 | #content .main-block h3 { | 80 | #content .main-block h3 { |
| 80 | - font-size: 1.5em; | ||
| 81 | - min-height: 48px; | 81 | + font-size:18px; |
| 82 | + line-height: 21px; | ||
| 82 | } | 83 | } |
| 83 | 84 | ||
| 84 | /****************************************/ | 85 | /****************************************/ |