Merge branch 'nccu_master' into demo_site
Conflicts: Gemfile app/assets/javascripts/tinymce_orbit.js.erb app/assets/stylesheets/style.css.erb app/controllers/admin/assets_controller.rb app/controllers/admin/module_apps_new_interface_controller.rb app/controllers/admin/page_parts_controller.rb app/jobs/sync_db.rb app/models/page.rb app/models/page_part.rb app/models/user/user.rb app/uploaders/image_uploader.rb app/views/admin/assets/create.js.erb app/views/admin/module_apps/reload_frontend_pages.js.erb app/views/layouts/_orbit_bar.html.erb app/views/layouts/_side_bar.html.erb app/views/layouts/_users_checkbox_ary.html.erb app/views/shared/_privilege_user.html.erb config/mongoid.yml lib/parsers/parser_common.rb vendor/built_in_modules/announcement/announcement.json vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
This commit is contained in:
chris committed
commit
7d5531bf01
432 files changed
+8773
-17035
No files matched your search
@@ -3,5 +3,5 @@
|
||||
*and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
|
||||
*the top of the compiled file, but it's generally better to create a new file per style scope.
|
||||
*= require_self
|
||||
|
||||
*= require social-share-button
|
||||
*/
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,77 @@
|
||||
.checkblock {
|
||||
display: inline-block;
|
||||
float: left;
|
||||
width: 200px;
|
||||
}
|
||||
.check[type="checkbox"]{
|
||||
display:none;
|
||||
}
|
||||
.checkbox{
|
||||
padding: 5px;
|
||||
margin: 5px 5px 10px;
|
||||
display: inline-block;
|
||||
color:#777777;
|
||||
text-shadow: 0 1px 0px rgba(255,255,255,.4);
|
||||
border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
height: 30px;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) );
|
||||
background:-moz-linear-gradient( center top, #ededed 5%, #dfdfdf 100% );
|
||||
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#dfdfdf');
|
||||
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
}
|
||||
.checkbox .check-icon {
|
||||
display: none;
|
||||
position: absolute;
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
background: url(<%= asset_path "check.png" %>) no-repeat left top;
|
||||
right: -10px;
|
||||
top: -5px;
|
||||
}
|
||||
.checkbox .member-name {
|
||||
cursor: pointer;
|
||||
font-family: helvetica;
|
||||
font-size: 12px;
|
||||
line-height: 30px;
|
||||
padding: 0 10px 0 40px;
|
||||
color: #333333;
|
||||
display: inline-block;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.member-avatar {
|
||||
position: absolute;
|
||||
width: 34px;
|
||||
height: 34px;
|
||||
overflow: hidden;
|
||||
margin-top: -2px;
|
||||
}
|
||||
img.member-img {
|
||||
max-width: 100%;
|
||||
}
|
||||
.checked .check-icon {
|
||||
display: block;
|
||||
}
|
||||
.popover-inner {
|
||||
width: auto;
|
||||
display: inline-block;
|
||||
text-align: center;
|
||||
}
|
||||
.popover-title {
|
||||
display: block;
|
||||
font-size: 12px;
|
||||
font-weight: normal;
|
||||
padding: 3px 10px;
|
||||
}
|
||||
.popover-content {
|
||||
padding: 3px 10px;
|
||||
color: #898989;
|
||||
}
|
||||
.popover-content p {
|
||||
font-size: 12px;
|
||||
}
|
||||
+221
-202
@@ -1,203 +1,222 @@
|
||||
/*list*/
|
||||
|
||||
.table th.select {
|
||||
border-bottom:2px solid #0088CC;
|
||||
}
|
||||
.main-list {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.main-wrap>.main-list thead th {
|
||||
background-color: transparent;
|
||||
border-right: medium none;
|
||||
}
|
||||
.main-list thead th:last-child {
|
||||
border-right: none;
|
||||
}
|
||||
.main-list .span1 {
|
||||
min-width: 32px;
|
||||
}
|
||||
.main-list .span7 {
|
||||
min-width: 300px;
|
||||
}
|
||||
.main-list .nav-pills > li > a {
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
margin: 2px;
|
||||
padding:5px;
|
||||
}
|
||||
.main-list tbody .quick-edit {
|
||||
position:relative;
|
||||
height:20px;
|
||||
}
|
||||
.main-list tbody .quick-edit .nav {
|
||||
/*left: -55px;*/
|
||||
position: absolute;
|
||||
/*top: -3px;*/
|
||||
width: 350px;
|
||||
left: -8px;
|
||||
}
|
||||
.main-list tr:first-child td {
|
||||
border-top: 1px solid #DDDDDD;
|
||||
}
|
||||
.main-list td {
|
||||
background-color: #FFFFFF;
|
||||
border-bottom: 1px solid #DDDDDD;
|
||||
border-top: medium none;
|
||||
}
|
||||
.main-list .nav {
|
||||
margin-top: 0;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.main-list tr.with_action:hover .hide {
|
||||
display:block !important;
|
||||
}
|
||||
.main-list .label-group {
|
||||
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;
|
||||
overflow: hidden;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
left: 0;
|
||||
z-index: 1;
|
||||
}
|
||||
.main-list .label-td:hover {
|
||||
height: auto;
|
||||
padding: 5px 5px 8px;
|
||||
left: -40px;
|
||||
top: -6px;
|
||||
border: 1px solid rgba(0, 0, 0, 0.2);
|
||||
box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
|
||||
-moz-box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
|
||||
-webkit-box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
|
||||
border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
z-index: 5;
|
||||
width: 200px;
|
||||
}
|
||||
.qe-edit-div .table-condensed {
|
||||
background-color: #F2F2F2;
|
||||
}
|
||||
.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;
|
||||
}
|
||||
.route-group .route .breadcrumb {
|
||||
border-width: 0!important;
|
||||
}
|
||||
.qe-block td {
|
||||
height:auto;
|
||||
padding: 0;
|
||||
/*background-color: #dedede;*/
|
||||
}
|
||||
.qe-block legend {
|
||||
padding-left: 8px;
|
||||
margin-bottom: 0;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
.qe-block .control-group {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.qe-block .controls, .qe-block .control-label {
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.qe-block .table td, .qe-block .table th {
|
||||
padding: 8px;
|
||||
}
|
||||
.qe-block .form-horizontal {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.qe-block .form-actions {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
legend {
|
||||
font-size: 15px;
|
||||
line-height: 30px;
|
||||
margin-bottom: 15px;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
.subnav {
|
||||
-moz-border-radius: 0;
|
||||
-webkit-border-radius: 0;
|
||||
border-radius: 0;
|
||||
border-left: 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;
|
||||
-webkit-border-radius: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
.dropdown-menu.tags {
|
||||
max-width: none;
|
||||
}
|
||||
.dropdown-menu.tags .tags-cloud {
|
||||
width: 300px;
|
||||
padding:10px;
|
||||
}
|
||||
.dropdown-menu.tags .tags-cloud .active {
|
||||
background-color: #0088CC;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
.dropdown-menu.tags .tags-cloud a {
|
||||
display: inline-block;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.dropdown-menu.tags li:last-child a {
|
||||
display: block;
|
||||
text-align:center;
|
||||
}
|
||||
.sort-header th {
|
||||
padding: 0 8px;
|
||||
vertical-align: inherit;
|
||||
position: relative;
|
||||
}
|
||||
.sort-header th a {
|
||||
display: block;
|
||||
padding: 10px 0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.sort-header th a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
.list-remove {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
padding-top: 9px !important;
|
||||
left: 25px;
|
||||
}
|
||||
.form-fixed {
|
||||
position: fixed;
|
||||
margin: 0;
|
||||
padding: 10px;
|
||||
bottom: 0;
|
||||
z-index: 2;
|
||||
}
|
||||
.form-fixed .btn {
|
||||
margin-top: 4px;
|
||||
}
|
||||
.paginationFixed {
|
||||
}
|
||||
.paginationFixed .pagination {
|
||||
margin-top: 0 !important;
|
||||
/*list*/
|
||||
|
||||
.table th.select {
|
||||
border-bottom:2px solid #0088CC;
|
||||
}
|
||||
.main-list {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.main-wrap>.main-list thead th {
|
||||
background-color: transparent;
|
||||
border-right: medium none;
|
||||
}
|
||||
.main-list thead th:last-child {
|
||||
border-right: none;
|
||||
}
|
||||
.main-list .span1 {
|
||||
min-width: 32px;
|
||||
}
|
||||
.main-list .span7 {
|
||||
min-width: 300px;
|
||||
}
|
||||
.main-list .nav-pills > li > a {
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
margin: 2px;
|
||||
padding:5px;
|
||||
}
|
||||
.main-list tbody .quick-edit {
|
||||
position:relative;
|
||||
height:20px;
|
||||
}
|
||||
.main-list tbody .quick-edit .nav {
|
||||
position: absolute;
|
||||
width: 350px;
|
||||
left: -8px;
|
||||
}
|
||||
.main-list tr:first-child td {
|
||||
border-top: 1px solid #DDDDDD;
|
||||
}
|
||||
.main-list td {
|
||||
background-color: #FFFFFF;
|
||||
border-bottom: 1px solid #DDDDDD;
|
||||
border-top: medium none;
|
||||
}
|
||||
.main-list .nav {
|
||||
margin-top: 0;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.main-list tr.with_action>td {
|
||||
-webkit-transition: all 0.1s linear;
|
||||
-moz-transition: all 0.1s linear;
|
||||
}
|
||||
.main-list tr.with_action:hover>td {
|
||||
color: #333333;
|
||||
background-color: #E6E6E6;
|
||||
-webkit-transition: all 0.2s linear;
|
||||
-moz-transition: all 0.2s linear;
|
||||
}
|
||||
.main-list tr.with_action:hover .hide {
|
||||
display:block !important;
|
||||
}
|
||||
.main-list .label-group {
|
||||
position: relative;
|
||||
height: 40px;
|
||||
}
|
||||
.main-list .label-group .label {
|
||||
margin-bottom: 1px;
|
||||
display: inline-block;
|
||||
padding: 0 3px;
|
||||
}
|
||||
.main-list .label-td {
|
||||
height: 40px;
|
||||
overflow: hidden;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
left: 0;
|
||||
z-index: 1;
|
||||
}
|
||||
.main-list .label-td:hover {
|
||||
background-color: #fff;
|
||||
height: auto;
|
||||
padding: 7px;
|
||||
left: -55px;
|
||||
top: -8px;
|
||||
border: 1px solid #333;
|
||||
border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
z-index: 5;
|
||||
width: 160px;
|
||||
min-height: 40px;
|
||||
}
|
||||
.qe-edit-div .table-condensed {
|
||||
background-color: #F2F2F2;
|
||||
}
|
||||
.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;
|
||||
line-height: 20px;
|
||||
}
|
||||
.route-group .route {
|
||||
padding: 0;
|
||||
}
|
||||
.route-group .route .breadcrumb {
|
||||
border-width: 0!important;
|
||||
}
|
||||
.qe-block td {
|
||||
height:auto;
|
||||
padding: 0;
|
||||
/*background-color: #dedede;*/
|
||||
}
|
||||
.qe-block legend {
|
||||
padding-left: 8px;
|
||||
margin-bottom: 0;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
.qe-block .control-group {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.qe-block .controls, .qe-block .control-label {
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.qe-block .table td, .qe-block .table th {
|
||||
padding: 8px;
|
||||
}
|
||||
.qe-block .form-horizontal {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.qe-block .form-actions {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
legend {
|
||||
font-size: 15px;
|
||||
line-height: 30px;
|
||||
margin-bottom: 15px;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
.subnav {
|
||||
-moz-border-radius: 0;
|
||||
-webkit-border-radius: 0;
|
||||
border-radius: 0;
|
||||
border-left: 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;
|
||||
-webkit-border-radius: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
.dropdown-menu.tags {
|
||||
max-width: none;
|
||||
}
|
||||
.dropdown-menu.tags .tags-cloud {
|
||||
width: 300px;
|
||||
padding:10px;
|
||||
}
|
||||
.dropdown-menu.tags .tags-cloud .active {
|
||||
background-color: #0088CC;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
.dropdown-menu.tags .tags-cloud a {
|
||||
display: inline-block;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.dropdown-menu.tags li:last-child a {
|
||||
display: block;
|
||||
text-align:center;
|
||||
}
|
||||
.sort-header th {
|
||||
padding: 0 8px;
|
||||
vertical-align: inherit;
|
||||
position: relative;
|
||||
}
|
||||
.sort-header th a {
|
||||
display: block;
|
||||
padding: 10px 0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.sort-header th a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
.list-remove {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
padding-top: 11px !important;
|
||||
left: 25px;
|
||||
font-size: 19px;
|
||||
color: #333;
|
||||
}
|
||||
.list-remove:hover {
|
||||
color: #333;
|
||||
text-decoration: none;
|
||||
}
|
||||
.form-fixed {
|
||||
position: fixed;
|
||||
margin: 0;
|
||||
padding: 10px;
|
||||
bottom: 0;
|
||||
z-index: 2;
|
||||
}
|
||||
.form-fixed .btn {
|
||||
margin-top: 4px;
|
||||
}
|
||||
.paginationFixed {
|
||||
}
|
||||
.paginationFixed .pagination {
|
||||
margin-top: 0 !important;
|
||||
}
|
||||
.member-list td:last-child {
|
||||
position: relative;
|
||||
}
|
||||
.member-list td:last-child .gender {
|
||||
border-radius: 0;
|
||||
}
|
||||
@@ -11,3 +11,7 @@
|
||||
.warning{
|
||||
color:orange;
|
||||
}
|
||||
label#dyn_error {
|
||||
|
||||
margin-left: 50%;
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
.social-share-button-baidu {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") 0px 0px no-repeat;
|
||||
}
|
||||
.social-share-button-delicious {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") -16px 0px no-repeat;
|
||||
}
|
||||
.social-share-button-douban {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") 0px -16px no-repeat;
|
||||
}
|
||||
.social-share-button-email {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") -16px -16px no-repeat;
|
||||
}
|
||||
.social-share-button-facebook {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") -32px 0px no-repeat;
|
||||
}
|
||||
.social-share-button-flickr {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") -32px -16px no-repeat;
|
||||
}
|
||||
.social-share-button-google {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") 0px -32px no-repeat;
|
||||
}
|
||||
.social-share-button-google_plus {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") -16px -32px no-repeat;
|
||||
}
|
||||
.social-share-button-kaixin001 {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") -32px -32px no-repeat;
|
||||
}
|
||||
.social-share-button-qq {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") -48px 0px no-repeat;
|
||||
}
|
||||
.social-share-button-renren {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") -48px -16px no-repeat;
|
||||
}
|
||||
.social-share-button-tqq {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") -48px -32px no-repeat;
|
||||
}
|
||||
.social-share-button-twitter {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") 0px -48px no-repeat;
|
||||
}
|
||||
.social-share-button-weibo {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") -16px -48px no-repeat;
|
||||
}
|
||||
.social-share-button-rss {
|
||||
display:inline-block;
|
||||
width:16px;
|
||||
height:16px;
|
||||
background:url("/assets/social-share-button.png") -32px -48px no-repeat;
|
||||
}
|
||||
+1683
-1350
File diff suppressed because it is too large.
Load diff
@@ -53,11 +53,11 @@
|
||||
display:inline-block;
|
||||
margin-right: 5px;
|
||||
opacity: 0.8;
|
||||
filter: alpha(opacity=80);
|
||||
filter: alpha(opacity=80);
|
||||
}
|
||||
.action:hover {
|
||||
opacity: 1;
|
||||
filter: alpha(opacity=100);
|
||||
filter: alpha(opacity=80);
|
||||
cursor: pointer;
|
||||
}
|
||||
.select-role {
|
||||
|
||||
Reference in new issue
Block a user