deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Unify forms for discussions and main target.

Browse source 
Allows previews and uploads in all forms.
Also fixes #1730
This commit is contained in:
Riyad Preukschas 2012-12-02 20:47:09 +01:00
parent fbd345ea20
commit 6fc10fa256
7 changed files with 175 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

100
app/assets/stylesheets/sections/notes.scss
View file

@ -239,46 +239,51 @@ p.notify_controls span{
.reply-btn {
@extend .save-btn;
}
.new_discussion_note {
// hide it by default
display: none;
margin: 8px 5px 8px 0;
// TODO: start cleanup
.note_actions {
margin:0;
padding-top: 10px;
.buttons {
float:left;
width:300px;
}
.options {
.labels {
float:left;
padding-left:10px;
label {
padding: 6px 0;
margin: 0;
width:120px;
}
}
}
.diff_file,
.discussion {
.new_note {
margin: 8px 5px 8px 0;
}
// TODO: end cleanup
}
.new_note {
textarea {
height:80px;
width:99%;
font-size:14px;
display: none;
.buttons {
float: left;
margin-top: 8px;
}
.note_options {
h6 {
line-height: 32px;
padding-right: 15px;
}
}
.note_text_and_preview {
// makes the "absolute" position for links relative to this
position: relative;
// preview/edit buttons
> a {
font-size: 24px;
padding: 4px;
position: absolute;
right: 0;
}
.note_preview {
background: #f5f5f5;
border: 1px solid #ddd;
@include border-radius(4px);
min-height: 80px;
padding: 4px 6px;
}
.note_text {
font-size: 14px;
height: 80px;
width: 98.6%;
}
}
// TODO: start cleanup
.attach_holder {
display:none;
}
.attachments {
position: relative;
width: 350px;
@ -316,32 +321,5 @@ p.notify_controls span{
padding:0;
margin: 0;
}
.note_advanced_opts {
h6 {
line-height: 32px;
padding-right: 15px;
}
}
.note_preview {
margin: 2px;
border: 1px solid #ddd;
padding: 10px;
min-height: 60px;
background:#f5f5f5;
}
.note_text {
border: 1px solid #aaa;
box-shadow: none;
}
// TODO: end cleanup
}
// hide the new discussion note form template
#note-forms {
.note-form-holder {
margin-top: 5px;
}
.new_discussion_note {
display: none;
}
}