#369: Change color of buttons

This commit is contained in:
Vokhmin Alexey V 2015-02-06 02:59:45 +03:00
parent fcbe5f84a1
commit 5037e6782b
9 changed files with 21 additions and 27 deletions

View File

@ -3,11 +3,9 @@
.col-md-6 .col-md-6
= f.input :name, label: false = f.input :name, label: false
.col-md-6 .col-md-6
= f.button :submit, t('layout.search.header') => f.button :submit, t('layout.search.header')
|   => t('layout.or')
= t('layout.or') a.btn.btn-default href=platform_maintainers_path(@platform)
|  
a href=platform_maintainers_path(@platform)
= t('layout.clear') = t('layout.clear')

View File

@ -60,5 +60,6 @@
.col-sm-offset-3.col-sm-9 .col-sm-offset-3.col-sm-9
=> f.button :submit, t('layout.save') => f.button :submit, t('layout.save')
a.btn.btn-primary href=(@platform.new_record? ? root_path : platform_path(@platform)) => t('layout.or')
a.btn.btn-default href=(@platform.new_record? ? root_path : platform_path(@platform))
= t('layout.cancel') = t('layout.cancel')

View File

@ -10,9 +10,8 @@
= f.input :description, as: :text = f.input :description, as: :text
.button_block .button_block
button type="submit" class="btn btn-default" data-disable-with=t('layout.processing') button type="submit" class="btn btn-primary" data-disable-with=t('layout.processing')
= t('layout.clone') = t('layout.clone')
| &nbsp; =<> t('layout.or')
= t('layout.or') a.btn.btn-default href=platform_path(@platform)
| &nbsp; = t('layout.cancel')
= link_to t('layout.cancel'), platform_path(@platform)

View File

@ -35,10 +35,8 @@
= f.input :autostart_status, collection: Product::AUTOSTART_STATUSES.collect{|status| [Product.human_autostart_status(status), status]} = f.input :autostart_status, collection: Product::AUTOSTART_STATUSES.collect{|status| [Product.human_autostart_status(status), status]}
= f.button :submit, t('layout.save') => f.button :submit, t('layout.save')
| &nbsp; => t('layout.or')
= t('layout.or') a.btn.btn-default href=( @product.new_record? ? platform_path(@platform) : platform_product_path(@platform, @product) )
| &nbsp;
a href=( @product.new_record? ? platform_path(@platform) : platform_product_path(@platform, @product) )
= t('layout.cancel') = t('layout.cancel')

View File

@ -7,9 +7,7 @@
- if @platform.main? - if @platform.main?
= f.input :publish_builds_only_from_branch = f.input :publish_builds_only_from_branch
= f.button :submit, t('layout.save') => f.button :submit, t('layout.save')
| &nbsp; => t('layout.or')
= t('layout.or') a.btn.btn-default href=(@repository.new_record? ? platform_repositories_path(@platform) : platform_repository_path(@platform, @repository))
| &nbsp;
a href=(@repository.new_record? ? platform_repositories_path(@platform) : platform_repository_path(@platform, @repository))
= t('layout.cancel') = t('layout.cancel')

View File

@ -7,4 +7,4 @@
.row .row
= simple_form_for :repository, url: remove_project_platform_repository_path(@platform, @repository), html: { method: :delete } do |f| = simple_form_for :repository, url: remove_project_platform_repository_path(@platform, @repository), html: { method: :delete } do |f|
= f.input :projects_list, as: :text = f.input :projects_list, as: :text
= f.button :submit, t('layout.delete') = f.button :submit, t('layout.delete'), class: 'btn-danger'

View File

@ -73,13 +73,13 @@
%button.btn.btn-default{ type: 'button', disabled: true } %button.btn.btn-default{ type: 'button', disabled: true }
= t('layout.processing') = t('layout.processing')
.btn-group{ 'ng-hide' => 'isRequest' } .btn-group{ 'ng-hide' => 'isRequest' }
%button.btn.btn-default{ type: 'button', 'ng-click' => 'refresh(true)' } %button.btn.btn-primary{ type: 'button', 'ng-click' => 'refresh(true)' }
= t('layout.search.header') = t('layout.search.header')
.btn-group .btn-group
%button.btn.btn-default{ type: 'button', 'ng-click' => 'clear()' }= t('reset') %button.btn.btn-primary{ type: 'button', 'ng-click' => 'clear()' }= t('reset')
-if @project and can?(:create, @project.build_lists.build) -if @project and can?(:create, @project.build_lists.build)
.btn-group .btn-group
%button.btn.btn-default{ id: 'filter_new_build', type: 'button', %button.btn.btn-primary{ id: 'filter_new_build', type: 'button',
onclick: "location.href='#{new_project_build_list_path(@project)}'" } onclick: "location.href='#{new_project_build_list_path(@project)}'" }
= t('layout.build_lists.new_header') = t('layout.build_lists.new_header')
= hidden_field_tag :name_with_owner, @project.try(:name_with_owner) = hidden_field_tag :name_with_owner, @project.try(:name_with_owner)

View File

@ -35,7 +35,7 @@ h4
typeahead = "extra.label for extra in #{ctrl_as}get#{field}($viewValue)" typeahead = "extra.label for extra in #{ctrl_as}get#{field}($viewValue)"
typeahead-on-select = "#{ctrl_as}select#{func_name}($item, $model, $label)" ] typeahead-on-select = "#{ctrl_as}select#{func_name}($item, $model, $label)" ]
.col-md-4 .col-md-4
button[ class='btn btn-default' type='button' button[ class='btn btn-primary' type='button'
ng-click="#{ctrl_as}add#{func_name}()" ] ng-click="#{ctrl_as}add#{func_name}()" ]
= t('layout.add') = t('layout.add')

View File

@ -38,7 +38,7 @@
.col-md-5 .col-md-5
=> f.button :submit, t('.search') => f.button :submit, t('.search')
=> t('.or') => t('.or')
= link_to t('.clear'), subject = link_to t('.clear'), subject, class: 'btn btn-default'
hr hr
table.table.table-striped ng-show='!processing' table.table.table-striped ng-show='!processing'