developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ray's changes in css and js

This commit is contained in:
OrbitServer 2012-10-09 07:44:26 +08:00
parent 2c55430c52
commit 483bd7de4a
8 changed files with 2095 additions and 1796 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3771
app/assets/javascripts/bootstrap.js vendored
View File

File diff suppressed because it is too large Load Diff

1
app/assets/stylesheets/list.css
View File

@ -195,6 +195,7 @@ legend {
padding: 0 8px;
vertical-align: inherit;
position: relative;
position/**/: static;
}
.sort-header th a {
display: block;

3
app/assets/stylesheets/orbit-bar.css.erb
View File

@ -69,6 +69,9 @@
#orbit-bar .orbit-logo .dropdown-menu {
left: -15px;
}
#orbit-bar .orbit-logo .dropdown-menu>li>a:hover>i {
background-image: url(<%= asset_path 'icons_pack_white.png' %>);
}
#orbit-bar .nav > li {
height: 28px;
}

4
app/assets/stylesheets/style.css.erb
View File

@ -280,7 +280,7 @@
.filter .accordion-heading {
border-bottom: none;
border-top: none;
border-left: 1px solid rgba(0,0,0,0.07);
border-left: 1px solid #E9E9E9;
border-right: none;
-moz-border-radius: 0;
-webkit-border-radius: 0;
@ -291,7 +291,7 @@
top: 0;
}
.filter li:last-child .accordion-heading {
border-right: 1px solid rgba(0,0,0,0.07);
border-right: 1px solid #E9E9E9;
}
.accordion-group .accordion-toggle .caret {
border-top-color: #0088CC;

54
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb vendored
View File

@ -1,33 +1,35 @@
<div id='filter' class="subnav">
<ul class="nav nav-pills filter">
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-status" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("announcement.status") %> <b class="web-symbol"></b></a>
<div id="accordion">
<ul class="nav nav-pills filter">
<li>
<div class="accordion-heading">
<a href="#collapse-status" data-toggle="collapse" data-parent="#accordion" class="accordion-toggle"><%= t("announcement.status") %> <b class="web-symbol"></b></a>
</div>
</li>
<li>
<div class="accordion-heading">
<a href="#collapse-category" data-toggle="collapse" data-parent="#accordion" class="accordion-toggle"><%= t("announcement.categories") %> <b class="web-symbol"></b></a>
</div>
</li>
<li>
<div class="accordion-heading">
<a href="#collapse-tags" data-toggle="collapse" data-parent="#accordion" class="accordion-toggle"><%= t("announcement.tags") %> <b class="web-symbol"></b></a>
</div>
</li>
</ul>
<div class="accordion-group filters">
<div class="accordion-body collapse" id="collapse-status">
<%= render 'filter_status' %>
</div>
</li>
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-category" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("announcement.categories") %> <b class="web-symbol"></b></a>
<div class="accordion-body collapse" id="collapse-category">
<%= render 'filter_categories' %>
</div>
</li>
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-tags" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("announcement.tags") %> <b class="web-symbol"></b></a>
<div class="accordion-body collapse" id="collapse-tags">
<%= render 'filter_tags' %>
</div>
<div id="sort_headers" class="table-label">
<%= render 'sort_headers' %>
</div>
</li>
</ul>
<div class="filters">
<div class="accordion-body collapse" id="collapse-status">
<%= render 'filter_status' %>
</div>
<div class="accordion-body collapse" id="collapse-category">
<%= render 'filter_categories' %>
</div>
<div class="accordion-body collapse" id="collapse-tags">
<%= render 'filter_tags' %>
</div>
<div id="sort_headers" class="table-label">
<%= render 'sort_headers' %>
</div>
</div>
</div>

2
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb vendored
View File

@ -106,7 +106,7 @@
<ul class="nav nav-tabs">
<%# @site_valid_locales.each_with_index do |locale, i| %>
<% @site_valid_locales.each_with_index do |locale, i| %>
<li <%= ( i == 0 ) ? " class='active'" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
<li <%= ( i == 0 ) ? " class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
<% end %>
</ul>

54
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb vendored
View File

@ -1,33 +1,35 @@
<div id='filter' class="subnav">
<ul class="nav nav-pills filter">
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-status" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("news.status") %> <b class="web-symbol"></b></a>
<div id="accordion">
<ul class="nav nav-pills filter">
<li>
<div class="accordion-heading">
<a href="#collapse-status" data-toggle="collapse" data-parent="#accordion" class="accordion-toggle"><%= t("news.status") %> <b class="web-symbol"></b></a>
</div>
</li>
<li>
<div class="accordion-heading">
<a href="#collapse-category" data-toggle="collapse" data-parent="#accordion" class="accordion-toggle"><%= t("news.categories") %> <b class="web-symbol"></b></a>
</div>
</li>
<li>
<div class="accordion-heading">
<a href="#collapse-tags" data-toggle="collapse" data-parent="#accordion" class="accordion-toggle"><%= t("news.tags") %> <b class="web-symbol"></b></a>
</div>
</li>
</ul>
<div class="accordion-group filters">
<div class="accordion-body collapse" id="collapse-status">
<%= render 'filter_status' %>
</div>
</li>
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-category" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("news.categories") %> <b class="web-symbol"></b></a>
<div class="accordion-body collapse" id="collapse-category">
<%= render 'filter_categories' %>
</div>
</li>
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-tags" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("news.tags") %> <b class="web-symbol"></b></a>
<div class="accordion-body collapse" id="collapse-tags">
<%= render 'filter_tags' %>
</div>
<div id="sort_headers" class="table-label">
<%= render 'sort_headers' %>
</div>
</li>
</ul>
<div class="filters">
<div class="accordion-body collapse" id="collapse-status">
<%= render 'filter_status' %>
</div>
<div class="accordion-body collapse" id="collapse-category">
<%= render 'filter_categories' %>
</div>
<div class="accordion-body collapse" id="collapse-tags">
<%= render 'filter_tags' %>
</div>
<div id="sort_headers" class="table-label">
<%= render 'sort_headers' %>
</div>
</div>
</div>

2
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb vendored
View File

@ -140,7 +140,7 @@
<ul class="nav nav-tabs">
<%# @site_valid_locales.each_with_index do |locale, i| %>
<% @site_valid_locales.each_with_index do |locale, i| %>
<li <%= ( i == 0 ) ? " class='active'" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
<li <%= ( i == 0 ) ? " class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
<% end %>
</ul>