Unverified Commit 010a770b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Migrate forms and inputs pt1


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 29df4b884eb0
......@@ -3,15 +3,15 @@ $ ->
container = $(@).closest(".js-toggler-container")
container.toggleClass("on")
$("body").on "click", ".js-toggle-visibility-link", (e) ->
$(@).find('i').
toggleClass('icon-chevron-down').
toggleClass('icon-chevron-up')
container = $(".js-toggle-visibility-container")
container.toggleClass("hide")
container.toggleClass("gl-hide")
e.preventDefault()
$("body").on "click", ".js-toggle-button", (e) ->
$(@).closest(".js-toggle-container").find(".js-toggle-content").toggle()
e.preventDefault()
......@@ -69,12 +69,6 @@
}
}
.pagination ul > li > a, .pagination ul > li >span {
@include linear-gradient(#f1f1f1, #e1e1e1);
color: #333;
text-shadow: 0 1px 1px #FFF;
}
pre.well-pre {
border: 1px solid #EEE;
background: #f9f9f9;
......
input[type="text"], input[type="password"], input[type="search"], input[type="email"] {
@extend .form-control;
}
form {
@extend .form-horizontal;
label {
@extend .control-label;
@extend .col-sm-2;
&.radio-label {
text-align: left;
width: 100%;
margin-left: 0;
input[type="radio"] {
margin-top: 1px !important;
}
}
&.list-label {
float: none;
padding: 0 !important;
margin: 0;
text-align: left;
}
}
&.form-tiny {
margin: 0;
}
}
input[type='search'].search-text-input {
background-image: url("icon-search.png");
background-repeat: no-repeat;
background-position: 10px;
padding-left: 25px;
@include border-radius(4px);
border: 1px solid #ccc;
}
input[type='text'].danger {
......@@ -63,5 +27,9 @@ fieldset legend {
margin-bottom: 18px;
background-color: whitesmoke;
border-top: 1px solid #e5e5e5;
padding-left: 180px;
padding-left: 17%;
}
label.control-label {
@extend .col-sm-2;
}
......@@ -80,7 +80,7 @@
border-right: 1px solid #ccc;
text-align: right;
min-width: 35px;
max-width: 35px;
max-width: 50px;
width: 35px;
@include user-select(none);
a {
......
......@@ -32,14 +32,15 @@
.dash-filter {
margin: 7px 0;
padding: 4px 6px;
width: 202px;
width: 220px;
float: left;
height: inherit;
}
}
@media (max-width: 1200px) {
.dashboard .dash-filter {
width: 132px;
width: 150px;
}
}
......
......@@ -99,6 +99,7 @@ header {
form {
margin: 0;
padding: 0;
}
.search-input {
......
......@@ -6,6 +6,7 @@
border-bottom: 1px solid #E1E1E1;
ul {
padding: 0;
margin: auto;
height: 40px;
overflow: hidden;
......
.update-notifications {
margin-bottom: 0;
label {
margin-bottom: 0;
.radio-inline {
margin-right: 30px;
}
}
......
......@@ -67,7 +67,7 @@
}
.git-clone-holder {
float: right;
margin-right: 45px;
border: 1px solid #E1E1E1;
@include border-radius(4px);
......@@ -100,6 +100,11 @@
cursor: auto;
@extend .monospace;
background: #FAFAFA;
width: 100%;
}
.protocol-clone {
overflow: hidden;
}
}
......
......@@ -24,10 +24,10 @@
th {
font-weight: normal;
font-size: 15px;
border-bottom: 1px solid #CCC;
border-bottom: 1px solid #CCC !important;
}
td {
border-color: #F1F1F1;
border-color: #F1F1F1 !important;
}
&:hover {
td {
......
......@@ -14,7 +14,7 @@
.form-group
= f.label :message
.col-sm-10
= f.text_area :message, class: "input-xxlarge", rows: 2, required: true
= f.text_area :message, class: "input-lg", rows: 2, required: true
%div
= link_to '#', class: 'js-toggle-colors-link' do
Customize colors
......
......@@ -8,18 +8,18 @@
= f.label :name do
Group name
.col-sm-10
= f.text_field :name, placeholder: "Example Group", class: "input-xxlarge"
= f.text_field :name, placeholder: "Example Group", class: "input-lg"
.form-group.group-description-holder
= f.label :description, "Details"
.col-sm-10
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
= f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4
.form-group.group_name_holder
= f.label :path do
%span.cred Group path
.col-sm-10
= f.text_field :path, placeholder: "example-group", class: "input-xxlarge danger"
= f.text_field :path, placeholder: "example-group", class: "input-lg danger"
%ul.cred
%li Changing group path can have unintended side effects.
%li Renaming group path will rename directory for all related projects
......
......@@ -8,11 +8,11 @@
= f.label :name do
Group name
.col-sm-10
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-lg left"
.form-group.group-description-holder
= f.label :description, "Details"
.col-sm-10
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
= f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4
.form-actions
= f.submit 'Create group', class: "btn btn-create"
......
......@@ -16,7 +16,7 @@
.form-group
= f.label :url, "URL:"
.col-sm-10
= f.text_field :url, class: "text_field input-xxlarge input-xpadding"
= f.text_field :url, class: "text_field input-lg input-xpadding"
&nbsp;
= f.submit "Add System Hook", class: "btn btn-create"
%hr
......
.ui-box
.title.clearfix
= search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter'
= search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter form-control'
- if current_user.can_create_group?
%span.pull-right
= link_to new_group_path, class: "btn btn-new" do
......
.ui-box
.title.clearfix
= search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter'
= search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control'
- if current_user.can_create_project?
%span.pull-right
= link_to new_project_path, class: "btn btn-new" do
......
......@@ -28,12 +28,12 @@
= f.label :name do
Group name
.col-sm-10
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-lg left"
.form-group.group-description-holder
= f.label :description, "Details"
.col-sm-10
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
= f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4
.form-actions
= f.submit 'Save group', class: "btn btn-save"
......
......@@ -6,12 +6,12 @@
= f.label :name do
Group name
.col-sm-10
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-lg left"
.form-group.group-description-holder
= f.label :description, "Details"
.col-sm-10
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
= f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4
.form-group
.col-sm-10
......
......@@ -6,8 +6,8 @@
-# remote: data-remote
-# paginator: the paginator that renders the pagination tags inside
= paginator.render do
%div.pagination
%ul
%div.gl-pagination
%ul.pagination
= prev_page_tag unless current_page.first?
- each_page do |page|
- if page.left_outer? || page.right_outer? || page.inside_window?
......
......@@ -23,8 +23,9 @@
%p.cgray
- if current_user.private_token
= text_field_tag "token", current_user.private_token, class: "input-xlarge input-xpadding pull-left"
= f.submit 'Reset', data: { confirm: "Are you sure?" }, class: "btn btn-primary btn-build-token prepend-left-10"
= text_field_tag "token", current_user.private_token, class: "form-control"
%div
= f.submit 'Reset', data: { confirm: "Are you sure?" }, class: "btn btn-primary btn-build-token"
- else
%span You don`t have one yet. Click generate to fix it.
= f.submit 'Generate', class: "btn success btn-build-token"
......@@ -47,7 +48,7 @@
%p
Changing your username will change path to all personal projects!
%div
= f.text_field :username, required: true, class: 'input-xlarge input-xpadding'
= f.text_field :username, required: true, class: 'form-control'
&nbsp;
%span.loading-gif.gl-hide= image_tag "ajax_loader.gif"
%p.light
......
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