aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpl2017-04-04 18:42:53 +0200
committerjpl2017-04-04 18:42:53 +0200
commitf5aad1ef289c1c68fd8153187b8efedc230aa511 (patch)
treee5a19e85a1920561702b497bf624f69a3c5213f0
parent857f8910f397b784c34801f3371277f63bd79894 (diff)
downloadchouette-core-f5aad1ef289c1c68fd8153187b8efedc230aa511.tar.bz2
Refs #3043: fix BS horizontal form comp. label
-rw-r--r--app/assets/stylesheets/components/_forms.sass18
-rw-r--r--spec/features/time_tables_spec.rb1
2 files changed, 18 insertions, 1 deletions
diff --git a/app/assets/stylesheets/components/_forms.sass b/app/assets/stylesheets/components/_forms.sass
index b3131fe22..f2c76c9c1 100644
--- a/app/assets/stylesheets/components/_forms.sass
+++ b/app/assets/stylesheets/components/_forms.sass
@@ -77,6 +77,24 @@ input
border-color: #4cae4c
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px #5cb85c
+// BS horizontal form label positionning fix
+.form-horizontal
+ .form-group
+ position: relative
+
+ > .control-label
+ &[class*='col-sm-']
+ float: none
+ padding-top: 0
+ position: absolute
+ left: 0
+ right: 0
+ top: 50%
+ transform: translateY(-50%)
+
+ + [class*='col-sm-']
+ float: right
+
// Search bar
.search_bar
position: relative
diff --git a/spec/features/time_tables_spec.rb b/spec/features/time_tables_spec.rb
index 975160979..573b41150 100644
--- a/spec/features/time_tables_spec.rb
+++ b/spec/features/time_tables_spec.rb
@@ -125,7 +125,6 @@ describe "TimeTables", :type => :feature do
visit referential_time_tables_path(referential)
click_link "Ajouter un calendrier"
fill_in "Nom", :with => "TimeTable 1"
- fill_in "Identifiant Neptune", :with => "test:Timetable:1"
click_button("Valider")
expect(page).to have_content("TimeTable 1")
end