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

Merge branch 'design_team' into ldap

Browse Source 
Conflicts:
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
This commit is contained in:
Christophe Vilayphiou committed 2012-05-08 11:40:38 +08:00
2 parents a9ab016d52 ba4385e3fd
commit 2b9190a49e
101 files changed
+1269 -689
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/images/-sign-in-logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

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

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

app/assets/images/sign-in-logo.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 18 KiB

app/assets/javascripts/orbit-1.0.js
+1 -8
View File
@@ -1,6 +1,5 @@
var viewportwidth,
viewportheight;
console.log($(window).height())
function resize() {
viewportheight=$(window).height();
viewportwidth=$(window).width();
@@ -15,9 +14,9 @@ $(document).ready(function(){
placement: "left"
});
$(document).on('click', '.privacy', function() {
console.log($(this).val());
switch ($(this).val()) {
case 'true':
$(this).parents('.controls').children('.select-role').slideUp(300);
@@ -53,15 +52,12 @@ $(document).ready(function(){
$orbitBar = $('#orbit-bar').height(),
$mainSidebar = $('#main-sidebar').width()+5,
$formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right"));
console.log($orbitBar);
console.log("ready"+$(window).height());
$('#main-sidebar').css("height", viewportheight-$orbitBar);
$('#main-sidebar .viewport').css("height", viewportheight-$orbitBar);
$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
$('#bulletin_pagination').css("width", viewportwidth-$mainSidebar);
$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
$('.detal-list').tinyscrollbar();
mainTablePosition();
@@ -82,14 +78,12 @@ $(window).resize(function(){
$orbitBar = $('#orbit-bar').height(),
$mainSidebar = $('#main-sidebar').width()+5,
$formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right"));
console.log(viewportheight);
$('#main-sidebar').css("height", viewportheight-$orbitBar);
$('#main-sidebar .viewport').css("height", viewportheight-$orbitBar);
$('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget);
$('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16);
$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
$('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding);
$('#bulletin_pagination').css("width", viewportwidth-$mainSidebar);
$('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)});
mainTablePosition();
});
@@ -118,5 +112,4 @@ $(window).scroll(function () {
$(".table-label").css({left:$winLeft*-1} );
//$(".table-label").css({left:$mainWrapMarginLeft+($winLeft*-1)} );
//$("#main-wrap > .subnav").css({width:$subnavWidth+($winLeft)} );
//console.log($mainWrapMarginLeft+($winLeft*-1)+5);
});
app/assets/javascripts/orbit-bar-search.js
+6
View File
@@ -1,3 +1,9 @@
$(document).ready(function(){
$('.search').tooltip({
placement: "bottom"
});
});
$(document).on('click', '.orbit-bar-search', function (){
if ($(this).parents('.search').hasClass('visible')){
$(this).parents('.search').stop().animate({
app/assets/javascripts/orbit_bar.js
+1 -1
View File
@@ -4,4 +4,4 @@ $(document).ready(function() {
$('body').prepend($(this).html());
$(this).remove();
});
});
});
app/assets/stylesheets/bootstrap.css.erb
+4 -1
View File
@@ -2701,8 +2701,11 @@ button.btn.small, input[type="submit"].btn.small {
.pagination .current{
border-left-width: 1px;
}
.pagination a {
background-color: #FFFFFF;
}
.pagination a:hover, .pagination .active a {
background-color: #f5f5f5;
background-color: #e8e8e8;
}
.pagination .active a {
color: #999999;
app/assets/stylesheets/inc/permission-checkbox.css.erb
+9 -6
View File
@@ -10,22 +10,25 @@
}
.checkbox{
padding: 5px;
margin: 5px 5px 10px;
margin: 0;
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) );
border-style: solid;
border-width: 0px 1px 1px 0;
border-color: #dfdfdf;
/*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);
border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;*/
}
.checkbox .check-icon {
display: none;
@@ -40,7 +43,7 @@
cursor: pointer;
font-family: helvetica;
font-size: 12px;
line-height: 30px;
line-height: 15px;
padding: 0 10px 0 40px;
color: #333333;
display: inline-block;
app/assets/stylesheets/list.css
+11 -5
View File
@@ -70,9 +70,8 @@
}
.main-list .label-td:hover {
height: auto;
text-align: center;
padding: 5px 5px 8px;
left: -6px;
left: -40px;
top: -6px;
border: 1px solid rgba(0, 0, 0, 0.2);
box-shadow: 0px 5px 10px rgba(0,0,0,0.2);
@@ -82,6 +81,7 @@
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
z-index: 5;
width: 200px;
}
.qe-edit-div .table-condensed {
background-color: #F2F2F2;
@@ -188,10 +188,16 @@ legend {
}
.form-fixed {
position: fixed;
margin-bottom: 0;
margin: 0;
padding: 10px;
bottom: 0;
z-index: 10;
z-index: 2;
}
.form-fixed .btn {
margin-top: 4px;
}
.paginationFixed {
margin-bottom: 25px;
}
.paginationFixed .pagination {
margin-top: 0 !important;
}
app/assets/stylesheets/style.css.erb
+21 -4
View File
@@ -10,7 +10,7 @@
}
.login-logo {
text-indent: -9999px;
background: url(<%= asset_path 'sign-in-logo.png' %>) no-repeat center 40px;
background: url(<%= asset_path 'sign-in-logo.png' %>) no-repeat center 80px;
padding-top: 40px;
height: 160px;
}
@@ -61,8 +61,8 @@
margin-right: -20px;
}
#orbit-bar .search-query {
padding: 4px 9px;
height: 12px;
padding: 7px 9px 5px;
height: 10px;
margin-top: 3px;
border: 1px solid #333333;
font-size: 11px;
@@ -119,7 +119,8 @@
background-position: -10px -10px;
}
#orbit-bar .nav > li > a.orbit-bar-desktop {
background-position: -106px -9px;
background-position: -73px -42px;
width: 48px;
}
#orbit-bar .nav > li > a.orbit-bar-member {
background-position: -4px -37px;
@@ -635,6 +636,22 @@
.adbanner-action {
margin-bottom: 20px;
}
.textarea-height-s {
resize: none;
max-height: 150px;
}
.textarea-height-m {
resize: none;
max-height: 250px;
}
.textarea-height-l {
resize: none;
max-height: 350px;
}
.textarea-height-xl {
resize: none;
max-height: 500px;
}
[class^="icons-"] {
display: inline-block;
width: 16px;