Produced by Araxis Merge on Fri Oct 19 14:26:01 2007 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.
| # | File | Location | Last Modified |
|---|---|---|---|
| 1 | ldap.css | C:\jahia\template_diff\V2_JAHIA_5_0_2\src\jsp\css | Fri Oct 19 14:17:32 2007 UTC |
| 2 | ldap.css | C:\jahia\template_diff\V2_JAHIA_5_0_3\src\jsp\css | Fri Oct 19 14:16:50 2007 UTC |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Blocks | Lines | |
| Unchanged | 7 | 150 |
| Changed | 6 | 26 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | All differences in whitespace within lines are ignored |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Hidden in comparison detail |
No regular expressions were active.
| 1 | .switchcontent { | 1 | .switchcontent { | |||
| 2 | display: none; | 2 | display: none; | |||
| 3 | margin: 3px; | 3 | margin: 3px; | |||
| 4 | width: 100%; | 4 | width: 100%; | |||
| 5 | font-size: 12px; | 5 | font-size: 12px; | |||
| 6 | font-family: Arial, sans-serif; | 6 | font-family: Arial, sans-serif; | |||
| 7 | text-align: center; | 7 | text-align: center; | |||
| 8 | margin-bottom: 4px; | 8 | margin-bottom: 4px; | |||
| 9 | padding: 2px 2px; | 9 | padding: 2px 2px; | |||
| 10 | background-color: #eee; | 10 | background-color: #eee; | |||
| 11 | 11 | |||||
| 12 | } | 12 | } | |||
| 13 | 13 | |||||
| 14 | .switchcontent1 { | 14 | .switchcontent1 { | |||
| 15 | 15 | /*border:2px solid red;*/ | ||||
| 16 | margin: 3px; | 16 | /*margin: 3px;*/ | |||
| 17 | width: 100%; | 17 | width: 100%; | |||
| 18 | height: 90px; | 18 | height: 120px; | |||
| 19 | font-size: 12px; | 19 | font-size: 12px; | |||
| 20 | font-family: Arial, sans-serif; | 20 | font-family: Arial, sans-serif; | |||
| 21 | text-align: center; | 21 | text-align: center; | |||
| 22 | margin-bottom: 4px; | 22 | margin-bottom: 4px; | |||
| 23 | padding: 2px 2px; | 23 | /*padding: 2px 2px;*/ | |||
| 24 | 24 | |||||
| 25 | } | 25 | } | |||
| 26 | 26 | |||||
| 27 | .floatleft1 { | 27 | .floatleft1 { | |||
| 28 | float: left; | 28 | float: left; | |||
| 29 | width: 98px !important; | 29 | width: 120px !important; | |||
| 30 | 30 | padding:4px; | ||||
| 31 | height: 100px; | 31 | height: 120px; | |||
| 32 | text-align: center; | 32 | text-align: center; | |||
| 33 | background-color: #eee; | 33 | background-color: #eee; | |||
| 34 | border: 1px solid #CCC; | 34 | border: 1px solid #CCC; | |||
| 35 | } | 35 | } | |||
| 36 | 36 | |||||
| 37 | .floatleft2 { | 37 | .floatleft2 { | |||
| 38 | float: left; | 38 | float: left; | |||
| 39 | width: 370px !important; | 39 | width: 340px !important; | |||
| 40 | 40 | padding:4px; | ||||
| 41 | height: 100px; | 41 | height: 120px; | |||
| 42 | text-align: center; | 42 | text-align: center; | |||
| 43 | background-color: #eee; | 43 | background-color: #eee; | |||
| 44 | border: 1px solid #CCC; | 44 | border: 1px solid #CCC; | |||
| 45 | } | 45 | } | |||
| 46 | 46 | |||||
| 47 | .floatleft3 { | 47 | .floatleft3 { | |||
| 48 | float: left; | 48 | float: left; | |||
| 49 | width: 200px !important; | 49 | width: 210px !important; | |||
| 50 | 50 | padding:4px; | ||||
| 51 | height: 100px; | 51 | height: 120px; | |||
| 52 | text-align: center; | 52 | text-align: center; | |||
| 53 | background-color: #eee; | 53 | background-color: #eee; | |||
| 54 | border: 1px solid #CCC; | 54 | border: 1px solid #CCC; | |||
| 55 | margin-bottom: 4px; | 55 | margin-bottom: 4px; | |||
| 56 | } | 56 | } | |||
| 57 | 57 | |||||
| 58 | .userdisplayTable { | 58 | .userdisplayTable { | |||
| 59 | font-size: 10px; | 59 | font-size: 10px; | |||
| 60 | font-family: Arial, sans-serif; | 60 | font-family: Arial, sans-serif; | |||
| 61 | border: 1px solid #666; | 61 | border: 1px solid #666; | |||
| 62 | width: 100%; | 62 | width: 100%; | |||
| 63 | margin: 20px 0 20px 0 !important; | 63 | margin: 20px 0 20px 0 !important; | |||
| 64 | } | 64 | } | |||
| 65 | 65 | |||||
| 66 | th { | 66 | th { | |||
| 67 | padding: 2px 4px 2px 4px !important; | 67 | padding: 2px 4px 2px 4px !important; | |||
| 68 | text-align: left; | 68 | text-align: left; | |||
| 69 | vertical-align: top; | 69 | vertical-align: top; | |||
| 70 | } | 70 | } | |||
| 71 | 71 | |||||
| 72 | span.pagebanner { | 72 | span.pagebanner { | |||
| 73 | 73 | |||||
| 74 | font-size: 15px; | 74 | font-size: 15px; | |||
| 75 | font-family: Arial, sans-serif; | 75 | font-family: Arial, sans-serif; | |||
| 76 | padding: 2px 4px 2px 4px; | 76 | padding: 2px 4px 2px 4px; | |||
| 77 | width: 100%; | 77 | width: 100%; | |||
| 78 | margin-top: 10px; | 78 | margin-top: 10px; | |||
| 79 | display: block; | 79 | display: block; | |||
| 80 | border-bottom: none; | 80 | border-bottom: none; | |||
| 81 | } | 81 | } | |||
| 82 | 82 | |||||
| 83 | 83 | |||||
| 84 | 84 | |||||
| 85 | th.sorted { | 85 | th.sorted { | |||
| 86 | background-color: #fff; | 86 | background-color: #fff; | |||
| 87 | } | 87 | } | |||
| 88 | 88 | |||||
| 89 | th a,th a:visited { | 89 | th a,th a:visited { | |||
| 90 | color: black; | 90 | color: black; | |||
| 91 | } | 91 | } | |||
| 92 | 92 | |||||
| 93 | 93 | |||||
| 94 | th a:hover { | 94 | th a:hover { | |||
| 95 | text-decoration: underline; | 95 | text-decoration: underline; | |||
| 96 | color: black; | 96 | color: black; | |||
| 97 | } | 97 | } | |||
| 98 | 98 | |||||
| 99 | 99 | |||||
| 100 | 100 | |||||
| 101 | th.sortable { | 101 | th.sortable { | |||
| 102 | background-image: url( ../img/ldap/arrow_off.gif ); | 102 | background-image: url( ../img/ldap/arrow_off.gif ); | |||
| 103 | } | 103 | } | |||
| 104 | 104 | |||||
| 105 | th.order1{ | 105 | th.order1{ | |||
| 106 | background-position: right; | 106 | background-position: right; | |||
| 107 | background-image: url( ../img/ldap/arrow_down.gif ); | 107 | background-image: url( ../img/ldap/arrow_down.gif ); | |||
| 108 | background-repeat: no-repeat; | 108 | background-repeat: no-repeat; | |||
| 109 | 109 | |||||
| 110 | } | 110 | } | |||
| 111 | 111 | |||||
| 112 | th.order2 | 112 | th.order2 | |||
| 113 | { | 113 | { | |||
| 114 | background-position: right; | 114 | background-position: right; | |||
| 115 | background-image: url(../img/ldap/arrow_up.gif); | 115 | background-image: url(../img/ldap/arrow_up.gif); | |||
| 116 | background-repeat: no-repeat; | 116 | background-repeat: no-repeat; | |||
| 117 | 117 | |||||
| 118 | } | 118 | } | |||
| 119 | 119 | |||||
| 120 | tr.tableRowEven,tr.even { | 120 | tr.tableRowEven,tr.even { | |||
| 121 | background-color: #fff | 121 | background-color: #fff | |||
| 122 | } | 122 | } | |||
| 123 | 123 | |||||
| 124 | tr.odd { | 124 | tr.odd { | |||
| 125 | background-color: #BBD9EE | 125 | background-color: #BBD9EE | |||
| 126 | } | 126 | } | |||
| 127 | 127 | |||||
| 128 | 128 | |||||
| 129 | 129 | |||||
| 130 | /* | 130 | /* | |||
| 131 | .order1 { | 131 | .order1 { | |||
| 132 | background: url(../img/sort.gif) no-repeat top left; | 132 | background: url(../img/sort.gif) no-repeat top left; | |||
| 133 | background-color: #AA6666; | 133 | background-color: #AA6666; | |||
| 134 | } | 134 | } | |||
| 135 | 135 | |||||
| 136 | .order2 { | 136 | .order2 { | |||
| 137 | background: url(../img/sort.gif) no-repeat top right; | 137 | background: url(../img/sort.gif) no-repeat top right; | |||
| 138 | background-color: #66AA66; | 138 | background-color: #66AA66; | |||
| 139 | } | 139 | } | |||
| 140 | */ | 140 | */ | |||
| 141 | .contvis { | 141 | .contvis { | |||
| 142 | 142 | |||||
| 143 | display: none; | 143 | display: none; | |||
| 144 | width: 100%; | 144 | width: 100%; | |||
| 145 | } | 145 | } | |||
| 146 | 146 | |||||
| 147 | .contvis1 { | 147 | .contvis1 { | |||
| 148 | 148 | |||||
| 149 | display: block; | 149 | display: block; | |||
| 150 | width: 100%; | 150 | width: 100%; | |||
| 151 | } | 151 | } | |||
| 152 | 152 | |||||
| 153 | .comm1 { | 153 | .comm1 { | |||
| 154 | 154 | |||||
| 155 | display: block; | 155 | display: block; | |||
| 156 | text-align: right; | 156 | text-align: right; | |||
| 157 | } | 157 | } | |||
| 158 | 158 | |||||
| 159 | .comm0 { | 159 | .comm0 { | |||
| 160 | float: left; | 160 | float: left; | |||
| 161 | display: block; | 161 | display: block; | |||
| 162 | text-align: center; | 162 | text-align: center; | |||
| 163 | } | 163 | } |
Araxis Merge (but not this generated report) is Copyright © 1993-2003 Araxis Ltd (www.araxis.com). All rights reserved.