Commit 130f60d5 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

a bit of restyling. Replace some images with icons. Simplify note form

parent 315fd7d7
...@@ -20,12 +20,12 @@ var NoteList = { ...@@ -20,12 +20,12 @@ var NoteList = {
if(NoteList.reversed) { if(NoteList.reversed) {
var form = $(".js-main-target-form"); var form = $(".js-main-target-form");
form.find(".buttons, .note_options").hide(); form.find(".note-form-actions").hide();
var textarea = form.find(".js-note-text"); var textarea = form.find(".js-note-text");
textarea.css("height", "40px"); textarea.css("height", "40px");
textarea.on("focus", function(){ textarea.on("focus", function(){
textarea.css("height", "80px"); textarea.css("height", "80px");
form.find(".buttons, .note_options").show(); form.find(".note-form-actions").show();
}); });
} }
......
...@@ -338,10 +338,6 @@ li.note { ...@@ -338,10 +338,6 @@ li.note {
li { li {
border-bottom:none !important; border-bottom:none !important;
} }
.attachment {
padding-left: 20px;
background:url("icon-attachment.png") no-repeat left center;
}
} }
} }
......
...@@ -6,8 +6,7 @@ ul.main_menu { ...@@ -6,8 +6,7 @@ ul.main_menu {
margin: auto; margin: auto;
margin: 30px 0; margin: 30px 0;
margin-top: 10px; margin-top: 10px;
border-bottom: 1px solid #DDD; height: 38px;
height: 37px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
.count { .count {
...@@ -33,6 +32,7 @@ ul.main_menu { ...@@ -33,6 +32,7 @@ ul.main_menu {
margin: 0; margin: 0;
display: table-cell; display: table-cell;
width: 1%; width: 1%;
border-bottom: 2px solid #EEE;
&.active { &.active {
border-bottom: 2px solid #474D57; border-bottom: 2px solid #474D57;
a { a {
...@@ -42,10 +42,8 @@ ul.main_menu { ...@@ -42,10 +42,8 @@ ul.main_menu {
&.home { &.home {
a { a {
background: url(home_icon.PNG) no-repeat center center; i {
text-indent:-9999px; font-size: 20px;
min-width: 20px;
img {
position: relative; position: relative;
top: 4px; top: 4px;
} }
...@@ -56,7 +54,7 @@ ul.main_menu { ...@@ -56,7 +54,7 @@ ul.main_menu {
display: block; display: block;
text-align: center; text-align: center;
font-weight: normal; font-weight: normal;
height: 35px; height: 36px;
line-height: 36px; line-height: 36px;
color: #777; color: #777;
text-shadow: 0 1px 1px white; text-shadow: 0 1px 1px white;
......
...@@ -81,14 +81,6 @@ ul.notes { ...@@ -81,14 +81,6 @@ ul.notes {
.attachment { .attachment {
font-size: 14px; font-size: 14px;
margin-top: -20px; margin-top: -20px;
.icon-attachment {
@extend .icon-paper-clip;
font-size: 24px;
position: relative;
text-align: right;
top: 6px;
}
} }
.note-body { .note-body {
margin-left: 45px; margin-left: 45px;
...@@ -229,11 +221,6 @@ ul.notes { ...@@ -229,11 +221,6 @@ ul.notes {
.discussion { .discussion {
.new_note { .new_note {
margin: 8px 5px 8px 0; margin: 8px 5px 8px 0;
.note_options {
// because of the smaller width and the extra "cancel" button
margin-top: 8px;
}
} }
} }
.new_note { .new_note {
...@@ -246,37 +233,6 @@ ul.notes { ...@@ -246,37 +233,6 @@ ul.notes {
.clearfix { .clearfix {
margin-bottom: 0; margin-bottom: 0;
} }
.note_options {
h6 {
@extend .left;
line-height: 20px;
padding-right: 16px;
padding-bottom: 16px;
}
label {
padding: 0;
}
.attachment {
@extend .pull-right;
position: relative;
width: 350px;
height: 50px;
margin:0 0 5px !important;
// hide the actual file field
input {
display: none;
}
.choose-btn {
float: right;
}
}
.notify_options {
@extend .pull-right;
}
}
.note_text_and_preview { .note_text_and_preview {
// makes the "absolute" position for links relative to this // makes the "absolute" position for links relative to this
position: relative; position: relative;
...@@ -315,3 +271,17 @@ ul.notes { ...@@ -315,3 +271,17 @@ ul.notes {
@extend .thumbnail; @extend .thumbnail;
margin-left: 45px; margin-left: 45px;
} }
.note-form-actions {
background: #F9F9F9;
height: 45px;
padding: 0 5px;
.note-form-option {
margin-top: 8px;
margin-left: 15px;
@extend .pull-left;
@extend .span4;
}
}
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
.container .container
%ul.main_menu %ul.main_menu
= nav_link(controller: :dashboard, html_options: {class: 'home'}) do = nav_link(controller: :dashboard, html_options: {class: 'home'}) do
= link_to "Stats", admin_root_path = link_to admin_root_path, title: "Stats" do
%i.icon-home
= nav_link(controller: :projects) do = nav_link(controller: :projects) do
= link_to "Projects", admin_projects_path = link_to "Projects", admin_projects_path
= nav_link(controller: :teams) do = nav_link(controller: :teams) do
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
.container .container
%ul.main_menu %ul.main_menu
= nav_link(path: 'dashboard#show', html_options: {class: 'home'}) do = nav_link(path: 'dashboard#show', html_options: {class: 'home'}) do
= link_to "Home", root_path, title: "Home" = link_to root_path, title: "Home" do
%i.icon-home
= nav_link(path: 'dashboard#projects') do = nav_link(path: 'dashboard#projects') do
= link_to projects_dashboard_path do = link_to projects_dashboard_path do
Projects Projects
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
.container .container
%ul.main_menu %ul.main_menu
= nav_link(path: 'groups#show', html_options: {class: 'home'}) do = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
= link_to "Home", group_path(@group), title: "Home" = link_to group_path(@group), title: "Home" do
%i.icon-home
= nav_link(path: 'groups#issues') do = nav_link(path: 'groups#issues') do
= link_to issues_group_path(@group) do = link_to issues_group_path(@group) do
Issues Issues
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
.container .container
%ul.main_menu %ul.main_menu
= nav_link(path: 'profiles#show', html_options: {class: 'home'}) do = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
= link_to "Profile", profile_path = link_to profile_path, title: "Profile" do
%i.icon-home
= nav_link(path: 'profiles#account') do = nav_link(path: 'profiles#account') do
= link_to "Account", account_profile_path = link_to "Account", account_profile_path
= nav_link(controller: :keys) do = nav_link(controller: :keys) do
......
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
.container .container
%ul.main_menu %ul.main_menu
= nav_link(html_options: {class: "home #{project_tab_class}"}) do = nav_link(html_options: {class: "home #{project_tab_class}"}) do
= link_to @project.path, project_path(@project), title: "Project" = link_to project_path(@project), title: "Project" do
%i.icon-home
- if @project.repo_exists? - if @project.repo_exists?
- if can? current_user, :download_code, @project - if can? current_user, :download_code, @project
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
.container .container
%ul.main_menu %ul.main_menu
= nav_link(path: 'teams#show', html_options: {class: 'home'}) do = nav_link(path: 'teams#show', html_options: {class: 'home'}) do
= link_to "Home", team_path(@team), title: "Home" = link_to team_path(@team), title: "Home" do
%i.icon-home
= nav_link(path: 'teams#issues') do = nav_link(path: 'teams#issues') do
= link_to issues_team_path(@team) do = link_to issues_team_path(@team) do
......
...@@ -15,30 +15,30 @@ ...@@ -15,30 +15,30 @@
= f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on' = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
.note_preview.js-note-preview.turn-off .note_preview.js-note-preview.turn-off
.buttons
= f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
%a.btn.grouped.js-close-discussion-note-form Cancel
.hint .hint
.pull-right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. .pull-right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
.clearfix .clearfix
.note_options .note-form-actions
.attachment .buttons
%h6 Attachment: = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
.file_name.js-attachment-filename File name... %a.btn.grouped.js-close-discussion-note-form Cancel
%a.choose-btn.btn.btn-small.js-choose-note-attachment-button Choose File ...
.hint Any file up to 10 MB
= f.file_field :attachment, class: "js-note-attachment-input"
.notify_options .note-form-option
%h6 Notify via email:
= label_tag :notify do = label_tag :notify do
= check_box_tag :notify, 1, !@note.for_commit? = check_box_tag :notify, 1, !@note.for_commit?
Project team %span.light Notify team via email
.js-notify-commit-author .js-notify-commit-author
= label_tag :notify_author do = label_tag :notify_author do
= check_box_tag :notify_author, 1 , @note.for_commit? = check_box_tag :notify_author, 1 , @note.for_commit?
Commit author %span.light Notify commit author
.note-form-option
%a.choose-btn.btn.btn-small.js-choose-note-attachment-button
%i.icon-paper-clip
%span Choose File ...
 
%span.file_name.js-attachment-filename File name...
= f.file_field :attachment, class: "js-note-attachment-input hide"
.clearfix .clearfix
...@@ -32,6 +32,6 @@ ...@@ -32,6 +32,6 @@
= image_tag note.attachment.url, class: 'note-image-attach' = image_tag note.attachment.url, class: 'note-image-attach'
.attachment.pull-right .attachment.pull-right
= link_to note.attachment.url, target: "_blank" do = link_to note.attachment.url, target: "_blank" do
%i.icon-attachment %i.icon-paper-clip
= note.attachment_identifier = note.attachment_identifier
.clear .clear
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment