apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed merged issues

Browse Source
This commit is contained in:
NIKITA 2010-08-25 11:11:29 -07:00 committed by unknown
parent f04e1351bc
commit 25a200c201
1 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/new/css/main.css
View File

@ -292,7 +292,7 @@ a:visited {
padding:0;
}
<<<<<<< HEAD
.vmpopup_container_closebutton {
width:13px;
height:13px;
@ -308,8 +308,7 @@ a:visited {
background:url(../images/vm_closebutton_hover.gif) no-repeat top left;
}
=======
>>>>>>> 10bc0b5... new UI - left menu, middle menu, instance
.vmpopup_container_top {
width:737px;
height:30px;
@ -1608,11 +1607,7 @@ a:visited {
}
.midmenu_textbox {
<<<<<<< HEAD
width:165px;
=======
width:150px;
>>>>>>> 10bc0b5... new UI - left menu, middle menu, instance
height:auto;
float:left;
margin:0 0 0 10px;
@ -1621,11 +1616,7 @@ a:visited {
}
.midmenu_textbox p {
<<<<<<< HEAD
width:165px;
=======
width:150px;
>>>>>>> 10bc0b5... new UI - left menu, middle menu, instance
height:auto;
float:left;
text-align:left;
@ -1939,7 +1930,6 @@ a:visited {
background:url(../images/infoerror_icon.gif) no-repeat top left;
}
<<<<<<< HEAD
.info_detailbox {
width:99%;
height:auto;
@ -1965,7 +1955,7 @@ a:visited {
background:#ffe5e5 repeat top left;
color:#a90000;
}
=======
.info_detailbox {
width:99%;
height:auto;
@ -1991,4 +1981,4 @@ a:visited {
background:#ffe5e5 repeat top left;
color:#a90000;
}
>>>>>>> 10bc0b5... new UI - left menu, middle menu, instance