Unverified Commit 0a364762 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

twbs3 style for admin, tree, network, commits


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 09c2f8c7
......@@ -30,10 +30,20 @@ fieldset legend {
padding-left: 17%;
}
label.control-label {
@extend .col-sm-2;
label {
&.control-label {
@extend .col-sm-2;
}
&.inline-label {
margin: 0;
}
}
.inline-input-group {
width: 250px;
}
.input-mx-250 {
max-width: 250px;
}
......@@ -4,7 +4,7 @@
You can manage projects, users and other GitLab data from here.
%hr
.admin_dash.row
.col-md-4
.col-sm-4
.light-well
%h4 Projects
.data
......@@ -12,7 +12,7 @@
%h1= Project.count
%hr
= link_to 'New Project', new_project_path, class: "btn btn-new"
.col-md-4
.col-sm-4
.light-well
%h4 Users
.data
......@@ -20,7 +20,7 @@
%h1= User.count
%hr
= link_to 'New User', new_admin_user_path, class: "btn btn-new"
.col-md-4
.col-sm-4
.light-well
%h4 Groups
.data
......
......@@ -7,7 +7,8 @@
= link_to 'New Group', new_admin_group_path, class: "btn btn-new pull-right"
%br
= form_tag admin_groups_path, method: :get, class: 'form-inline' do
= text_field_tag :name, params[:name], class: "span6 input-xpadding"
.form-group
= text_field_tag :name, params[:name], class: "form-control input-xpadding"
= submit_tag "Search", class: "btn submit btn-primary"
%hr
......
......@@ -2,9 +2,11 @@
.col-md-3
.admin-filter
= form_tag admin_users_path, method: :get, class: 'form-inline' do
= search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'input-xpadding span2'
= button_tag type: 'submit', class: 'btn btn-primary' do
%i.icon-search
.append-bottom-10
.form-group
= search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control'
= button_tag type: 'submit', class: 'btn btn-primary' do
%i.icon-search
%ul.nav.nav-pills.nav-stacked
%li{class: "#{'active' unless params[:filter]}"}
= link_to admin_users_path do
......
......@@ -22,6 +22,6 @@
- if current_user && current_controller?(:commits) && current_user.private_token
%li.pull-right
%li.pull-right.hidden-sm
= link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do
%i.icon-rss
.clearfix
.pull-left
.row.append-bottom-20
.col-sm-2
= render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
.pull-left
= form_tag project_network_path(@project, @id), method: :get do |f|
.form-group
= label_tag :filter_ref, "Begin with the selected commit", class: 'control-label light'
.col-sm-10
= check_box_tag :filter_ref, 1, @options[:filter_ref]
- @options.each do |key, value|
= hidden_field_tag(key, value, id: nil) unless key == "filter_ref"
.search.pull-right
= form_tag project_network_path(@project, @id), method: :get do |f|
.form-group
= label_tag :search , "Looking for commit:", class: 'control-label light'
.col-sm-10
= text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input form-control"
= button_tag type: 'submit', class: 'btn vtop' do
%i.icon-search
- @options.each do |key, value|
= hidden_field_tag(key, value, id: nil) unless key == "extended_sha1"
.col-sm-10
= form_tag project_network_path(@project, @id), method: :get, class: 'form-inline' do |f|
= label_tag :search , "Looking for", class: 'light inline-label'
= text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input form-control input-mx-250"
= button_tag type: 'submit', class: 'btn btn-success' do
%i.icon-search
.inline.prepend-left-20
.checkbox.light
= label_tag :filter_ref do
= check_box_tag :filter_ref, 1, @options[:filter_ref]
%span Begin with the selected commit
= render "home_panel"
.row
.col-md-9
.col-md-9.hidden-sm
= render "events/event_last_push", event: @last_push
= render 'shared/event_filter'
.content_list
......
......@@ -21,15 +21,16 @@
%tr
%th Name
%th Last Update
%th
%th.hidden-sm
Last Commit
&nbsp;
%i.icon-angle-right
&nbsp;
%small.light
= link_to @commit.short_id, project_commit_path(@project, @commit)
&ndash;
= truncate(@commit.title, length: 50)
%span.last-commit
&nbsp;
%i.icon-angle-right
&nbsp;
%small.light
= link_to @commit.short_id, project_commit_path(@project, @commit)
&ndash;
= truncate(@commit.title, length: 50)
%th= link_to "history", project_commits_path(@project, @id), class: "pull-right"
- if @path.present?
......
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