author | Clipperz <info@clipperz.com> | 2013-01-09 11:28:56 (UTC) |
---|---|---|
committer | Clipperz <info@clipperz.com> | 2013-01-09 11:28:56 (UTC) |
commit | 8ef30d00eb96004c39540019336c0ec99dae01cb (patch) (unidiff) | |
tree | 781caa5ad46665c581c35f7d4539bfd4e70f9c4a /frontend/beta | |
parent | 6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57 (diff) | |
download | clipperz-8ef30d00eb96004c39540019336c0ec99dae01cb.zip clipperz-8ef30d00eb96004c39540019336c0ec99dae01cb.tar.gz clipperz-8ef30d00eb96004c39540019336c0ec99dae01cb.tar.bz2 |
Fixed conflict
-rw-r--r-- | frontend/beta/css/yui-extensions/basic-dialog.css | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/frontend/beta/css/yui-extensions/basic-dialog.css b/frontend/beta/css/yui-extensions/basic-dialog.css index 5a6cefb..2b1e20c 100644 --- a/frontend/beta/css/yui-extensions/basic-dialog.css +++ b/frontend/beta/css/yui-extensions/basic-dialog.css | |||
@@ -11,36 +11,33 @@ refer to http://www.clipperz.com. | |||
11 | it and/or modify it under the terms of the GNU Affero General Public | 11 | it and/or modify it under the terms of the GNU Affero General Public |
12 | License as published by the Free Software Foundation, either version | 12 | License as published by the Free Software Foundation, either version |
13 | 3 of the License, or (at your option) any later version. | 13 | 3 of the License, or (at your option) any later version. |
14 | 14 | ||
15 | * Clipperz Community Edition is distributed in the hope that it will | 15 | * Clipperz Community Edition is distributed in the hope that it will |
16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 16 | be useful, but WITHOUT ANY WARRANTY; without even the implied |
17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
18 | See the GNU Affero General Public License for more details. | 18 | See the GNU Affero General Public License for more details. |
19 | 19 | ||
20 | * You should have received a copy of the GNU Affero General Public | 20 | * You should have received a copy of the GNU Affero General Public |
21 | License along with Clipperz Community Edition. If not, see | 21 | License along with Clipperz Community Edition. If not, see |
22 | <http://www.gnu.org/licenses/>. | 22 | <http://www.gnu.org/licenses/>. |
23 | 23 | ||
24 | */ | 24 | */ |
25 | 25 | ||
26 | .ydlg-proxy { | 26 | .ydlg-proxy { |
27 | <<<<<<< HEAD | ||
28 | background-image: url(./images/default/gradient-bg.gif); | 27 | background-image: url(./images/default/gradient-bg.gif); |
29 | ======= | ||
30 | >>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9 | ||
31 | background-color:#c3daf9; | 28 | background-color:#c3daf9; |
32 | border:1px solid #6593cf; | 29 | border:1px solid #6593cf; |
33 | z-index:10001; | 30 | z-index:10001; |
34 | overflow:hidden; | 31 | overflow:hidden; |
35 | position:absolute; | 32 | position:absolute; |
36 | left:0;top:0; | 33 | left:0;top:0; |
37 | } | 34 | } |
38 | .ydlg-shadow{ | 35 | .ydlg-shadow{ |
39 | background:#aaaaaa; | 36 | background:#aaaaaa; |
40 | position:absolute; | 37 | position:absolute; |
41 | left:0;top:0; | 38 | left:0;top:0; |
42 | } | 39 | } |
43 | .ydlg-focus{ | 40 | .ydlg-focus{ |
44 | -moz-outline:0 none; | 41 | -moz-outline:0 none; |
45 | outline:0 none; | 42 | outline:0 none; |
46 | width:0; | 43 | width:0; |
@@ -83,36 +80,33 @@ body.masked .ydlg select { | |||
83 | background-color:navy; | 80 | background-color:navy; |
84 | color:#ffffff; | 81 | color:#ffffff; |
85 | font:bold 12px "sans serif", tahoma, verdana, helvetica; | 82 | font:bold 12px "sans serif", tahoma, verdana, helvetica; |
86 | overflow:hidden; | 83 | overflow:hidden; |
87 | padding:5px; | 84 | padding:5px; |
88 | } | 85 | } |
89 | .ydlg .ydlg-hd-left { | 86 | .ydlg .ydlg-hd-left { |
90 | background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat 0 -41px; | 87 | background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat 0 -41px; |
91 | padding-left:3px; | 88 | padding-left:3px; |
92 | margin:0px; | 89 | margin:0px; |
93 | } | 90 | } |
94 | .ydlg .ydlg-hd-right { | 91 | .ydlg .ydlg-hd-right { |
95 | background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat right 0; | 92 | background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat right 0; |
96 | padding-right:3px; | 93 | padding-right:3px; |
97 | } | 94 | } |
98 | .ydlg .ydlg-dlg-body{ | 95 | .ydlg .ydlg-dlg-body{ |
99 | <<<<<<< HEAD | ||
100 | background:url(./images/default/layout/gradient-bg.gif); | 96 | background:url(./images/default/layout/gradient-bg.gif); |
101 | ======= | ||
102 | >>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9 | ||
103 | border:1px solid #6593cf; | 97 | border:1px solid #6593cf; |
104 | border-top:0 none; | 98 | border-top:0 none; |
105 | padding:10px; | 99 | padding:10px; |
106 | overflow:hidden; | 100 | overflow:hidden; |
107 | } | 101 | } |
108 | .ydlg .ydlg-bd{ | 102 | .ydlg .ydlg-bd{ |
109 | overflow:hidden; | 103 | overflow:hidden; |
110 | } | 104 | } |
111 | .ydlg .ydlg-ft{ | 105 | .ydlg .ydlg-ft{ |
112 | overflow:hidden; | 106 | overflow:hidden; |
113 | padding:5px; | 107 | padding:5px; |
114 | padding-bottom:0; | 108 | padding-bottom:0; |
115 | } | 109 | } |
116 | .ydlg .yui-ext-tabbody{ | 110 | .ydlg .yui-ext-tabbody{ |
117 | background:white; | 111 | background:white; |
118 | overflow:auto; | 112 | overflow:auto; |