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

Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

Browse Source
This commit is contained in:
Christophe Vilayphiou committed 2012-04-24 02:44:39 +08:00
2 parents a748ccaac7 0c4328987a
commit 6831a3dbbb
27 files changed
+116 -119
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/images/check.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

app/assets/javascripts/orbit-1.0.js
+8 -4
View File
@@ -47,10 +47,12 @@ $(document).ready(function(){
/*tinyscrollbar&windows-Size*/
resize();
var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2;
var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2,
$subWiget = $('#sub-wiget').width()+18;
$('#main-sidebar').css("height", viewportheight-30);
$('#main-sidebar .viewport').css("height", viewportheight-30);
$('.post-title').css("width", viewportwidth-495);
$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
$('#main-sidebar').tinyscrollbar();
$('.detal-list').tinyscrollbar();
@@ -68,10 +70,12 @@ $(document).ready(function(){
});
$(window).resize(function(){
resize();
var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2;
var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2,
$subWiget = $('#sub-wiget').width()+18;
$('#main-sidebar').css("height", viewportheight-30);
$('#main-sidebar .viewport').css("height", viewportheight-30);
$('.post-title').css("width", viewportwidth-495);
$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
mainTablePosition();
app/assets/stylesheets/bootstrap-orbit.css
Vendored
+2
View File
@@ -1,3 +1,5 @@
/*bootstrap-orbit*/
h1, h2, h3, h4, h5, h6 {
font-weight:normal ;
}
app/assets/stylesheets/bootstrap.css.erb
+11 -5
View File
@@ -1,3 +1,4 @@
/*bootstrap*/
/*!
* Bootstrap v2.0.0
*
@@ -538,7 +539,7 @@ select,
width: 210px;
height: 18px;
padding: 4px;
margin-bottom: 9px;
/*margin-bottom: 9px;*/
font-size: 13px;
line-height: 18px;
color: #555555;
@@ -2664,18 +2665,23 @@ button.btn.small, input[type="submit"].btn.small {
display: inline;
}
.pagination .page{
/*.pagination .page{
float: left;
padding: 0 14px;
line-height: 34px;
text-decoration: none;
border: 1px solid #ddd;
border-left-width: 0;
}
}*/
.pagination a {
float: left;
padding: 0 14px;
line-height: 34px;
text-decoration: none;
border: 1px solid #DDD;
border-left-width: 0;
}
.pagination .next{
/*.pagination .next{
float: left;
padding: 0 14px;
line-height: 34px;
@@ -2690,7 +2696,7 @@ button.btn.small, input[type="submit"].btn.small {
text-decoration: none;
border: 1px solid #ddd;
border-left-width: 0;
}
}*/
.pagination .current{
border-left-width: 1px;
}
app/assets/stylesheets/inc/permission-checkbox.css
-77
View File
@@ -1,77 +0,0 @@
.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('img/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;
}
app/assets/stylesheets/isotope.css
+2
View File
@@ -1,3 +1,5 @@
/*isotope*/
#isotope {
margin-top: 2px;
background-color:#f4f4f4;
app/assets/stylesheets/list.css
+23 -8
View File
@@ -1,8 +1,5 @@
.list-remove {
position: relative;
top: 2px;
left: 2px;
}
/*list*/
.table th.select {
border-bottom:2px solid #0088CC;
}
@@ -112,9 +109,6 @@ legend {
margin-bottom: 15px;
padding-bottom: 5px;
}
.upload-picture {
margin-left: 20px;
}
.subnav {
-moz-border-radius: 0;
-webkit-border-radius: 0;
@@ -148,4 +142,25 @@ legend {
.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;
}
#check_all_bulletins {
position: absolute;
top: 10px;
left: 5px;
}
.list-remove {
padding: 8px 0 8px 16px !important;
}
app/assets/stylesheets/message.css
+2
View File
@@ -1,3 +1,5 @@
/*message*/
.error{
color:red;
}
app/assets/stylesheets/reset.css.erb
+3
View File
@@ -1,3 +1,6 @@
/*reset*/
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
-webkit-text-size-adjust:none;
}
app/assets/stylesheets/scroll_style.css
+2
View File
@@ -1,3 +1,5 @@
/*scroll_style*/
@charset "UTF-8";
/* CSS Document */
.my_scroll {
app/assets/stylesheets/sidebar.css.erb
+1
View File
@@ -1,3 +1,4 @@
/*sidebar*/
#back_sidebar {
left: 0;
app/assets/stylesheets/site_assets.css.erb
+2
View File
@@ -1,3 +1,5 @@
/*site_assets*/
.assets_setup{
padding:42px 0 0 0;
}
app/assets/stylesheets/site_designs.css.erb
+2
View File
@@ -1,3 +1,5 @@
/*site_designs*/
.designs_setup{
padding:42px 0 0 0;
}
app/assets/stylesheets/site_items.css.erb
+2
View File
@@ -1,3 +1,5 @@
/*site_items*/
html, body{
height: 100%;
margin: 0;
app/assets/stylesheets/style.css.erb
+17 -1
View File
@@ -1,3 +1,5 @@
/*style*/
@font-face{
font-family: 'WebSymbolsRegular';
src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>);
@@ -371,7 +373,7 @@
#post-body .editor {
}
#post-body-content {
margin-right: 320px;
/*margin-right: 320px;*/
padding: 8px 0 8px 6px;
}
.filter .accordion-heading > a:hover {
@@ -604,6 +606,20 @@
}
.text-green {
color: #39b54a !important;
}
.adbanner-list {
margin-top: 20px;
}
.adbanner-list ul {
margin: 0px;
}
.adbanner-list ul li {
list-style: none;
margin-left: 0;
margin-right: 20px;
}
.adbanner-action {
margin-bottom: 20px;
}
[class^="icons-"] {
display: inline-block;
app/assets/stylesheets/widgets.css
+4 -2
View File
@@ -1,4 +1,6 @@
/*Widget*/
/*Widget*/
.widget-size-300 {
width:298px;
}
@@ -82,7 +84,7 @@
border-radius: 0 3px 3px 0;
text-align: left;
margin: 0;
width: 182px;
width: 180px;
}
.file-upload .upload {
margin:0;