Skip to content
Snippets Groups Projects
Commit 627efddf authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

migrated to bootstrap 2

parent 2bad798e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 529 additions and 396 deletions
Gemfile
+ 1
− 1
View file @ 627efddf
@@ -31,7 +31,7 @@ gem "httparty"
gem "charlock_holmes"
gem "foreman"
gem "omniauth-ldap"
gem 'bootstrap-sass', "1.4.4"
gem 'bootstrap-sass', "2.0.2"
gem "colored"
gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
gem 'modularity'
Gemfile.lock
+ 2
− 3
View file @ 627efddf
@@ -71,8 +71,7 @@ GEM
awesome_print (1.0.2)
bcrypt-ruby (3.0.1)
blankslate (2.1.2.4)
bootstrap-sass (1.4.4)
sass-rails (~> 3.1)
bootstrap-sass (2.0.2)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
@@ -306,7 +305,7 @@ DEPENDENCIES
autotest
autotest-rails
awesome_print
bootstrap-sass (= 1.4.4)
bootstrap-sass (= 2.0.2)
capybara
carrierwave
charlock_holmes
app/assets/javascripts/merge_requests.js
+ 4
− 4
View file @ 627efddf
@@ -4,18 +4,18 @@ var MergeRequest = {
 
init:
function() {
$(".tabs a").live("click", function() {
$(".tabs a").parent().removeClass("active");
$(".nav-tabs a").live("click", function() {
$(".nav-tabs a").parent().removeClass("active");
$(this).parent().addClass("active");
});
 
$(".tabs a.merge-notes-tab").live("click", function(e) {
$(".nav-tabs a.merge-notes-tab").live("click", function(e) {
$(".merge-request-diffs").hide();
$(".merge_request_notes").show();
e.preventDefault();
});
 
$(".tabs a.merge-diffs-tab").live("click", function(e) {
$(".nav-tabs a.merge-diffs-tab").live("click", function(e) {
if(!MergeRequest.diffs_loaded) {
MergeRequest.loadDiff();
}
app/assets/stylesheets/common.scss
+ 18
− 337
View file @ 627efddf
a {
outline: none;
color: $link_color;
&:hover {
text-decoration:none;
color: $blue_link;
}
&.btn {
color: $style_color;
}
&.dark {
color: $style_color;
}
&.lined {
text-decoration:underlined;
}
&.gray {
color:gray;
}
&.supp_diff_link {
text-align:center;
padding:20px 0;
background:#f1f1f1;
width:100%;
float:left;
}
&.neib {
margin-right:15px;
}
}
.btn {
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f1f1f1), color-stop(25%, #f1f1f1), to(#e6e6e6));
background-image: -webkit-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
background-image: -moz-linear-gradient(top, #f1f1f1, #f1f1f1 25%, #e6e6e6);
background-image: -ms-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
background-image: -o-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
background-image: linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
&:hover {
}
&.primary {
background:$link_color;
&:hover {
background:$blue_link;
}
}
}
a:focus {
outline: none;
}
.vlink {
color: $link_color !important;
}
.pills a:hover {
background-color:#ccc;
}
.pills .active a {
background-color: #aaa;
}
.label {
background-color: #474D57;
}
.pretty_label {
@include round-borders-all(4px);
padding:2px 4px;
background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8);
color: #777;
border: 1px solid #DEDFE1;
&.branch {
border:none;
font-size:13px;
background: #474D57;
color:#fff;
font-family: monospace;
}
}
.event_label {
background: #FCEEC1;
padding:0 2px;
font-family: monospace;
}
.tabs > li > a, .pills > li > a {
color:$style_color;
}
.diff_file_header a,
.file_stats a {
color:$style_color;
}
 
/** COLORS **/
.cgray { color:gray; }
.cred { color:#D12F19; }
.cgreen { color:#44aa22; }
.cblack { color:#111; }
.cwhite { color:#fff !important }
/** COMMON STYLES **/
.left {
float:left;
}
.right {
float:right !important;
}
.width-50p{
width:50%;
}
.width-49p{
width:49%;
}
.width-30p{
width:30%;
}
.width-65p{
width:65%;
}
.width-100p{
width:100%;
}
.append-bottom-10 {
margin-bottom:10px;
}
.append-bottom-20 {
margin-bottom:20px;
}
.prepend-top-10 {
margin-top:10px;
}
.prepend-top-20 {
margin-top:20px;
}
.padded {
padding:20px;
}
.ipadded {
padding:20px !important;
}
.lborder {
border-left:1px solid #eee;
}
.no-borders {
border:none;
}
table.no-borders {
border:none;
tr, td { border:none }
}
.no-padding {
padding:0 !important;
}
.underlined {
border-bottom: 1px solid $border_color;
}
 
/** LAYOUT **/
 
.container {
width:$min_app_width;
padding-top:0;
z-index:5;
min-width:$min_app_width;
padding:0 20px
}
 
.container .content {
margin:0 $app_padding;
margin:0 0;
}
 
.container .sidebar {
@@ -212,7 +42,7 @@ header {
cursor: pointer;
img {
border-radius: 4px;
right: 20px;
right: 0px;
position: absolute;
width: 33px;
height: 33px;
@@ -271,7 +101,7 @@ header {
border-radius: 5px;
width: 100px;
position: absolute;
right: 20px;
right: 10px;
top: 46px;
margin-top: 0;
float: right;
@@ -319,7 +149,7 @@ header {
nav.main_menu {
border-radius: 4px;
margin: auto;
margin:30px $app_padding;
margin:30px 0;
background:#eee;
border:1px solid #bbb;
height:38px;
@@ -338,6 +168,14 @@ nav.main_menu {
color:$style_color;
}
a {
// Landscape phone to portrait tablet
@media (max-width: 1080px) { min-width:35px; }
// Portrait tablet to landscape and desktop
@media (min-width: 1080px) and (max-width: 1200px) { min-width:40px; }
// Large desktop
@media (min-width: 1200px) { min-width:55px; }
text-align:center;
font-weight:bold;
&:first-child{
-webkit-border-top-left-radius: 4px;
@@ -357,7 +195,7 @@ nav.main_menu {
&.home {
background: url(home_icon.PNG) no-repeat center center;
text-indent:-9999px;
min-width:40px;
//min-width:40px;
img {
position:relative;
top:4px;
@@ -377,23 +215,6 @@ nav.main_menu {
*
*/
 
img.avatar {
float:left;
margin-right:15px;
width:40px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
img.lil_av {
padding-left: 5px;
position: relative;
top: 3px;
}
.profile_avatar_holder {
float:left;
width:60px;
@@ -406,67 +227,11 @@ img.lil_av {
}
}
 
.wll {
background-color: #FFF;
padding: 10px 5px;
min-height: 20px;
border-bottom: 1px solid #eee;
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
cursor:pointer;
&.smoke {
background-color:#f5f5f5;
}
&:hover {
background:$hover;
}
&:last-child { border:none }
p { padding-top:5px; margin:0; color:$style_color;}
.author { color: #999; }
p {
color:#222;
margin-bottom: 0;
img {
position:relative;
top:3px;
}
}
}
 
.visible_link,
.author_link {
color: $link_color;
}
.entry {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
color: #404040;
filter:none;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
background:#F1F1F1;
border: 1px solid #ccc;
p {
color:$style_color;
margin-bottom: 0;
img {
position:relative;
top:3px;
}
}
}
 
.widget {
@include shade;
@@ -492,86 +257,6 @@ img.lil_av {
}
}
 
.ui-box {
margin-bottom: 40px;
@include round-borders-all(4px);
@include shade;
border-color:#ddd;
ul {
margin:0;
}
h5, .title {
padding: 0 10px;
background:#f5f5f5;
border-bottom: 1px solid #eee;
@include round-borders-top(4px);
border-top:none;
form {
padding:9px 0;
margin:0px;
}
.pills {
li {
padding:3px 0;
&.active a { background-color:$style_color; }
a {
border-radius:7px;
}
}
}
}
.bottom {
background:#f5f5f5;
border-top: 1px solid #eee;
@include round-borders-bottom(4px);
border-bottom:none;
}
&.padded {
h5, .title {
margin: -20px;
margin-bottom: 0;
padding: 5px 20px;
}
.middle_title {
background:#f5f5f5;
margin:20px -20px;
padding: 0 20px;
border-top:1px solid #eee;
border-bottom:1px solid #eee;
font-size:14px;
color:#777;
}
}
.row_title {
font-weight:bold;
color:#444;
&:hover {
text-decoration:underline;
}
}
li, .wll {
padding:10px;
&:first-child {
@include round-borders-top(4px);
border-top:none;
}
&:last-child {
@include round-borders-bottom(4px);
border:none;
}
}
}
.help li { color:#111 }
 
.back_link {
@@ -591,11 +276,6 @@ img.lil_av {
}
}
 
.borders {
border: 1px solid #ccc;
@include shade;
}
.download_repo_link {
background: url("images.png") no-repeat 0 -48px;
padding-left:20px;
@@ -623,6 +303,7 @@ table a code {
 
.btn.padded {
margin-right:3px;
padding:4px 10px 4px;
}
 
.loading {
@@ -726,7 +407,7 @@ a.project-update.titled {
 
 
input.git_clone_url {
width:475px;
width:325px;
}
 
.merge-request-form-holder {
@@ -874,7 +555,7 @@ li.commit {
}
 
code {
padding:4px;
padding:0px;
}
}
p.time {
app/assets/stylesheets/gitlab_bootstrap.scss 0 → 100644
+ 440
− 0
View file @ 627efddf
a {
outline: none;
color: $link_color;
&:hover {
text-decoration:none;
color: $blue_link;
}
&.btn {
color: $style_color;
}
&.dark {
color: $style_color;
}
&.lined {
text-decoration:underlined;
}
&.gray {
color:gray;
}
&.supp_diff_link {
text-align:center;
padding:20px 0;
background:#f1f1f1;
width:100%;
float:left;
}
&.neib {
margin-right:15px;
}
}
.alert-message {
@extend .alert;
&.success {
@extend .alert-success;
}
&.error {
@extend .alert-error;
}
}
.alert {
&.alert-well {
background:#ddd;
border:1px solid #ccc;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #ddd), to(#dfdfdf));
background-image: -webkit-linear-gradient(#ddd 6.6%, #dfdfdf);
background-image: -moz-linear-gradient(#ddd 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#ddd 6.6%, #dfdfdf);
color:#111;
}
}
h3, h4, h5, h6 {
line-height: 36px;
}
code {
background:#FCEEC1;
color:$style_color;
}
table {
width:100%;
th {
padding-top: 9px;
font-weight: bold;
vertical-align: middle;
}
th, td {
padding: 10px 10px 9px;
line-height: 18px;
text-align: left;
}
&.bordered-table {
border: 1px solid #DDD;
border-collapse: separate;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
&.zebra-striped {
@extend .table-striped;
}
}
.btn {
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f1f1f1), color-stop(25%, #f1f1f1), to(#e6e6e6));
background-image: -webkit-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
background-image: -moz-linear-gradient(top, #f1f1f1, #f1f1f1 25%, #e6e6e6);
background-image: -ms-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
background-image: -o-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
background-image: linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
&:hover {
}
&.btn-primary {
background:$link_color;
&:hover {
background:$blue_link;
}
}
&.danger,
&.btn-danger {
background:#DD4B39;
color:white;
border-color:#990000;
text-shadow:0 0 1px #111;
&:hover {
color:white;
background:#DD0000;
}
}
&.small {
@extend .btn-small;
}
}
a:focus {
outline: none;
}
.nav-pills a:hover {
background-color:#ccc;
}
.nav-pills .active a {
background-color: #aaa;
}
.label {
background-color: #474D57;
}
.nav-tabs > li > a, .nav-pills > li > a {
color:$style_color;
}
/** COLORS **/
.cgray { color:gray; }
.cred { color:#D12F19; }
.cgreen { color:#44aa22; }
.cblack { color:#111; }
.cwhite { color:#fff !important }
/** COMMON STYLES **/
.left {
float:left;
}
.right {
float:right !important;
}
.width-50p{
width:50%;
}
.width-49p{
width:49%;
}
.width-30p{
width:30%;
}
.width-65p{
width:65%;
}
.width-100p{
width:100%;
}
.append-bottom-10 {
margin-bottom:10px;
}
.append-bottom-20 {
margin-bottom:20px;
}
.prepend-top-10 {
margin-top:10px;
}
.prepend-top-20 {
margin-top:20px;
}
.padded {
padding:20px;
}
.ipadded {
padding:20px !important;
}
.lborder {
border-left:1px solid #eee;
}
.borders {
border: 1px solid #ccc;
@include shade;
}
.no-borders {
border:none;
}
table.no-borders {
border:none;
tr, td { border:none }
}
.no-padding {
padding:0 !important;
}
.underlined {
border-bottom: 1px solid $border_color;
}
.vlink {
color: $link_color !important;
}
.pretty_label {
@include round-borders-all(4px);
padding:2px 4px;
background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8);
color: #777;
border: 1px solid #DEDFE1;
&.branch {
border:none;
font-size:13px;
background: #474D57;
color:#fff;
font-family: monospace;
}
}
.event_label {
background: #FCEEC1;
padding:0 2px;
font-family: monospace;
}
img.avatar {
float:left;
margin-right:15px;
width:40px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
img.lil_av {
padding-left: 4px;
padding-right:3px;
}
form {
@extend .form-horizontal;
.actions {
@extend .form-actions;
}
.clearfix {
@extend .control-group;
}
.input {
@extend .controls;
}
label {
@extend .control-label;
}
.xlarge {
@extend .input-xlarge;
}
.xxlarge {
@extend .input-xxlarge;
}
}
/**
* List li block element #1
*
*/
.wll {
background-color: #FFF;
padding: 10px 5px;
min-height: 20px;
border-bottom: 1px solid #eee;
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
cursor:pointer;
&.smoke {
background-color:#f5f5f5;
}
&:hover {
background:$hover;
}
&:last-child { border:none }
p { padding-top:5px; margin:0; color:$style_color;}
.author { color: #999; }
p {
color:#222;
margin-bottom: 0;
img {
position:relative;
top:3px;
}
}
}
/**
* Block element #2
*
*/
.entry {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
color: #404040;
filter:none;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
background:#F1F1F1;
border: 1px solid #ccc;
p {
color:$style_color;
margin-bottom: 0;
img {
position:relative;
top:3px;
}
}
}
/**
* Big UI Block for show page content
*
*/
.ui-box {
margin-bottom: 40px;
@include round-borders-all(4px);
@include shade;
border-color:#ddd;
ul {
margin:0;
}
h5, .title {
padding: 0 10px;
background:#f5f5f5;
border-bottom: 1px solid #eee;
@include round-borders-top(4px);
border-top:none;
form {
padding:9px 0;
margin:0px;
}
.pills {
li {
padding:3px 0;
&.active a { background-color:$style_color; }
a {
border-radius:7px;
}
}
}
}
.bottom {
background:#f5f5f5;
border-top: 1px solid #eee;
@include round-borders-bottom(4px);
border-bottom:none;
}
&.padded {
h5, .title {
margin: -20px;
margin-bottom: 0;
padding: 5px 20px;
}
.middle_title {
background:#f5f5f5;
margin:20px -20px;
padding: 0 20px;
border-top:1px solid #eee;
border-bottom:1px solid #eee;
font-size:14px;
color:#777;
}
}
.row_title {
font-weight:bold;
color:#444;
&:hover {
text-decoration:underline;
}
}
li, .wll {
padding:10px;
&:first-child {
@include round-borders-top(4px);
border-top:none;
}
&:last-child {
@include round-borders-bottom(4px);
border:none;
}
}
}
app/assets/stylesheets/main.scss
+ 9
− 0
View file @ 627efddf
@import "bootstrap";
@import "bootstrap-responsive";
 
/** GITLAB colors **/
$text_color:#222;
@@ -75,6 +76,14 @@ $hover: #FDF5D9;
*/
@import "ui_mars.scss";
 
/**
* Gitlab bootstrap.
* Overrides some styles of twitter bootstrap.
* Also give some common classes for gitlab app
*/
@import "gitlab_bootstrap.scss";
/**
* Most of application styles placed here.
* This file represent common UI that should not be changed between themes
app/assets/stylesheets/tree.scss
+ 9
− 1
View file @ 627efddf
@@ -124,14 +124,17 @@
 
.tree-item {
.tree-item-file-name {
vertical-align:middle;
font-weight:bold;
a {
color:$style_color;
&:hover {
color:$blue_link;
}
}
 
img {
position: relative;
top: 2px;
}
}
}
@@ -139,6 +142,10 @@
ul.breadcrumb {
background:white;
border:none;
li {
display: inline;
text-shadow: 0 1px 0 white
}
 
a {
color:#474D57;
@@ -149,6 +156,7 @@
 
#tree-slider {
@include shade;
width:100%;
 
border-color:#ccc;
 
app/assets/stylesheets/ui_basic.scss
+ 4
− 8
View file @ 627efddf
@@ -63,15 +63,11 @@
}
}
}
.wrapper {
margin:auto;
min-width:$min_app_width;
max-width:$max_app_width;
position:relative;
padding:15px 0;
.container {
.top_panel_content {
margin:0 $app_padding;
margin:auto;
position:relative;
padding:15px 0;
}
}
 
app/helpers/application_helper.rb
+ 1
− 1
View file @ 627efddf
@@ -123,7 +123,7 @@ module ApplicationHelper
end
 
def app_theme
if current_user && current_user.theme_id == 1
if true#current_user && current_user.theme_id == 1
"ui_basic"
else
"ui_mars"
app/views/admin/projects/show.html.haml
+ 1
− 1
View file @ 627efddf
@@ -31,7 +31,7 @@
= @admin_project.description
 
 
.span-14
.span12
 
%h3
Team
app/views/commits/_head.html.haml
+ 1
− 1
View file @ 627efddf
%ul.tabs
%ul.nav.nav-tabs
%li
= form_tag switch_project_refs_path(@project), :method => :get, :class => "project-refs-form" do
= select_tag "ref", grouped_options_refs, :onchange => "$(this.form).trigger('submit');", :class => "project-refs-select"
app/views/dashboard/index.html.haml
+ 1
− 1
View file @ 627efddf
@@ -42,7 +42,7 @@
%br
= link_to profile_path, :class => "btn" do
Your Profile »
.span12.left= render "dashboard/projects_feed", :projects => @active_projects
.span8.left= render "dashboard/projects_feed", :projects => @active_projects
- if @last_push && @last_push.valid_push?
.padded.prepend-top-20
%h5
app/views/issues/_head.html.haml
+ 1
− 1
View file @ 627efddf
.tabs
%ul.nav.nav-tabs
%li{:class => "#{'active' if current_page?(project_issues_path(@project))}"}
= link_to project_issues_path(@project), :class => "tab" do
Browse Issues
app/views/issues/index.html.haml
+ 2
− 2
View file @ 627efddf
@@ -22,7 +22,7 @@
.title
.row
.span6
%ul.pills.left
%ul.nav.nav-pills.left
%li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
= link_to project_issues_path(@project, :f => 0) do
Open
@@ -36,7 +36,7 @@
= link_to project_issues_path(@project, :f => 1) do
All
 
.span6.right
.span4.right
= form_tag project_issues_path(@project), :method => :get, :class => :right do
= select_tag(:milestone_id, options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Select milestone")
 
app/views/layouts/_head_panel.html.haml
+ 1
− 1
View file @ 627efddf
/ Page Header
%header.top_panel_holder
.wrapper
.container
.top_panel_content
%div.app_logo
= link_to root_path, :class => "home", :title => "Home" do
app/views/merge_requests/_form.html.haml
+ 14
− 14
View file @ 627efddf
= form_for [@project, @merge_request] do |f|
= form_for [@project, @merge_request], :html => { :class => "new_merge_request form-horizontal" } do |f|
-if @merge_request.errors.any?
.alert-message.block-message.error
%ul
- @merge_request.errors.full_messages.each do |msg|
%li= msg
 
.clearfix
= f.label :title
.input= f.text_area :title, :class => "xxlarge", :maxlength => 255, :rows => 5
.clearfix
= f.label :source_branch, "From"
.input
.control-group
= f.label :title, :class => "control-label"
.controls= f.text_area :title, :class => "input-xxlarge", :maxlength => 255, :rows => 5
.control-group
= f.label :source_branch, "From", :class => "control-label"
.controls
= f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
.mr_source_commit
.clearfix
= f.label :target_branch, "To"
.input
.control-group
= f.label :target_branch, "To", :class => "control-label"
.controls
= f.select(:target_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
.mr_target_commit
.clearfix
= f.label :assignee_id, "Assign to"
.input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")
= f.label :assignee_id, "Assign to", :class => "control-label"
.controls= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")
 
.actions
= f.submit 'Save', :class => "primary btn"
.form-actions
= f.submit 'Save', :class => "btn-primary btn"
- if @merge_request.new_record?
= link_to project_merge_requests_path(@project), :class => "btn" do
Cancel
app/views/merge_requests/index.html.haml
+ 1
− 1
View file @ 627efddf
@@ -8,7 +8,7 @@
 
.ui-box
.title
%ul.pills
%ul.nav.nav-pills
%li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
= link_to project_merge_requests_path(@project, :f => 0) do
Open
app/views/merge_requests/show.html.haml
+ 1
− 1
View file @ 627efddf
@@ -56,7 +56,7 @@
= render "merge_requests/commits"
 
- unless @commits.empty?
.tabs
.nav.nav-tabs
%li.active
= link_to "#notes", :class => "merge-notes-tab tab" do
Notes
app/views/milestones/_form.html.haml
+ 17
− 17
View file @ 627efddf
@@ -5,33 +5,33 @@
 
%hr
 
= form_for [@project, @milestone] do |f|
= form_for [@project, @milestone], :html => {:class => "new_milestone form-horizontal"} do |f|
-if @milestone.errors.any?
.alert-message.block-message.error
%ul
- @milestone.errors.full_messages.each do |msg|
%li= msg
.row
.span7
.clearfix
= f.label :title, "Title"
.input
= f.text_field :title, :maxlength => 255, :class => "xlarge"
%p.hint Required
.clearfix
= f.label :description, "Description"
.input
= f.text_area :description, :maxlength => 2000, :class => "xlarge", :rows => 10
%p.hint Markdown is enabled.
.span8
.clearfix
= f.label :due_date, "Due Date"
.span6
.control-group
= f.label :title, "Title", :class => "control-label"
.controls
= f.text_field :title, :maxlength => 255, :class => "input-xlarge"
%p.help-block Required
.control-group
= f.label :description, "Description", :class => "control-label"
.controls
= f.text_area :description, :maxlength => 2000, :class => "input-xlarge", :rows => 10
%p.help-block Markdown is enabled.
.span6
.control-group
= f.label :due_date, "Due Date", :class => "control-label"
.input= f.hidden_field :due_date
.input
.controls
.datepicker
 
 
.actions
.form-actions
- if @milestone.new_record?
= f.submit 'Create milestone', :class => "primary btn"
-else
app/views/milestones/index.html.haml
+ 1
− 1
View file @ 627efddf
@@ -7,7 +7,7 @@
%br
%div.ui-box
.title
%ul.pills
%ul.nav.nav-pills
%li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
= link_to project_milestones_path(@project, :f => 0) do
Active
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