Fix after merge from NCCU, the translations still need to be cleaned
This commit is contained in:
chris committed
1 parent
65ac6980c4
commit
cc5e238576
7 files changed
+44
-297
No files matched your search
@@ -470,202 +470,6 @@
|
||||
padding: 5px;
|
||||
}*/
|
||||
|
||||
<<<<<<< HEAD
|
||||
.member td.teacher {
|
||||
/*background-color: #AF0045;
|
||||
border-left: 2px solid #AF0045;*/
|
||||
}
|
||||
.gender {
|
||||
position: absolute;
|
||||
border-radius: 0 0 5px 0;
|
||||
border-width: 10px;
|
||||
margin: 0;
|
||||
border-style: solid;
|
||||
z-index: 10;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
}
|
||||
.gender.male {
|
||||
border-color: transparent #41B1D5 #41B1D5 transparent;
|
||||
}
|
||||
.gender.female {
|
||||
border-color: transparent #DB186E #DB186E transparent;
|
||||
}
|
||||
.user-info {
|
||||
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;
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
position: fixed;
|
||||
}
|
||||
.roles-nav li {
|
||||
list-style: none;
|
||||
background-color: #D8D8D8;
|
||||
}
|
||||
.roles-nav li a {
|
||||
display: block;
|
||||
padding: 5px 20px;
|
||||
text-decoration: none;
|
||||
}
|
||||
/*.user-info .roles-nav li:first-child a {
|
||||
border-radius: 0 0 0 4px;
|
||||
}*/
|
||||
/*.user-info .roles-nav li:last-child a {
|
||||
border-radius: 0 0 4px 0;
|
||||
}*/
|
||||
/*.user-info .roles-nav li hr {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
height: 3px;
|
||||
margin: 0;
|
||||
border: none;
|
||||
display: none;
|
||||
}*/
|
||||
/*.user-info .roles-nav li.teacher a {
|
||||
background-color: #F36F08;
|
||||
}*/
|
||||
/*.user-info .roles-nav li.student a {
|
||||
background-color: #186AB6;
|
||||
}*/
|
||||
/*.user-info .roles-nav li.staff a {
|
||||
background-color: #139E2F;
|
||||
}*/
|
||||
/*.user-info .roles-nav li.active a {
|
||||
border-bottom: none;
|
||||
height: 18px;
|
||||
margin-top: 0;
|
||||
opacity: 1;
|
||||
-moz-opacity: 1;
|
||||
filter:alpha(opacity=10);
|
||||
}*/
|
||||
/*.user-info .roles-nav li.active hr {
|
||||
display: block;
|
||||
}*/
|
||||
.user-info-basic {
|
||||
position: relative;
|
||||
background-color: #F0F0F0;
|
||||
margin-left: 100px;
|
||||
padding: 20px 20px 0;
|
||||
border-radius: 5px 5px 0 0;
|
||||
}
|
||||
.user-info-basic .gender {
|
||||
border-radius: 0;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: auto;
|
||||
bottom: auto;
|
||||
border-radius: 5px 0 0 0;
|
||||
}
|
||||
.user-info-basic .gender.male {
|
||||
border-color: #41B1D5 transparent transparent #41B1D5;
|
||||
}
|
||||
.user-info-basic .gender.female {
|
||||
border-color: #DB186E transparent transparent #DB186E;
|
||||
}
|
||||
.user-info-roles {
|
||||
margin-left: 100px;
|
||||
background-color: #F0F0F0;
|
||||
border-radius: 0 0 5px 5px;
|
||||
padding: 20px;
|
||||
}
|
||||
.user-avatar {
|
||||
overflow: hidden;
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
margin-bottom: 10px;
|
||||
margin-right: 20px;
|
||||
border-radius: 5px;
|
||||
box-shadow: 0 1px 3px rgba(0,0,0,.8);
|
||||
}
|
||||
.user-avatar .reflective {
|
||||
background-image: url(<%= asset_path 'reflective.png' %>);
|
||||
background-repeat: no-repeat;
|
||||
background-position: 0;
|
||||
height: 80px;
|
||||
width: 80px;
|
||||
position: absolute;
|
||||
}
|
||||
.user .user-avatar .reflective {
|
||||
background-image: url(<%= asset_path 'reflective.png' %>);
|
||||
background-repeat: no-repeat;
|
||||
background-position: 0 -20px;
|
||||
height: 80px;
|
||||
width: 80px;
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
left: 10px;
|
||||
opacity: 0;
|
||||
-moz-opacity: 0;
|
||||
filter:alpha(opacity=0);
|
||||
}
|
||||
.user:hover .user-avatar .reflective {
|
||||
background-position: 0 0;
|
||||
opacity: 1;
|
||||
-moz-opacity: 1;
|
||||
filter:alpha(opacity=10);
|
||||
}
|
||||
.user-name {
|
||||
font-size: 2.2em;
|
||||
line-height: 24px;
|
||||
color: #555;
|
||||
margin: 0 0 3px;
|
||||
font-family: Helvetica, "微軟正黑體";
|
||||
}
|
||||
.user-data {
|
||||
padding: 0 0 20px 0;
|
||||
margin: 109px 20px 0;
|
||||
}
|
||||
/*.data-block hr {
|
||||
background-color: #666;
|
||||
height: 8px;
|
||||
border: none;
|
||||
margin: 0;
|
||||
border-radius: 5px 5px 0px 0px;
|
||||
-moz-border-radius: 5px 5px 0px 0px;
|
||||
-webkit-border-radius: 5px 5px 0px 0px;
|
||||
}*/
|
||||
/*.data-block .info_input {
|
||||
margin-bottom:50px;
|
||||
position:relative;
|
||||
padding: 10px;
|
||||
background-color: rgba(227,227,227,1);
|
||||
border-radius: 0px 0px 5px 5px;
|
||||
-moz-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 */
|
||||
/*-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 + */
|
||||
/*}*/
|
||||
/*.data-block .info_input table {
|
||||
width: 100%;
|
||||
}*/
|
||||
/*.data-block .info_input table .list_head td {
|
||||
border-bottom: 1px solid #AAA;
|
||||
}*/
|
||||
/*.teacher hr {
|
||||
background-color: #F36F08;
|
||||
}*/
|
||||
/*.student hr {
|
||||
background-color: #186AB6;
|
||||
}*/
|
||||
/*.staff hr {
|
||||
background-color: #139E2F;
|
||||
}*/
|
||||
=======
|
||||
>>>>>>> various_bugs
|
||||
.view-mode {
|
||||
margin: 6px 10px 0 0;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user