finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2

Browse source 
# Conflicts:
#	modules/bindata/bindata.go
#	public/css/gogs.min.css
#	templates/repo/header.tmpl
This commit is contained in:
Unknwon 2015-08-10 00:37:42 +08:00
commit a79586cc54
31 changed files with 1240 additions and 466 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/css/gogs.min.css vendored
View file

File diff suppressed because one or more lines are too long

4
public/css/semantic.min.css vendored
View file

File diff suppressed because one or more lines are too long

12
public/js/gogs.js
View file

@ -43,6 +43,15 @@ function initRepository() {
// Labels
if ($('.repository.labels').length > 0) {
// Create label
var $new_label_panel = $('.new-label.segment');
$('.new-label.button').click(function () {
$new_label_panel.show();
});
$('.new-label.segment .cancel').click(function () {
$new_label_panel.hide();
});
$('.color-picker').each(function () {
$(this).minicolors();
});
@ -53,8 +62,7 @@ function initRepository() {
});
$('.edit-label-button').click(function () {
$('#label-modal-id').val($(this).data('id'));
$('#label-modal-title').val($(this).data('title'));
$('#label-modal-color').val($(this).data('color'))
$('.edit-label .new-label-input').val($(this).data('title'));
$('.minicolors-swatch-color').css("background-color", $(this).data('color'));
$('.edit-label.modal').modal({
onApprove: function () {

17
public/js/semantic.min.js vendored
View file

File diff suppressed because one or more lines are too long

54
public/less/_base.less
View file

@ -9,27 +9,25 @@ img {
}
.full.height {
padding: 0;
margin: 0 0 -87px 0;
margin: 0 0 -@footer-margin*2 0;
min-height: 100%;
}
.following.bar {
z-index: 900;
left: 0;
width: 100%;
padding: 0.7em 0;
padding: 5px 0;
&.light {
background-color: white;
border-bottom: 1px solid #DDDDDD;
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.04);
}
.ui.secondary.menu {
height: 30px;
}
.column .menu {
margin-top: 0;
}
.brand {
float: left;
margin-top: 5px;
margin-right: 5px;
}
.head.link.item {
@ -41,7 +39,6 @@ img {
}
.user.avatar {
padding: 0;
margin-top: 1px;
}
.searchbox {
background-color: rgb(244, 244, 244)!important;
@ -51,7 +48,6 @@ img {
}
.octicon {
width: 16px;
opacity: 1!important;
text-align: center;
}
}
@ -68,28 +64,36 @@ img {
color: #d95c5c!important;
}
}
.message {
text-align: center;
}
}
footer {
margin-top: @footer-margin!important;
height: @footer-margin;
background-color: white;
border-top: 1px solid #d6d6d6;
clear: both;
width: 100%;
color: #888888;
.fa {
width: 16px;
text-align: center;
color: #428bca;
}
.ui.language.dropdown {
z-index: 10000;
}
.links >* {
border-left: 1px solid #d6d6d6;
padding-left: 8px;
margin-left: 5px;
&:first-child {
border-left: none;
.container {
padding-top: 10px;
.fa {
width: 16px;
text-align: center;
color: #428bca;
}
.ui.language.dropdown {
z-index: 10000;
}
.links >* {
border-left: 1px solid #d6d6d6;
padding-left: 8px;
margin-left: 5px;
&:first-child {
border-left: none;
}
}
}
}
@ -101,15 +105,11 @@ footer {
text-align: center;
}
.text-error {
color: #d95c5c !important;
}
.generate-img(16);
.generate-img(@n, @i: 1) when (@i =< @n) {
.img-@{i} {
width: (2px * @i);
height: (2px * @i);
width: (2px * @i)!important;
height: (2px * @i)!important;
}
.generate-img(@n, (@i + 1));
}

132
public/less/_repository.less
View file

@ -4,11 +4,11 @@
padding-top: 15px;
padding-bottom: @footer-margin * 3;
.head {
height: 75px;
padding-top: 20px;
height: 40px;
background-color: #FCFCFC;
.mega-octicon {
width: @mega-octicon-width;
font-size: 30px;
}
a,
.fork-flag {
@ -25,65 +25,13 @@
line-height: 10px;
white-space: nowrap;
}
.button {
margin-left: 10px;
i {
margin-right: 5px;
}
}
.num {
font-weight: bold;
}
.octicon {
height: 5px;
}
}
.navbar {
height: 60px;
padding-top: 20px;
.ui.secondary.menu .item {
margin-left: -10px;
margin-top: -7px;
&>.input {
.new-label-input,
.color-picker {
background-color: white;
border: 1px solid rgba(0,0,0,.15);
}
}
&.input {
margin-right: -7px;
}
.new-label-input {
width: 150px;
}
.color-picker {
height: 35px;
width: auto;
padding-left: 30px;
}
.minicolors-swatch.minicolors-sprite {
top: 10px;
left: 10px;
width: 15px;
height: 15px;
}
&.precolors {
padding-left: 0;
padding-right: 0;
margin-right: 10px;
width: 120px;
.color {
float: left;
width: 15px;
height: 15px;
}
}
}
}
.filter.menu {
.label.color {
margin-left: 17px;
margin-left: 15px;
padding: 0 8px;
}
.octicon {
@ -99,7 +47,7 @@
.clickable .name {
padding-left: 15px!important;
}
}
}
}
.page.buttons {
@ -107,8 +55,8 @@
}
.issue.list {
clear: both;
list-style: none;
padding-top: 15px;
>.item {
padding-top: 15px;
padding-bottom: 10px;
@ -167,8 +115,8 @@
}
.label.list {
clear: both;
list-style: none;
padding-top: 15px;
.item {
padding-top: 10px;
padding-bottom: 10px;
@ -189,8 +137,8 @@
}
.milestone.list {
clear: both;
list-style: none;
padding-top: 15px;
> .item {
padding-top: 10px;
padding-bottom: 10px;
@ -243,11 +191,8 @@
textarea {
height: 200px;
}
}
&.settings {
.content {
padding-left: 20px!important;
#deadline {
width: 150px;
}
}
@ -316,30 +261,47 @@
}
}
.edit-label.modal {
.color-picker {
margin-top: -8px!important;
height: 35px;
width: auto!important;
padding-left: 30px!important;
.ui.vertical.menu {
.header.item {
font-size: 1.1em;
background: #f0f0f0;
}
.minicolors-swatch.minicolors-sprite {
top: 1px;
left: 10px;
width: 15px;
height: 15px;
}
.precolors {
margin-bottom: -11px!important;
padding-left: 0!important;
padding-right: 0!important;
margin-right: 10px!important;
width: 120px!important;
.color {
float: left;
margin: 0!important;
}
.edit-label.modal,
.new-label.segment {
.form {
.column {
padding-right: 0;
}
.buttons {
margin-left: auto;
padding-top: 15px;
}
.color.picker.column {
width: auto;
.color-picker {
height: 35px;
width: auto;
padding-left: 30px;
}
}
.minicolors-swatch.minicolors-sprite {
top: 10px;
left: 10px;
width: 15px;
height: 15px;
}
.precolors {
padding-left: 0;
padding-right: 0;
margin: 3px 10px auto 10px;
width: 120px;
.color {
float: left;
width: 15px;
height: 15px;
}
}
}
}