diff options
-rw-r--r-- | app/assets/stylesheets/projects.css.scss | 3 | ||||
-rw-r--r-- | app/views/issues/_form.html.haml | 5 | ||||
-rw-r--r-- | app/views/notes/_form.html.haml | 9 | ||||
-rw-r--r-- | public/.directory | 4 | ||||
-rw-r--r-- | vendor/assets/stylesheets/jquery-ui/jquery-ui.css | 6 |
5 files changed, 17 insertions, 10 deletions
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index 7dfd8b297bf..e5d39474950 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -276,6 +276,9 @@ input.ssh_project_url { /** FORM INPUTS **/ .user_new, +.new_key, +.new_issue, +.new_note, .edit_user, .new_project, .new_snippet, diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml index 80f19d627f4..025dc9bc132 100644 --- a/app/views/issues/_form.html.haml +++ b/app/views/issues/_form.html.haml @@ -8,10 +8,7 @@ .span-8 = f.label :title = f.text_area :title, :style => "width:450px; height:100px", :maxlength => 255 - -#.span-8 - -#= f.label :content - -#= f.text_area :content, :style => "width:450px; height:130px" - .span-8.append-bottom + .span-8 = f.label :assignee_id = f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }) .span-1 diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml index 86f0b779adb..a0def20b32d 100644 --- a/app/views/notes/_form.html.haml +++ b/app/views/notes/_form.html.haml @@ -10,13 +10,16 @@ %div = f.label :note - %cite + %cite.cgray markdown supported + %br %br = f.text_area :note, :size => 255 - + %div.attach_holder + %br = f.label :attachment - %cite (less than 10 MB) + %cite.cgray (less than 10 MB) + %br %br = f.file_field :attachment diff --git a/public/.directory b/public/.directory new file mode 100644 index 00000000000..8bb0b81629f --- /dev/null +++ b/public/.directory @@ -0,0 +1,4 @@ +[Dolphin] +ShowPreview=true +Timestamp=2011,11,6,21,7,47 +Version=2 diff --git a/vendor/assets/stylesheets/jquery-ui/jquery-ui.css b/vendor/assets/stylesheets/jquery-ui/jquery-ui.css index a6b4c363716..a94efee496d 100644 --- a/vendor/assets/stylesheets/jquery-ui/jquery-ui.css +++ b/vendor/assets/stylesheets/jquery-ui/jquery-ui.css @@ -59,7 +59,7 @@ .ui-widget { font-family: "Helvetica Neue",Arial,Helvetica,sans-serif; font-size: 1.1em; } .ui-widget .ui-widget { font-size: 1em; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } -.ui-widget-content { border: 1px solid #dddddd; background: #ffffff url(ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content { border: 1px solid #474D57; background: #ffffff url(ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } .ui-widget-content a { color: #222222; } .ui-widget-header { color: #222222; font-weight: bold; } .ui-widget-header a { color: #222222; } @@ -445,8 +445,8 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad * http://docs.jquery.com/UI/Dialog#theming */ .ui-dialog { position: absolute; padding: 0; width: 300px; overflow: hidden; } -.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; background: #F7F7F7; color:#555; } -.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0;} +.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; background: #474D57; color:#eee; } +.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; text-shadow: none;} .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; background:#eaeaea} .ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } |