Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
This commit is contained in:
commit
c7d8e0b27b
3 files changed
+11
-2
No files matched your search
@@ -161,6 +161,6 @@ legend {
|
||||
top: 10px;
|
||||
left: 5px;
|
||||
}
|
||||
.list-remove {
|
||||
#sort_headers .list-remove {
|
||||
padding: 8px 0 8px 16px !important;
|
||||
}
|
||||
@@ -109,7 +109,8 @@
|
||||
text-indent: -9999px;
|
||||
padding:6px;
|
||||
}
|
||||
#orbit-bar .nav > li.search {
|
||||
#orbit-bar .nav > li.search {
|
||||
background-image: none;
|
||||
overflow: hidden;
|
||||
width: 28px;
|
||||
position: relative;
|
||||
@@ -322,6 +323,9 @@
|
||||
#main-wrap .breadcrumb li {
|
||||
font-size: 12px;
|
||||
color: #999;
|
||||
}
|
||||
.form-actions .btn {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
#sub-wiget {
|
||||
clear: right;
|
||||
|
||||
Reference in new issue
Block a user