-
-
+
From
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 38804617615..d9a80b065ab 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -45,8 +45,8 @@
-
@@ -75,8 +75,8 @@
-
@@ -159,11 +159,11 @@
-
-
-
![]()
+
+
+
-
-
diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css
index be21ca7e7a6..04be64a2d37 100644
--- a/addons/hr/static/src/css/hr.css
+++ b/addons/hr/static/src/css/hr.css
@@ -1,18 +1,10 @@
-.oe_employee_vignette {
- padding: 8px 8px;
- min-height: 100px;
-}
-
-.oe_employee_image, .oe_employee_details {
- display: inline-block;
- vertical-align: top;
+.oe_employee_details{
+ min-height: 168px !important;
+ max-width: 336px;
}
.oe_employee_image {
width: 100px;
- height: 100px;
- text-align: center;
- overflow: hidden;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
-o-border-radius: 3px;
@@ -23,53 +15,10 @@
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+ margin-top: 5px;
+ margin-left: -3px;
}
-.oe_employee_picture {
- width: 100px;
- height: auto;
- clip: rect(10px, 100px, 110px, 0px);
-}
-
-.oe_employee_picture_wide {
- height: 100px;
- width: auto;
- clip: rect(0px, 115px, 100px, 15px);
-}
-
-.oe_employee_details {
- width: 210px;
- font-size: 13px;
- padding: 2px 5px;
- color: #4c4c4c;
- min-height: 120px;
-}
-
-.oe_employee_details h4 {
- margin: 0;
- font-size: 13px;
-}
-
-.oe_employee_details h4 a {
- color: #4c4c4c;
-}
-
-.oe_employee_details h4 a:hover {
- text-decoration: underline;
-}
-
-.oe_employee_details ul {
- margin: 3px 0 5px;
- padding: 0;
- list-style: none;
-}
-
-.oe_employee_details li {
- margin: 2px 0;
- padding: 0;
-}
-
-.openerp .oe_employee_vignette .oe_followers {
- width: auto;
+.openerp .oe_employee_details .oe_followers {
float: none;
}
\ No newline at end of file
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 78c463f296c..e9820fa6eb8 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -624,7 +624,7 @@
-
+
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 5c56386ceb7..82acc5a7895 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -264,7 +264,7 @@
-
+
i
-
-
Mobile:
-
-
oe_kanban_text_red
:
-
-
+
-
@@ -446,16 +440,16 @@
-
+
-
+
-
-
+
+
-
+
()
@@ -467,29 +461,33 @@
-
-
- Applications
-
-
-
- Documents
- Document
-
+
-
-
- Hired Employees
-
+
+
+
+ Hired Employees
+
+
diff --git a/addons/hr_recruitment/static/src/css/job_position.css b/addons/hr_recruitment/static/src/css/job_position.css
index ea90bd6ec94..7349c5024c6 100644
--- a/addons/hr_recruitment/static/src/css/job_position.css
+++ b/addons/hr_recruitment/static/src/css/job_position.css
@@ -1,77 +1,34 @@
-.openerp .oe_kanban_job {
- width: 355px;
- min-height: 165px !important;
-}
-.openerp .oe_job_alias {
- margin: 3px;
-}
-.openerp .oe_job_detail {
- height: 70px;
- width: 308px;
-}
-.openerp .oe_job {
- font-size: 112%;
- position: inline;
- margin: 3px 3px;
- color: #4c4c4c;
- height: 18px;
-}
-.openerp img.oe_job_avatar {
- position: absolute;
- width: 24px;
- height: 24px;
- margin-left: 295px;
- margin-top: -5px;
-}
-.openerp .oe_launch_recruitment {
- float: left;
- position: absolute;
- bottom: 3px;
- left: 10px;
-}
-.openerp div.oe_applications {
- position: absolute;
- margin-top: 16px;
- font-size: 14px;
-}
-.openerp .oe_applications > a > span:hover {
- margin: 4px 0;
- text-decoration: underline;
-}
-.openerp .oe_name {
- font-size: 14px;
- font-weight: bold;
+.openerp .oe_kanban_job{
+ width: 355px;
+ min-height: 220px !important;
}
.openerp .oe_manager_name {
- width: 135px;
- font-size: 11px;
- color: gray;
+ font-size: 11px;
}
-.openerp .oe_job_justgage {
- float: right;
- margin-top: -40px;
- margin-right: -58px;
- width: 200px;
- height: 130px;
+.openerp .oe_gray {
+ color: gray;
}
-.openerp .oe_department {
- width: 289px;
+.openerp .oe_link_hover:hover{
+ text-decoration: underline;
}
-.openerp .oe_start_recruitment {
- padding-top: 10px;
+.openerp .oe_applicant_kanaban {
+ width: 276px;
}
-.openerp .oe_start_recruitment p {
- font-size: 14px;
- color: gray;
- padding-left: 50px;
+.openerp .oe_margin_top_4 {
+ margin-top: 4px;
}
-.openerp .oe_start_recruitment img {
- margin-top: -22px;
- width: 32px;
- height: 34px;
- float: left;
- padding-left: 12px;
+.openerp .oe_job_head {
+ margin-bottom: -4px;
+ font-size: 15px;
}
-.openerp .oe_job_messages {
- margin-top: 40px !important;
+.openerp .oe_job_font {
+ font-size: 15px;
+}
+
+.openerp .oe_job_avatar {
+ width: 24px;
+}
+
+.openerp .oe_applications {
+ margin-top: 30px;
}
diff --git a/addons/hr_recruitment/static/src/css/job_position.sass b/addons/hr_recruitment/static/src/css/job_position.sass
index 67504dee6de..0c7ee9d6fad 100644
--- a/addons/hr_recruitment/static/src/css/job_position.sass
+++ b/addons/hr_recruitment/static/src/css/job_position.sass
@@ -1,62 +1,21 @@
.openerp
.oe_kanban_job
width: 355px
- min-height: 165px !important
- .oe_job_alias
- margin: 3px
- .oe_job_detail
- height: 70px
- width: 308px
- .oe_job
- font-size: 112%
- position: inline
- margin: 3px 3px
- color: #4c4c4c
- height: 18px
- img.oe_job_avatar
- position: absolute
- width: 24px
- height: 24px
- margin-left: 295px
- margin-top: -5px
- .oe_launch_recruitment
- float: left
- position: absolute
- bottom: 3px
- left: 10px
- div.oe_applications
- position: absolute
- margin-top: 16px
- font-size: 14px
- .oe_applications > a > span:hover
- margin: 4px 0
- text-decoration: underline
- .oe_name
- font-size: 14px
- font-weight: bold
+ min-height: 220px !important
.oe_manager_name
- width: 135px
font-size: 11px
+ .oe_gray
color: gray
- .oe_job_justgage
- float: right
- margin-top: -40px
- margin-right: -58px
- width: 200px
- height: 130px
- .oe_department
- width: 289px
- .oe_start_recruitment
- padding-top: 10px
- p
- font-size: 14px
- color: gray
- padding-left: 50px
- img
- margin-top: -22px
- width: 32px
- height: 34px
- float: left
- padding-left: 12px
- .oe_job_messages
- margin-top: 40px !important
+ .oe_applicant_kanaban
+ width: 276px
+ .oe_margin_top_4
+ margin-top: 4px
+ .oe_job_head
+ margin-bottom: -4px
+ font-size: 15px
+ oe_job_font
+ font-size: 15px
+ .oe_job_avatar
+ width: 24px
+ oe_applications
+ margin-top: 30px
diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css
index cc91e8acf58..6c75f7a4c77 100644
--- a/addons/mass_mailing/static/src/css/mass_mailing.css
+++ b/addons/mass_mailing/static/src/css/mass_mailing.css
@@ -2,12 +2,13 @@
width: 280px;
min-height: 141px;
}
-
-.openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign .oe_kanban_header_right {
- float: right;
-}
-
.openerp .oe_kanban_view .oe_kanban_mass_mailing {
width: 280px;
min-height: 141px;
}
+.openerp .oe_margin_top_8 {
+ margin-top: 8px;
+}
+.openerp .oe_margin_bottom_8 {
+ margin-bottom: 8px;
+}
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 5a7fca3a2aa..9464e3d7fea 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -651,12 +651,12 @@
-
+ t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/>
+
- Mailings
+ Mailings
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index fb50dfda73c..5cff3245cb1 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -266,12 +266,14 @@
-