Download as
Browse Code »

Commit 02c83f122a28edc18e7e2184fa079c28e46375cb

Authored by Dmitriy Zaporozhets
Committed by Valeriy Sizov
1 parent 57e2b5ed
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Design improved

Showing 2 changed files with 21 additions and 18 deletions   Show diff stats
app/assets/stylesheets/sections/editor.scss
  Diff comments   View file @02c83f1
1 .file-editor { 1 .file-editor {
2 -  
3 #editor{ 2 #editor{
4 height: 500px; 3 height: 500px;
5 - width: 90%; 4 + width: 100%;
6 position: relative; 5 position: relative;
7 - margin-bottom: 20px;  
8 } 6 }
9 - textarea{  
10 - display: block;  
11 - width: 40%;  
12 - margin: 10px 0 10px 0; 7 + .editor-commit-comment {
  8 + padding-top:20px;
  9 + textarea {
  10 + width: 50%;
  11 + margin-left: 20px;
  12 + }
13 } 13 }
14 } 14 }
app/views/tree/edit.html.haml
  Diff comments   View file @02c83f1
1 .file-editor 1 .file-editor
2 - .file_name  
3 - File:  
4 - %span.file_name  
5 - = @tree.path.force_encoding('utf-8')  
6 - %br  
7 - = form_tag(project_tree_path(@project, @id), :method => :put) do  
8 - #editor  
9 - = @tree.data 2 + = form_tag(project_tree_path(@project, @id), :method => :put) do
  3 + .file_holder
  4 + .file_title
  5 + %i.icon-file
  6 + = @tree.path.force_encoding('utf-8')
  7 + .file_content.code
  8 + #editor= @tree.data
  9 +
  10 + .editor-commit-comment
  11 + = label_tag 'text-commit' do
  12 + %p.slead Commit message
  13 + = text_area_tag 'text_commit'
  14 + .form-actions
10 = hidden_field_tag 'last_commit', @last_commit 15 = hidden_field_tag 'last_commit', @last_commit
11 = hidden_field_tag 'content' 16 = hidden_field_tag 'content'
12 -  
13 - = text_area_tag 'text_commit'  
14 - = submit_tag "Save" 17 + = submit_tag "Save", class: 'btn save-btn'
15 18
16 :javascript 19 :javascript
17 var editor = ace.edit("editor"); 20 var editor = ace.edit("editor");