aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpl2017-02-10 19:07:13 +0100
committerjpl2017-02-10 19:07:13 +0100
commit1091a971433fd706941585ac011ee72e6cd2bb73 (patch)
tree77a8c455888a7476e02502170aa198e39a73d1ab
parent23d1402691f761cceda079d68d96a643d9176dd0 (diff)
downloadchouette-core-1091a971433fd706941585ac011ee72e6cd2bb73.tar.bz2
Refs #2589: updating ref. forms, with select_tags adjustments
-rw-r--r--app/assets/stylesheets/components/_select2.sass43
-rw-r--r--app/views/referentials/edit.html.slim2
-rw-r--r--app/views/referentials/new.html.slim2
-rw-r--r--config/locales/referentials.fr.yml2
4 files changed, 36 insertions, 13 deletions
diff --git a/app/assets/stylesheets/components/_select2.sass b/app/assets/stylesheets/components/_select2.sass
index b7fd2c6df..2daaafb1e 100644
--- a/app/assets/stylesheets/components/_select2.sass
+++ b/app/assets/stylesheets/components/_select2.sass
@@ -3,15 +3,38 @@
//-----------------------//
// With Font Awesome adjusts.
+.select2-selection__rendered
+ position: relative
-.select2-selection__clear
- font-size: 0
- font-family: FontAwesome
- text-rendering: auto
- -webkit-font-smoothing: antialiased
+.select2-container--bootstrap
+ .select2-selection--multiple
+ .select2-selection__clear
+ position: absolute
+ top: 50%
+ right: 10px
+ margin: -10px 0 0 0
+ font-size: 0
+ font-family: FontAwesome
+ text-rendering: auto
+ -webkit-font-smoothing: antialiased
- &::before
- content: '\f057'
- display: inline
- font-size: 14px
- font-weight: normal
+ &::before
+ content: '\f057'
+ color: $grey
+ display: inline
+ font-size: 14px
+ font-weight: normal
+
+ .select2-selection__choice
+ background-color: $blue
+ color: #fff
+ border: none
+ border-radius: 3px
+
+ .select2-selection__choice__remove
+ float: right
+ color: rgba(#fff, 0.5)
+ margin: 0 0 0 5px
+
+ &:hover
+ color: #fff
diff --git a/app/views/referentials/edit.html.slim b/app/views/referentials/edit.html.slim
index 619e9a9af..d54b63135 100644
--- a/app/views/referentials/edit.html.slim
+++ b/app/views/referentials/edit.html.slim
@@ -8,5 +8,5 @@
.page_content
.container-fluid
.row
- .col-lg-6.col-lg-offset-3.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
+ .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
== render 'form'
diff --git a/app/views/referentials/new.html.slim b/app/views/referentials/new.html.slim
index 3888cfdd3..d1fbdc3f8 100644
--- a/app/views/referentials/new.html.slim
+++ b/app/views/referentials/new.html.slim
@@ -6,5 +6,5 @@
.page_content
.container-fluid
.row
- .col-lg-6.col-lg-offset-3.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
+ .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
== render 'form'
diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml
index ab35f4024..9c569a308 100644
--- a/config/locales/referentials.fr.yml
+++ b/config/locales/referentials.fr.yml
@@ -4,7 +4,7 @@ fr:
index:
title: 'Jeux de données'
edit:
- title: "Modifier le jeu de données"
+ title: "Modifier le JDD"
show:
lines: "lignes"
networks: "réseaux"