提交 dd512684 编写于 作者: A Annabel Gray

Merge branch '39710-search-placeholder-cut-off' into 'master'

Resolve "Runners search input placeholder is cut off"

Closes #39710

See merge request gitlab-org/gitlab-ce!19015
......@@ -120,6 +120,14 @@ label {
@include box-shadow(none);
border-radius: 2px;
padding: $gl-vert-padding $gl-input-padding;
&.input-short {
width: $input-short-width;
@media (min-width: $screen-md-min) {
width: $input-short-md-width;
}
}
}
.select-wrapper {
......
......@@ -128,14 +128,6 @@
/* Large devices (large desktops, 1200px and up) */
@media (min-width: $screen-lg-min) { width: 250px; }
&.input-short {
/* Medium devices (desktops, 992px and up) */
@media (min-width: $screen-md-min) { width: 170px; }
/* Large devices (large desktops, 1200px and up) */
@media (min-width: $screen-lg-min) { width: 210px; }
}
}
@media (max-width: $screen-xs-max) {
......@@ -164,10 +156,6 @@
}
}
.input-short {
width: 100%;
}
.icon-label {
display: inline-block;
}
......
......@@ -554,6 +554,8 @@ $input-danger-border: $red-400;
$input-group-addon-bg: #f7f8fa;
$gl-field-focus-shadow: rgba(0, 0, 0, 0.075);
$gl-field-focus-shadow-error: rgba($red-500, 0.6);
$input-short-width: 200px;
$input-short-md-width: 280px;
/*
* Help
......
......@@ -99,16 +99,6 @@
@media (min-width: $screen-sm-min) {
width: 250px;
}
&.input-short {
@media (min-width: $screen-md-min) {
width: 170px;
}
@media (min-width: $screen-lg-min) {
width: 210px;
}
}
}
}
......
......@@ -871,12 +871,6 @@ pre.light-well {
margin: 0;
}
.commits-search-form {
.input-short {
min-width: 200px;
}
}
.git-clone-holder {
width: 380px;
......
......@@ -45,7 +45,7 @@
.pull-left
= form_tag admin_runners_path, id: 'runners-search', class: 'form-inline', method: :get do
.form-group
= search_field_tag :search, params[:search], class: 'form-control', placeholder: 'Runner description or token', spellcheck: false
= search_field_tag :search, params[:search], class: 'form-control input-short', placeholder: 'Runner description or token', spellcheck: false
= submit_tag 'Search', class: 'btn'
.pull-right.light
......
---
title: 'Fixes: Runners search input placeholder is cut off'
merge_request: 19015
author: Jacopo Beschi @jacopo-beschi
type: fixed
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册