Ray's changes in announcenment back-end

This commit is contained in:
Christophe Vilayphiou authored and Christophe Vilayphiou committed 2012-03-27 18:58:03 +08:00
1 parent 97adf94e15
commit 55d12e50f2
14 files changed
+150 -44

No files matched your search

+4 -4
View File
@@ -45,10 +45,10 @@
opacity: 1;
filter: alpha(opacity=100);
cursor: pointer;
}
.select-role {
display:none;
overflow:hidden;
}
.select-role {
display:none;
padding: 10px 0 0;
}
.file-upload {
position:relative;
+2 -1
View File
@@ -1250,7 +1250,8 @@
var that = this
, complete = function () {
if (startEvent == 'show') that.reset()
that.$element.trigger(completeEvent)
that.$element.trigger(completeEvent)
mainTablePosition();
}
this.$element
+20 -1
View File
@@ -43,6 +43,25 @@ $(document).ready(function(){
$(document).on('click', '.sort-header > .sort', function() {
$.getScript($(this).attr('rel'));
});
var $role = $('.select-role');
var method =$('.privacy:eq(1)').attr('checked');
if(method == 'checked'){
$role.slideDown(0);
}
$('.privacy').each(function($i) {
$(this).click(function() {
switch ($i) {
case 0:
$role.slideUp(300);
break;
case 1:
$role.slideDown(300);
break;
}
});
});
/*tinyscrollbar&windows-Size*/
resize();
@@ -80,7 +99,7 @@ function mainTablePosition() {
var $height = $('#main-wrap > .subnav').height()
var $table = $('#main-wrap > .table')
//alert ($table.height())
$table.stop().animate({marginTop:$height},500)
$table.stop().animate({marginTop:$height-17},500)
//$table.css({marginTop : $height})
}
$(window).scroll(function () {
+1 -1
View File
@@ -98,7 +98,7 @@ h1, h2, h3, h4, h5, h6 {
border-radius: 0 0 4px 4px;
}
table .span1-2 {
width: 94px;
min-width: 85px;
float: none;
margin-left: 0;
}
+23 -8
View File
@@ -9,9 +9,9 @@
.main-list {
margin-bottom: 0;
}
.main-list thead th {
background-color: rgba(0,0,0,0.05);
border-right: 1px solid #ddd;
.main-wrap>.main-list thead th {
background-color: transparent;
border-right: medium none;
}
.main-list thead th:last-child {
border-right: none;
@@ -29,19 +29,22 @@
}
.main-list tbody .quick-edit {
position:relative;
height:40px;
height:20px;
}
.main-list tbody .quick-edit .nav {
/*left: -55px;*/
position: absolute;
/*top: -3px;*/
width: 350px;
left: -8px;
}
.main-list td {
/*height:80px;*/
background-color: #FFFFFF;
border-bottom: 1px solid #DDDDDD;
border-top: medium none;
}
.main-list .nav {
margin-top: 15px;
margin-top: 0;
margin-bottom: 3px;
}
.main-list tr.with_action:hover .hide {
@@ -53,7 +56,7 @@
}
.main-list .label-td {
background-color: rgba(255, 255, 255, 1);
height: 60px;
height: 40px;
overflow: hidden;
position: absolute;
width: 100%;
@@ -74,6 +77,15 @@
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
z-index: 5;
}
.table-label {
background-color: #F2F2F2;
position: relative;
}
.table-label .main-list thead th {
background-color: #F2F2F2;
border-right: 1px solid #DDDDDD;
border-top: 1px solid #DDDDDD !important;
}
.route-group .route {
padding: 0;
@@ -108,7 +120,10 @@ legend {
-webkit-border-radius: 0;
border-radius: 0;
border-left: none;
border-right: none;
border-right: none;
position: fixed;
top: 30px;
z-index: 50;
}
.subnav .nav > li:first-child > a, .subnav .nav > li:first-child > a:hover {
-moz-border-radius: 0;
-1
View File
@@ -2,7 +2,6 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
-webkit-text-size-adjust:none;
}
html, body{
background: url(<%= asset_path 'background.jpg' %>) repeat left top;
height: 100%;
}
/*自定*/
-2
View File
@@ -350,8 +350,6 @@
border-top: none;
}
#post-body .editor {
background-color: #333333;
height: 20px;
margin: 8px 0;
width: 100%;
}
+2 -2
View File
@@ -58,8 +58,8 @@
cursor: pointer;
}
.select-role {
display:none;
overflow:hidden;
display:none;
padding: 10px 0;
}
.file-upload {
position:relative;