Commit be3edeb6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Small UI improvements after css refactoring

parent e2b8025a
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
.panel-head-actions { .panel-head-actions {
position: relative; position: relative;
top: -7px; top: -6px;
float: right; float: right;
} }
} }
......
...@@ -6,12 +6,10 @@ ...@@ -6,12 +6,10 @@
} }
&.btn-create { &.btn-create {
@extend .wide;
@extend .btn-success; @extend .btn-success;
} }
&.btn-save { &.btn-save {
@extend .wide;
@extend .btn-primary; @extend .btn-primary;
} }
...@@ -23,11 +21,6 @@ ...@@ -23,11 +21,6 @@
float: right; float: right;
} }
&.wide {
padding-left: 20px;
padding-right: 20px;
}
&.btn-small { &.btn-small {
padding: 2px 10px; padding: 2px 10px;
font-size: 12px; font-size: 12px;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
.issue-form, .merge-request-form, .wiki-form { .issue-form, .merge-request-form, .wiki-form {
.description { .description {
height: 18em; height: 16em;
border-top-left-radius: 0; border-top-left-radius: 0;
} }
} }
......
...@@ -3,10 +3,11 @@ ...@@ -3,10 +3,11 @@
.select2-choice { .select2-choice {
background: #FFF; background: #FFF;
border-color: #BBB; border-color: #BBB;
padding: 8px 14px; padding: 6px 14px;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
height: auto; height: auto;
margin: 2px 0;
.select2-arrow { .select2-arrow {
background: #FFF; background: #FFF;
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
} }
.check-all-holder { .check-all-holder {
height: 32px; height: 36px;
float: left; float: left;
margin-right: 12px; margin-right: 12px;
padding: 6px 15px; padding: 6px 15px;
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
Projects (#{@projects.total_count}) Projects (#{@projects.total_count})
.panel-head-actions .panel-head-actions
.dropdown.inline .dropdown.inline
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'} %button.dropdown-toggle.btn.btn-sm{type: 'button', 'data-toggle' => 'dropdown'}
%span.light sort: %span.light sort:
- if @sort.present? - if @sort.present?
= sort_options_hash[@sort] = sort_options_hash[@sort]
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
= sort_title_oldest_updated = sort_title_oldest_updated
= link_to admin_namespaces_projects_path(sort: sort_value_largest_repo) do = link_to admin_namespaces_projects_path(sort: sort_value_largest_repo) do
= sort_title_largest_repo = sort_title_largest_repo
= link_to 'New Project', new_project_path, class: "btn btn-new" = link_to 'New Project', new_project_path, class: "btn btn-sm btn-success"
%ul.well-list %ul.well-list
- @projects.each do |project| - @projects.each do |project|
%li %li
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
Users (#{@users.total_count}) Users (#{@users.total_count})
.panel-head-actions .panel-head-actions
.dropdown.inline .dropdown.inline
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"} %a.dropdown-toggle.btn.btn-sm{href: '#', "data-toggle" => "dropdown"}
%span.light sort: %span.light sort:
- if @sort.present? - if @sort.present?
= sort_options_hash[@sort] = sort_options_hash[@sort]
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
= link_to admin_users_path(sort: sort_value_oldest_updated) do = link_to admin_users_path(sort: sort_value_oldest_updated) do
= sort_title_oldest_updated = sort_title_oldest_updated
= link_to 'New User', new_admin_user_path, class: "btn btn-new" = link_to 'New User', new_admin_user_path, class: "btn btn-new btn-sm"
%ul.well-list %ul.well-list
- @users.each do |user| - @users.each do |user|
%li %li
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
projects: projects:
- if can? current_user, :manage_group, @group - if can? current_user, :manage_group, @group
.panel-head-actions .panel-head-actions
= link_to new_project_path(namespace_id: @group.id), class: "btn btn-new" do = link_to new_project_path(namespace_id: @group.id), class: "btn btn-sm btn-success" do
%i.fa.fa-plus %i.fa.fa-plus
New Project New Project
%ul.well-list %ul.well-list
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
.form-group .form-group
= f.label :bio, class: "control-label" = f.label :bio, class: "control-label"
.col-sm-10 .col-sm-10
= f.text_area :bio, rows: 6, class: "form-control", maxlength: 250 = f.text_area :bio, rows: 4, class: "form-control", maxlength: 250
%span.help-block Tell us about yourself in fewer than 250 characters. %span.help-block Tell us about yourself in fewer than 250 characters.
.col-md-5 .col-md-5
...@@ -94,5 +94,7 @@ ...@@ -94,5 +94,7 @@
%p Your profile is publicly visible because you joined public project(s) %p Your profile is publicly visible because you joined public project(s)
.form-actions .row
= f.submit 'Save changes', class: "btn btn-save" .col-md-7
.col-sm-2
= f.submit 'Save changes', class: "btn btn-success"
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