Merge branch 'design_team' into ldap
Conflicts: app/controllers/admin/page_parts_controller.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
This commit is contained in:
Christophe Vilayphiou committed
commit
20504b2205
213 files changed
+5215
-779
No files matched your search
+14
-2
@@ -1,5 +1,5 @@
|
||||
/*bootstrap-orbit*/
|
||||
|
||||
/*bootstrap-orbit*/
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
font-weight:normal ;
|
||||
}
|
||||
@@ -112,6 +112,18 @@ table .span1-3 {
|
||||
.qe-block .form-horizontal .form-actions {
|
||||
text-align:right;
|
||||
}
|
||||
.form-actions form {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.form-actions form input {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.modal.fade {
|
||||
top: -50%;
|
||||
}
|
||||
.form-search button {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.modal form {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
@@ -1,18 +1,11 @@
|
||||
/*isotope*/
|
||||
|
||||
/*isotope*/
|
||||
|
||||
#isotope {
|
||||
margin-top: 2px;
|
||||
background-color:#f4f4f4;
|
||||
}
|
||||
.isotope-item {
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
.isotope-hidden.isotope-item {
|
||||
pointer-events: none;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
/**** Isotope CSS3 transitions ****/
|
||||
|
||||
.isotope,
|
||||
@@ -48,28 +41,27 @@
|
||||
transition-duration: 0s;
|
||||
}
|
||||
.w-a {
|
||||
width: 388px;
|
||||
width: 398px;
|
||||
}
|
||||
.w-b {
|
||||
width: 802px;
|
||||
width: 812px;
|
||||
}
|
||||
.h-a {
|
||||
height: 315px;
|
||||
}
|
||||
.h-b {
|
||||
height: 699px;
|
||||
height: 703px;
|
||||
}
|
||||
.item {
|
||||
margin: 5px 0 15px 15px;
|
||||
}
|
||||
.item h3 {
|
||||
margin: 5px 0;
|
||||
margin: 20px 0 5px;
|
||||
}
|
||||
.item h3 [class^="icons-"] {
|
||||
margin: 3px 5px 0 3px;
|
||||
margin: 1px 5px 0 3px;
|
||||
}
|
||||
.item .detail {
|
||||
padding: 5px;
|
||||
border: 1px solid rgba(0, 0, 0, 0.1);
|
||||
background-color: #FFFFFF;
|
||||
border-radius: 5px;
|
||||
@@ -77,12 +69,11 @@
|
||||
-moz-border-radius: 5px;
|
||||
box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1);
|
||||
-webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1);
|
||||
-moz-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
.item .detail .totle {
|
||||
font-size: 50px;
|
||||
padding:10px 5px 20px 0;
|
||||
margin: 0px;
|
||||
padding:10px 5px 30px 0;
|
||||
margin: 0;
|
||||
text-align: right;
|
||||
border-bottom:1px solid #d9d9d9;
|
||||
}
|
||||
@@ -92,20 +83,60 @@
|
||||
color: #333;
|
||||
padding-left: 5px;
|
||||
text-align:left;
|
||||
margin-bottom: -7px;
|
||||
}
|
||||
.item .detail .table {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.item .detail .table th, .item .detail .table td {
|
||||
border-top: none;
|
||||
border-bottom: 1px solid #DDDDDD;
|
||||
}
|
||||
.item .detail .table tr th {
|
||||
background-color: #F2F2F2;
|
||||
border-bottom: 1px solid #AAAAAA;
|
||||
}
|
||||
.item .detail .table tr td:first-child {
|
||||
color: #666;;
|
||||
}
|
||||
.item .detail .table tr td:last-child {
|
||||
.item .detail .table tr td:last-child, .item .detail .table tr th:last-child {
|
||||
text-align:right;
|
||||
padding-right: 15px;
|
||||
}
|
||||
.item .h-a .my_scroll .viewport {
|
||||
height: 248px;
|
||||
height: 210px;
|
||||
}
|
||||
.item .h-b .my_scroll .viewport {
|
||||
height: 632px;
|
||||
height: 594px;
|
||||
}
|
||||
.item .isotope-hidden.isotope-item {
|
||||
pointer-events: none;
|
||||
z-index: 1;
|
||||
}
|
||||
.item .my_scroll {
|
||||
position: relative;
|
||||
}
|
||||
.item .my_scroll .scrollbar {
|
||||
right: 3px;
|
||||
top: 0;
|
||||
position: absolute;
|
||||
z-index: 10;
|
||||
}
|
||||
.item .my_scroll .track {
|
||||
background-color: transparent;
|
||||
}
|
||||
.detail.noStatistics {
|
||||
overflow: hidden;
|
||||
}
|
||||
.detail.noStatistics.h-a {
|
||||
height: 315px;
|
||||
}
|
||||
.detail.noStatistics.h-a .my_scroll .viewport {
|
||||
height: 280px;
|
||||
}
|
||||
.detail.noStatistics.h-b {
|
||||
height: 704px;
|
||||
}
|
||||
.detail.noStatistics.h-b .my_scroll .viewport {
|
||||
height: 670px;
|
||||
}
|
||||
@@ -22,7 +22,7 @@
|
||||
.main-list .nav-pills > li > a {
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
margin: 2px;
|
||||
padding:5px
|
||||
padding:5px;
|
||||
}
|
||||
.main-list tbody .quick-edit {
|
||||
position:relative;
|
||||
@@ -54,6 +54,11 @@
|
||||
position: relative;
|
||||
height: 40px;
|
||||
}
|
||||
.main-list .label-group .label {
|
||||
margin-bottom: 1px;
|
||||
display: inline-block;
|
||||
padding: 0 3px;
|
||||
}
|
||||
.main-list .label-td {
|
||||
background-color: rgba(255, 255, 255, 1);
|
||||
height: 40px;
|
||||
@@ -99,6 +104,7 @@
|
||||
.qe-block td {
|
||||
height:auto;
|
||||
padding: 0;
|
||||
/*background-color: #dedede;*/
|
||||
}
|
||||
.qe-block legend {
|
||||
padding-left: 8px;
|
||||
@@ -174,11 +180,18 @@ legend {
|
||||
.sort-header th a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
#check_all_bulletins {
|
||||
.list-remove {
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
left: 5px;
|
||||
top: 0;
|
||||
padding-top: 9px !important;
|
||||
left: 25px;
|
||||
}
|
||||
#sort_headers .list-remove {
|
||||
padding: 8px 0 8px 16px !important;
|
||||
.form-fixed {
|
||||
position: fixed;
|
||||
margin-bottom: 0;
|
||||
bottom: 0;
|
||||
z-index: 10;
|
||||
}
|
||||
.paginationFixed {
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
@@ -243,7 +243,7 @@
|
||||
padding-right: 4px;
|
||||
border-right: 1px solid rgba(0,0,0,.2);
|
||||
position:fixed;
|
||||
top: 32px;
|
||||
top: 31px;
|
||||
z-index: 88;
|
||||
}
|
||||
#main-sidebar .nav {
|
||||
@@ -286,17 +286,18 @@
|
||||
background-color: #FFF;
|
||||
margin-left:160px;
|
||||
padding-top: 32px;
|
||||
padding-bottom: 18px;
|
||||
/*padding-bottom: 18px;*/
|
||||
position: relative;
|
||||
min-height: 100%;
|
||||
padding-bottom: 45px;
|
||||
/*min-height: 100%;*/
|
||||
}
|
||||
#main-wrap > .form-actions {
|
||||
/*#main-wrap > .form-actions {
|
||||
background-color: #FFF;
|
||||
text-align: center;
|
||||
padding: 17px 20px 0;
|
||||
margin: 0;
|
||||
border-top: none;
|
||||
}
|
||||
}*/
|
||||
#main-wrap .subnav {
|
||||
height: auto;
|
||||
min-height: 36px;
|
||||
@@ -345,7 +346,7 @@
|
||||
text-align: right;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
margin-bottom: 0;
|
||||
margin-bottom: -50px;
|
||||
clear: both;
|
||||
}
|
||||
#poststuff form {
|
||||
@@ -634,9 +635,6 @@
|
||||
.adbanner-action {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
#bulletin_link_qe form {
|
||||
margin: 0;
|
||||
}
|
||||
[class^="icons-"] {
|
||||
display: inline-block;
|
||||
width: 16px;
|
||||
@@ -925,5 +923,5 @@
|
||||
}
|
||||
/*21*/
|
||||
.icons- {
|
||||
background-position: -0px -640px;
|
||||
}
|
||||
background-position: -0px -640px
|
||||
}
|
||||
Reference in new issue
Block a user