Skip to content
This repository has been archived by the owner on Sep 12, 2018. It is now read-only.

Commit

Permalink
Merge branch 'feature/organization-working'
Browse files Browse the repository at this point in the history
  • Loading branch information
@eungjun-yi
eungjun-yi committed Apr 22, 2014
2 parents 0de3e36 + 8b0e5ec commit 89e63eb
Show file tree
Hide file tree
Showing 165 changed files with 5,286 additions and 1,878 deletions.
3 changes: 2 additions & 1 deletion app/assets/stylesheets/less/_common.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ input[type=number]::-webkit-outer-spin-button {
.upload-progress {
height: 7px;
margin-bottom: 5px;
background:#b1b1b1;
background:#f0f0f0;
filter:none;

.box-shadow(inset 0px 1px 1px rgba(0,0,0,0.25));
Expand Down Expand Up @@ -135,6 +135,7 @@ input[type=number]::-webkit-outer-spin-button {
/** text style **/
.bold { font-weight:bold; }
.gray-txt { color:@gray-cc !important; }
.darkgray-txt { color:@gray-99 !important; }
.orange-txt { color:@orange !important; }
.primary-txt { color:@primary !important; }
.secondary-txt { color:@secondary !important; }
Expand Down
136 changes: 75 additions & 61 deletions app/assets/stylesheets/less/_page.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,17 @@
border-top: 4px solid #FFF;
}
}

&.dropdwon-box-btn {
background-color:@primary;
.border-radius(3px);
color:#FFF;
padding:0 10px;

.caret {
border-top: 4px solid #FFF;
}
}
}
}
}
Expand Down Expand Up @@ -218,7 +229,7 @@

.project-header-outer {
background-color:#ececec;
height:69px;
height:80px;
border-bottom:1px solid #ddd;
background-clip: padding-box;
background-position: bottom;
Expand Down Expand Up @@ -1600,7 +1611,7 @@
width:100%;
ul {
display:inline-block;
width:115px; max-height:71px;
max-width: 920px;
overflow:hidden;

li {
Expand Down Expand Up @@ -1817,7 +1828,7 @@
}
}
.cu-label {
width: 80px;
width: 160px;
padding-right: 45px;
.inline-block;
vertical-align: top;
Expand Down Expand Up @@ -2228,17 +2239,15 @@
text-align:center;
padding:5px 0;
.project-btn-item {
margin-top:10px;
display:block;

a {
display:block;
}
}

&.git-project{
.project-btn-item {
display: inline-block;
padding:0 5px;
&:first-child {
margin-top:0;
}
}
}
Expand Down Expand Up @@ -2622,7 +2631,11 @@
padding-right: 2px;
margin-bottom: 10px;
}
.write-comment-box {
padding: 10px;
}
}

.comment {
padding: 10px 0px;
position: relative;
Expand Down Expand Up @@ -2895,9 +2908,10 @@ div.markdown-preview {
overflow-x:auto;
margin:0px;
vertical-align : middle;
border:3px solid #ddd;
padding:10px;
border:2px solid #ccc;
padding:4px 6px;
.border-radius(0 0 3px 3px);
background: #FAFAFA;

}

Expand Down Expand Up @@ -3164,7 +3178,6 @@ div.markdown-preview {

.content {
height:190px; /*320px;*/
background-color: #F9F9F9;
}
.actions {
margin-top: 20px;
Expand Down Expand Up @@ -3320,11 +3333,30 @@ label.issue-item-row {
i {vertical-align: middle;}

.size {margin-right:3px;}
.total {color:#777;}

&:hover {
color:#3592b5;
text-decoration: none;
}
&.open {
color:@state-open !important;
}
&.closed {
color:@state-closed !important;
.total { color:inherit !important; }
}
}

.upload-progress {
display: inline-block;
width: 30px;
vertical-align: middle;
overflow: hidden;
margin-top: 3px;
.border-radius(5px);

.bar { height:100%; }
}
}
}
Expand Down Expand Up @@ -3776,7 +3808,6 @@ label.issue-item-row {
.write-comment-box {
font-family:@base-font-family;
padding:5px;
background-color: #f5f5f5;
}

/** view **/
Expand Down Expand Up @@ -5034,7 +5065,6 @@ label.issue-item-row {
form { margin:0;}

.write-comment-box {
background-color: #f5f5f5;
padding:15px 0 15px 50px;
margin:0;

Expand Down Expand Up @@ -5108,6 +5138,12 @@ label.issue-item-row {
}
}
}

&.discommentable {
.linenum .yobicon-comments {
display:none;
}
}
}

div.diff-body[data-outdated="true"] tr:hover .icon-comment {
Expand Down Expand Up @@ -5180,7 +5216,7 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {

.review-form {
position:absolute; display: none;
z-index:99; top:0px; left:0px; right:0px;
z-index:1000; top:0px; left:0px; right:0px;
padding: 15px 15px 10px;
background: #fff;
border:1px solid #ccc;
Expand Down Expand Up @@ -5375,54 +5411,32 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {
}
}

.review-list-wrap {
ul {
list-style: none;
padding:15px 0;

.review-item {
border-bottom:1px solid #ddd;
clear:both;
padding:10px 0;

.review-number {
float:left;
width: 62px;
text-align: center;
font-size: 13px;
color:#51aacc;
font-weight: bold;
line-height: 42px;
}

.review-avatar {
float:left;
}

.review-content {
margin-left:115px;

.review-comment {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
font-size: 14px;
}
.group-title-head{
color: #00bff3;
.border-radius(3px);
font-size: 12px;
margin-right: 5px;
padding: 3px;
}

.review-meta {
font-size: 12px;
color:#999;
.my-list-item {
img {
width: 20px;
height: 20px;
.border-radius(3px);
border: 1px solid #ececec;
margin-right: 3px;
}
.dummy-25px {
width: 25px;
display: inline-block;
}
}

.date {
margin-left:8px;
}
.dropdown-menu>li {
.my-list-item;
}

.comments {
margin-left:8px;
i { vertical-align: middle; }
}
}
}
}
}
.margin-right-15 {
margin-right: 15px;
}
11 changes: 0 additions & 11 deletions app/assets/stylesheets/less/_reponsive.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,6 @@
}
}

.project-home {
.project-btn-wrap {
&.git-project{
.project-btn-item {
display: block;
padding:5px 0;
}
}
}
}

.diff-body {
.diff-partial-outer {
.diff-partial-inner {
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/less/_variables.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
@yobi-btn-success-hover : @yobi-green-dark;
@yobi-btn-info : @yobi-blue;
@yobi-btn-info-hover : @yobi-blue-dark;
@yobi-btn-inverse : @yobi-inverse;
@yobi-btn-inverse-hover : @yobi-inverse-dark;
@yobi-btn-inverse : #8F8E8E;
@yobi-btn-inverse-hover : #7A7A7A;
@yobi-btn-danger : @yobi-red;
@yobi-btn-danger-hover : @yobi-red-dark;
@yobi-btn-warning : @yobi-yello;
Expand Down
Loading

0 comments on commit 89e63eb

Please sign in to comment.