From 02c83f122a28edc18e7e2184fa079c28e46375cb Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 10 Oct 2012 12:41:15 +0300 Subject: [PATCH] Design improved --- app/assets/stylesheets/sections/editor.scss | 14 ++++++------ app/views/tree/edit.html.haml | 25 ++++++++++++--------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/sections/editor.scss b/app/assets/stylesheets/sections/editor.scss index f8e0fcac..84f221bd 100644 --- a/app/assets/stylesheets/sections/editor.scss +++ b/app/assets/stylesheets/sections/editor.scss @@ -1,14 +1,14 @@ .file-editor { - #editor{ height: 500px; - width: 90%; + width: 100%; position: relative; - margin-bottom: 20px; } - textarea{ - display: block; - width: 40%; - margin: 10px 0 10px 0; + .editor-commit-comment { + padding-top:20px; + textarea { + width: 50%; + margin-left: 20px; + } } } diff --git a/app/views/tree/edit.html.haml b/app/views/tree/edit.html.haml index f9a1e6dc..c65d8fd3 100644 --- a/app/views/tree/edit.html.haml +++ b/app/views/tree/edit.html.haml @@ -1,17 +1,20 @@ .file-editor - .file_name - File: - %span.file_name - = @tree.path.force_encoding('utf-8') - %br - = form_tag(project_tree_path(@project, @id), :method => :put) do - #editor - = @tree.data + = form_tag(project_tree_path(@project, @id), :method => :put) do + .file_holder + .file_title + %i.icon-file + = @tree.path.force_encoding('utf-8') + .file_content.code + #editor= @tree.data + + .editor-commit-comment + = label_tag 'text-commit' do + %p.slead Commit message + = text_area_tag 'text_commit' + .form-actions = hidden_field_tag 'last_commit', @last_commit = hidden_field_tag 'content' - - = text_area_tag 'text_commit' - = submit_tag "Save" + = submit_tag "Save", class: 'btn save-btn' :javascript var editor = ace.edit("editor");