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

Merge branch 'master' of github.com:Rulingcom/NCCU

This commit is contained in:
Matthew K. Fu JuYuan 2012-09-10 11:54:20 +08:00
parent a20db344f1 9d21a86f53
commit 768f907f66
2 changed files with 85 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/stylesheets/bootstrap.css.erb
View File

@ -99,7 +99,7 @@ textarea {
body { body {
margin: 0; margin: 0;
font-family: /*"Helvetica Neue", */Helvetica, Arial, sans-serif; font-family: /*"Helvetica Neue", */Helvetica, Arial, sans-serif;
font-size: 13px; font-size: 75%;
line-height: 18px; line-height: 18px;
color: #333333; color: #333333;
background-color: #ffffff; background-color: #ffffff;
@ -277,7 +277,7 @@ a:hover {
} }
p { p {
margin: 0 0 9px; margin: 0 0 9px;
font-family: Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
} }
@ -522,7 +522,7 @@ input,
button, button,
select, select,
textarea { textarea {
font-family: Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
line-height: 18px; line-height: 18px;
@ -540,7 +540,7 @@ select,
width: 210px; width: 210px;
height: 18px; height: 18px;
padding: 4px; padding: 4px;
/*margin-bottom: 9px;*/ margin-bottom: 9px;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: #555555; color: #555555;

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

@ -1,5 +1,6 @@
/*style*/ /*style*/
@import url(http://fonts.googleapis.com/css?family=Cuprum);
@font-face{ @font-face{
font-family: 'WebSymbolsRegular'; font-family: 'WebSymbolsRegular';
src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>); src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>);
@ -55,8 +56,7 @@
height: 11px; height: 11px;
margin-top: 3px; margin-top: 3px;
border: 1px solid #333333; border: 1px solid #333333;
font-size: 11px; line-height: 1.5em;
line-height: 21px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3) inset, 0 1px 0 rgba(255, 255, 255, 0.15); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3) inset, 0 1px 0 rgba(255, 255, 255, 0.15);
} }
#orbit-bar .search-query:focus { #orbit-bar .search-query:focus {
@ -213,7 +213,7 @@
color: #666; color: #666;
top: -9px; top: -9px;
left: 100px; left: 100px;
font-size:16px; font-size: 1.4em;
text-align: center; text-align: center;
} }
#orbit-bar .bar-login .dropdown-menu .register { #orbit-bar .bar-login .dropdown-menu .register {
@ -297,7 +297,6 @@
padding: 7px 8px 5px; padding: 7px 8px 5px;
} }
#main-wrap .breadcrumb li { #main-wrap .breadcrumb li {
font-size: 12px;
color: #999; color: #999;
} }
.form-actions .btn { .form-actions .btn {
@ -497,10 +496,10 @@
.sign-in .control-group label { .sign-in .control-group label {
text-align: left; text-align: left;
width: auto; width: auto;
font-size: 15px;
} }
.sign-in .forgot { .sign-in .forgot {
padding-top: 5px; padding-top: 5px;
font-size: 1.1em;
} }
.sign-in .content { .sign-in .content {
padding: 10px; padding: 10px;
@ -571,33 +570,40 @@
.gender.female { .gender.female {
border-color: transparent #DB186E #DB186E transparent; border-color: transparent #DB186E #DB186E transparent;
} }
.user-info .roles-nav { .user-info {
margin: 0; position: fixed;
right: 0px;
left: 160px;
top: 31px;
background-color: #FFF;
padding: 20px 20px 0;
}
.user-info hr {
margin-bottom: 0px;
}
.roles-nav {
position: relative; position: relative;
clear: both;
}
.user-info .roles-nav li {
float: left;
list-style: none; list-style: none;
background-color: #FFFFFF; margin: 0;
padding: 0;
position: fixed;
} }
.user-info .roles-nav li a { .roles-nav li {
text-indent: -9999px; list-style: none;
background-color: #D8D8D8;
}
.roles-nav li a {
display: block; display: block;
height: 15px; padding: 5px 20px;
width: 100px; text-decoration: none;
margin-top: 3px;
opacity: 0.3;
-moz-opacity: 0.3;
filter:alpha(opacity=3);
} }
.user-info .roles-nav li:first-child a { /*.user-info .roles-nav li:first-child a {
border-radius: 0 0 0 4px; border-radius: 0 0 0 4px;
} }*/
.user-info .roles-nav li:last-child a { /*.user-info .roles-nav li:last-child a {
border-radius: 0 0 4px 0; border-radius: 0 0 4px 0;
} }*/
.user-info .roles-nav li hr { /*.user-info .roles-nav li hr {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@ -606,33 +612,33 @@
margin: 0; margin: 0;
border: none; border: none;
display: none; display: none;
} }*/
.user-info .roles-nav li.teacher a { /*.user-info .roles-nav li.teacher a {
background-color: #F36F08; background-color: #F36F08;
} }*/
.user-info .roles-nav li.student a { /*.user-info .roles-nav li.student a {
background-color: #186AB6; background-color: #186AB6;
} }*/
.user-info .roles-nav li.staff a { /*.user-info .roles-nav li.staff a {
background-color: #139E2F; background-color: #139E2F;
} }*/
.user-info .roles-nav li.active a { /*.user-info .roles-nav li.active a {
border-bottom: none; border-bottom: none;
height: 18px; height: 18px;
margin-top: 0; margin-top: 0;
opacity: 1; opacity: 1;
-moz-opacity: 1; -moz-opacity: 1;
filter:alpha(opacity=10); filter:alpha(opacity=10);
} }*/
.user-info .roles-nav li.active hr { /*.user-info .roles-nav li.active hr {
display: block; display: block;
} }*/
.user-info-basic { .user-info-basic {
padding: 20px;
min-width: 220px;
display: inline-block;
float: left;
position: relative; position: relative;
background-color: #F0F0F0;
margin-left: 100px;
padding: 20px 20px 0;
border-radius: 5px 5px 0 0;
} }
.user-info-basic .gender { .user-info-basic .gender {
border-radius: 0; border-radius: 0;
@ -640,6 +646,7 @@
left: 0; left: 0;
right: auto; right: auto;
bottom: auto; bottom: auto;
border-radius: 5px 0 0 0;
} }
.user-info-basic .gender.male { .user-info-basic .gender.male {
border-color: #41B1D5 transparent transparent #41B1D5; border-color: #41B1D5 transparent transparent #41B1D5;
@ -648,15 +655,19 @@
border-color: #DB186E transparent transparent #DB186E; border-color: #DB186E transparent transparent #DB186E;
} }
.user-info-roles { .user-info-roles {
margin-left: 100px;
background-color: #F0F0F0;
border-radius: 0 0 5px 5px;
padding: 20px; padding: 20px;
} }
.user-avatar { .user-avatar {
overflow: hidden; overflow: hidden;
width: 80px; width: 80px;
height: 80px; height: 80px;
margin-bottom: 10px;
margin-right: 20px;
border-radius: 5px; border-radius: 5px;
box-shadow: 0 1px 3px rgba(0,0,0,.8); box-shadow: 0 1px 3px rgba(0,0,0,.8);
margin-right: 10px;
} }
.user-avatar .reflective { .user-avatar .reflective {
background-image: url(<%= asset_path 'reflective.png' %>); background-image: url(<%= asset_path 'reflective.png' %>);
@ -686,17 +697,17 @@
filter:alpha(opacity=10); filter:alpha(opacity=10);
} }
.user-name { .user-name {
font-size: 22px; font-size: 2.2em;
line-height: 24px; line-height: 24px;
color: #555; color: #555;
margin: 0 0 3px; margin: 0 0 3px;
font-family: Helvetica, "微軟正黑體"; font-family: Helvetica, "微軟正黑體";
} }
.user-data { .user-data {
padding: 20px; padding: 0 0 20px 0;
position: relative; margin: 109px 20px 0;
} }
.data-block hr { /*.data-block hr {
background-color: #666; background-color: #666;
height: 8px; height: 8px;
border: none; border: none;
@ -704,8 +715,8 @@
border-radius: 5px 5px 0px 0px; border-radius: 5px 5px 0px 0px;
-moz-border-radius: 5px 5px 0px 0px; -moz-border-radius: 5px 5px 0px 0px;
-webkit-border-radius: 5px 5px 0px 0px; -webkit-border-radius: 5px 5px 0px 0px;
} }*/
.data-block .info_input { /*.data-block .info_input {
margin-bottom:50px; margin-bottom:50px;
position:relative; position:relative;
padding: 10px; padding: 10px;
@ -714,29 +725,32 @@
-moz-border-radius: 0px 0px 5px 5px; -moz-border-radius: 0px 0px 5px 5px;
-webkit-border-radius: 0px 0px 5px 5px; -webkit-border-radius: 0px 0px 5px 5px;
-moz-box-shadow: 0px 1px 0px rgba(0,0,0,.3); /* Firefox */ -moz-box-shadow: 0px 1px 0px rgba(0,0,0,.3); /* Firefox */
-webkit-box-shadow: 0px 1px 0px rgba(0,0,0,.3);/* Safari 和 Chrome */ /*-webkit-box-shadow: 0px 1px 0px rgba(0,0,0,.3);/* Safari 和 Chrome */
box-shadow: 0px 1px 0px rgba(0,0,0,.3); /* Opera 10.5 + */ /*box-shadow: 0px 1px 0px rgba(0,0,0,.3); /* Opera 10.5 + */
} /*}*/
.data-block .info_input table { /*.data-block .info_input table {
width: 100%; width: 100%;
} }*/
.data-block .info_input table .list_head td { /*.data-block .info_input table .list_head td {
border-bottom: 1px solid #AAA; border-bottom: 1px solid #AAA;
} }*/
.teacher hr { /*.teacher hr {
background-color: #F36F08; background-color: #F36F08;
} }*/
.student hr { /*.student hr {
background-color: #186AB6; background-color: #186AB6;
} }*/
.staff hr { /*.staff hr {
background-color: #139E2F; background-color: #139E2F;
} }*/
.view-mode { .view-mode {
margin: 4px 20px 0 0; margin: 4px 20px 0 0;
} }
.view-mode .btn {
margin-bottom: 0;
}
.view-mode i { .view-mode i {
font-size: 14px; font-size: 1.4em;
line-height: 6px !important; line-height: 6px !important;
} }
.member-abstract, .member-large { .member-abstract, .member-large {
@ -781,7 +795,7 @@
} }
.member-abstract .user .user-title span { .member-abstract .user .user-title span {
color: #5e5e5e; color: #5e5e5e;
font-size: 13px; font-size: 1.3em;
padding-right: 10px; padding-right: 10px;
} }
.member-abstract .user:hover .user-title span { .member-abstract .user:hover .user-title span {
@ -804,7 +818,7 @@
} }
.member-abstract .user ul.user-itemborder li { .member-abstract .user ul.user-itemborder li {
width: 33%; width: 33%;
font-size: 11px; font-size: 1.1em;
text-align: center; text-align: center;
} }
.member-abstract .user ul.user-itemborder li span { .member-abstract .user ul.user-itemborder li span {
@ -821,7 +835,7 @@
} }
.member-large .user-name { .member-large .user-name {
font-weight: bold; font-weight: bold;
font-size: 13px; font-size: 1.3em;
width: 80px; width: 80px;
line-height: 18px; line-height: 18px;
padding-top: 5px; padding-top: 5px;
@ -862,7 +876,6 @@
width: 220px \9; width: 220px \9;
} }
.site-map .map-block li { .site-map .map-block li {
font-size: 12px;
background-color: #F7F7F7; background-color: #F7F7F7;
padding: 5px 15px; padding: 5px 15px;
border-top: 1px solid #FFF; border-top: 1px solid #FFF;
@ -922,7 +935,7 @@
.onoff { .onoff {
display: block; display: block;
background-color: #5EB92B; background-color: #5EB92B;
font-size: 9px; font-size: 0.9em;
padding: 0px 10px; padding: 0px 10px;
border-radius: 8px; border-radius: 8px;
line-height: 16px; line-height: 16px;
@ -969,7 +982,7 @@
margin-bottom: 5px; margin-bottom: 5px;
} }
[class^="text-"] { [class^="text-"] {
font-size: 15px !important; font-size: 1.2em !important;
} }
.text-blue { .text-blue {
color: #0088CC !important; color: #0088CC !important;
@ -1681,4 +1694,4 @@
/*21*/ /*21*/
.icons- { .icons- {
background-position: -0px -640px; background-position: -0px -640px;
} }