diff --git a/Makefile b/Makefile new file mode 100644 index 00000000000..84d916e9a3f --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +# NOTE: please keep your version of sass up to date: sudo gem update +.PHONY: watch css +SASS_FILES=$(wildcard addons/*/static/src/css/*.sass openerp/addons/*/static/src/css/*.sass) +CSS_FILES=$(patsubst %.sass,%.css,${SASS_FILES}) +css: ${CSS_FILES} +%.css: %.sass + sass -t expanded --compass --unix-newlines --sourcemap=none $< $@ +watch: + sass -t expanded --compass --unix-newlines --sourcemap=none --watch .:. diff --git a/addons/account_analytic_analysis/static/src/css/Makefile b/addons/account_analytic_analysis/static/src/css/Makefile deleted file mode 100644 index 21462c06dcc..00000000000 --- a/addons/account_analytic_analysis/static/src/css/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -analytic.css: analytic.sass - sass -t expanded analytic.sass analytic.css - diff --git a/addons/board/static/src/css/Makefile b/addons/board/static/src/css/Makefile deleted file mode 100644 index 0cb5ae70f4a..00000000000 --- a/addons/board/static/src/css/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -dashboard.css: dashboard.sass - sass --trace -t expanded dashboard.sass dashboard.css - diff --git a/addons/crm/static/src/css/Makefile b/addons/crm/static/src/css/Makefile deleted file mode 100644 index a2ced24a13d..00000000000 --- a/addons/crm/static/src/css/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -crm.css: crm.sass - sass --trace -t expanded crm.sass:crm.css diff --git a/addons/gamification/static/src/css/Makefile b/addons/gamification/static/src/css/Makefile deleted file mode 100644 index 3a6a70cf59b..00000000000 --- a/addons/gamification/static/src/css/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -gamification.css: gamification.sass - sass --trace -t expanded gamification.sass gamification.css - diff --git a/addons/google_calendar/static/src/css/Makefile b/addons/google_calendar/static/src/css/Makefile deleted file mode 100755 index 2071c694b4c..00000000000 --- a/addons/google_calendar/static/src/css/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -google_calendar.css: google_calendar.sass - sass --trace -t expanded google_calendar.sass google_calendar.css - - \ No newline at end of file diff --git a/addons/hr_timesheet_sheet/static/src/css/Makefile b/addons/hr_timesheet_sheet/static/src/css/Makefile deleted file mode 100644 index e60087d9b33..00000000000 --- a/addons/hr_timesheet_sheet/static/src/css/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -timesheet.css: timesheet.sass - sass -t expanded timesheet.sass timesheet.css - diff --git a/addons/lunch/static/src/css/Makefile b/addons/lunch/static/src/css/Makefile deleted file mode 100644 index 941e8dbfe7d..00000000000 --- a/addons/lunch/static/src/css/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -lunch.css: lunch.sass - sass -t expanded lunch.sass lunch.css - diff --git a/addons/note/static/src/css/Makefile b/addons/note/static/src/css/Makefile deleted file mode 100644 index 17bf009479e..00000000000 --- a/addons/note/static/src/css/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -note.css: note.sass - sass --trace -t expanded note.sass note.css - diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile deleted file mode 100644 index ba88946baac..00000000000 --- a/addons/web/static/src/css/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: *.css -%.css: %.sass - sass -t expanded --compass --unix-newlines $< $@ -watch: - sass -t expanded --compass --unix-newlines --watch .:. diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 608b477324e..eebb30459c6 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -8,7 +8,6 @@ font-weight: normal; font-style: normal; } - @font-face { font-family: "EntypoRegular"; src: url("/web/static/src/font/entypo-webfont.eot") format("eot"); @@ -19,7 +18,6 @@ font-weight: normal; font-style: normal; } - .openerp { padding: 0; margin: 0; @@ -104,16 +102,16 @@ } .openerp .zebra tbody tr:hover td { background-color: #e6e6e6; - background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dedede); - background-image: -moz-linear-gradient(top, #eeeeee, #dedede); - background-image: -ms-linear-gradient(top, #eeeeee, #dedede); - background-image: -o-linear-gradient(top, #eeeeee, #dedede); - background-image: linear-gradient(to bottom, #eeeeee, #dedede); + background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#dedede)); + background-image: -webkit-linear-gradient(top, #eee, #dedede); + background-image: -moz-linear-gradient(top, #eee, #dedede); + background-image: -ms-linear-gradient(top, #eee, #dedede); + background-image: -o-linear-gradient(top, #eee, #dedede); + background-image: linear-gradient(to bottom, #eee, #dedede); } .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; - border: 1px solid #cccccc; + border: 1px solid #ccc; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -195,12 +193,12 @@ -moz-box-shadow: none !important; -webkit-box-shadow: none !important; box-shadow: none !important; - color: #aaaaaa !important; + color: #aaa !important; cursor: default; - text-shadow: 0 1px 1px white !important; + text-shadow: 0 1px 1px #fff !important; } .openerp .ui-widget-content a { - color: #7c7bad; + color: #7C7BAD; } .openerp .oe_bounce_container { display: inline-block; @@ -218,7 +216,7 @@ padding: 6px; background-color: rgba(60, 60, 60, 0.7); border: 1px solid; - border-color: #888888 #555555 #444444; + border-color: #888 #555 #444; -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; @@ -244,12 +242,12 @@ -webkit-border-radius: 2px 2px 0 0; border-radius: 2px 2px 0 0; background-color: #ededed; - background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); - background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); - background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); - background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); - background-image: -o-linear-gradient(top, #fcfcfc, #dedede); - background-image: linear-gradient(to bottom, #fcfcfc, #dedede); + background-image: -webkit-gradient(linear, left top, left bottom, from(#FCFCFC), to(#DEDEDE)); + background-image: -webkit-linear-gradient(top, #FCFCFC, #DEDEDE); + background-image: -moz-linear-gradient(top, #FCFCFC, #DEDEDE); + background-image: -ms-linear-gradient(top, #FCFCFC, #DEDEDE); + background-image: -o-linear-gradient(top, #FCFCFC, #DEDEDE); + background-image: linear-gradient(to bottom, #FCFCFC, #DEDEDE); } .openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title { margin: 0; @@ -306,7 +304,7 @@ border-radius: 0 0 2px 2px; } .openerp.ui-dialog .oe_about a { - color: #7c7bad; + color: #7C7BAD; } .openerp.ui-dialog .oe_about a:hover { text-decoration: underline; @@ -331,14 +329,14 @@ background-image: -ms-linear-gradient(top, #b41616, #600606); background-image: -o-linear-gradient(top, #b41616, #600606); background-image: linear-gradient(to bottom, #b41616, #600606); - color: #eeeeee; + color: #eee; padding: 0 16px; -moz-border-radius: 0 0 2px 2px; -webkit-border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px; } .openerp.ui-dialog .oe_about .oe_bottom a { - color: #eeeeee; + color: #eee; } .openerp.ui-dialog.oe_act_window .ui-dialog-content { padding: 0px; @@ -389,7 +387,7 @@ cursor: wait; } .openerp .oe_fade { - color: #888888; + color: #888; font-weight: normal; } .openerp .oe_bold { @@ -400,7 +398,7 @@ } .openerp .oe_highlight { color: white; - background: #dc5f59; + background: #DC5F59; } .openerp button.oe_highlight { background-color: #c02c2c; @@ -433,7 +431,7 @@ background-image: linear-gradient(to bottom, #c52020, #d22323); } .openerp .oe_background_grey { - background: #eeeeee !important; + background: #eee !important; } .openerp .oe_form_dirty .oe_highlight_on_dirty { color: white; @@ -453,7 +451,7 @@ box-shadow: none; } .openerp .oe_form_dirty button.oe_highlight_on_dirty:hover { - background: #ed6f6a; + background: #ED6F6A; } .openerp .oe_button_box { width: 270px; @@ -511,7 +509,7 @@ -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; - color: #7c7bad; + color: #7C7BAD; font-weight: bold; } .openerp .oe_button.oe_link span:hover { @@ -534,7 +532,7 @@ max-width: 650px; } .openerp .oe_grey { - color: #aaaaaa; + color: #aaa; } .openerp .oe_error_detail hr { display: block; @@ -554,11 +552,11 @@ -webkit-border-radius: 3px; border-radius: 3px; background: #f0f0fa; - color: #4c4c4c; + color: #4C4C4C; } .openerp .oe_tag_dark { - background: #7c7bad; - color: #eeeeee; + background: #7C7BAD; + color: #eee; } .openerp .oe_form_field_radio.oe_horizontal { white-space: nowrap; @@ -606,7 +604,7 @@ font-size: 12px; } .openerp.oe_tooltip .oe_tooltip_string { - color: #ffdd55; + color: #FD5; font-weight: bold; font-size: 13px; } @@ -630,7 +628,7 @@ color: white; } .openerp.oe_tooltip .oe_tooltip_close:hover { - color: #999999; + color: #999; cursor: pointer; } .openerp.oe_tooltip .oe_tooltip_message { @@ -660,13 +658,13 @@ } .openerp .oe_notebook > li > a { display: block; - color: gray; + color: #808080; } .openerp .oe_notebook > li.ui-tabs-active > a { color: #4c4c4c; } .openerp .oe_notebook { - border-color: #dddddd; + border-color: #ddd; border-style: solid; border-width: 0 0 1px; } @@ -684,16 +682,16 @@ } .openerp .oe_notebook > li > a:hover { text-decoration: none; - background-color: #eeeeee; - border-color: #eeeeee #eeeeee #dddddd; + background-color: #eee; + border-color: #eee #eee #ddd; } .openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active { border-bottom: none; padding-bottom: 1px; } .openerp .oe_notebook > li.ui-state-active > a, .openerp .oe_notebook > li.ui-state-active > a:hover { - background-color: white; - border: 1px solid #dddddd; + background-color: #ffffff; + border: 1px solid #ddd; border-bottom-color: transparent; cursor: default; } @@ -714,7 +712,7 @@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: #2b2b2b; + color: #2B2B2B; font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { @@ -840,10 +838,10 @@ top: 0; right: 50%; padding: 4px 12px; - background: #a61300; + background: #A61300; color: white; text-align: center; - border: 1px solid #990000; + border: 1px solid #900; border-top: none; -moz-border-radius-bottomright: 8px; -moz-border-radius-bottomleft: 8px; @@ -878,12 +876,12 @@ width: 32px; } .openerp .oe_database_manager { - background: white; - color: black; + background: #fff; + color: #000; text-align: left; } .openerp .oe_database_manager .oe_database_manager_menu { - color: black; + color: #000; } .openerp .oe_webclient { width: 100%; @@ -901,12 +899,12 @@ background-color: #dc5f59; color: #eeeeee; background-color: #be4343; - background-image: -webkit-gradient(linear, left top, left bottom, from(#fc8787), to(maroon)); - background-image: -webkit-linear-gradient(top, #fc8787, maroon); - background-image: -moz-linear-gradient(top, #fc8787, maroon); - background-image: -ms-linear-gradient(top, #fc8787, maroon); - background-image: -o-linear-gradient(top, #fc8787, maroon); - background-image: linear-gradient(to bottom, #fc8787, #800000); + background-image: -webkit-gradient(linear, left top, left bottom, from(#FC8787), to(#800000)); + background-image: -webkit-linear-gradient(top, #FC8787, #800000); + background-image: -moz-linear-gradient(top, #FC8787, #800000); + background-image: -ms-linear-gradient(top, #FC8787, #800000); + background-image: -o-linear-gradient(top, #FC8787, #800000); + background-image: linear-gradient(to bottom, #FC8787, #800000); } .openerp .navbar .oe_topbar_anonymous_login a { display: block; @@ -936,7 +934,7 @@ line-height: 20px; height: 20px; text-decoration: none; - color: #eeeeee; + color: #eee; vertical-align: top; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-transition: all 0.2s ease-out; @@ -969,9 +967,9 @@ } .openerp .navbar .dropdown_menu { top: 32px; - background: #333333; + background: #333; background: rgba(37, 37, 37, 0.9); - border-color: #999999; + border-color: #999; border-color: rgba(0, 0, 0, 0.2); border-style: solid; border-width: 0 2px 1px; @@ -987,7 +985,7 @@ padding: 3px 12px; } .openerp .navbar .dropdown_menu li a { - color: #eeeeee; + color: #eee; } .openerp .navbar .dropdown_menu li:hover { background-color: #212121; @@ -1029,7 +1027,7 @@ line-height: 20px; height: 20px; text-decoration: none; - color: #eeeeee !important; + color: #eee !important; vertical-align: top; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-transition: all 0.2s ease-out; @@ -1098,7 +1096,7 @@ width: 100%; display: none; text-align: center; - color: #eeeeee; + color: #eee; background: rgba(37, 37, 37, 0.9); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -1126,7 +1124,7 @@ .openerp .oe_secondary_menu_section { font-weight: bold; margin-left: 8px; - color: #7c7bad; + color: #7C7BAD; } .openerp .oe_secondary_submenu { margin-bottom: 10px !important; @@ -1184,7 +1182,7 @@ border-radius: 0 0 2px 2px; } .openerp .oe_about a { - color: #7c7bad; + color: #7C7BAD; } .openerp .oe_about a:hover { text-decoration: underline; @@ -1209,14 +1207,14 @@ background-image: -ms-linear-gradient(top, #b41616, #600606); background-image: -o-linear-gradient(top, #b41616, #600606); background-image: linear-gradient(to bottom, #b41616, #600606); - color: #eeeeee; + color: #eee; padding: 0 16px; -moz-border-radius: 0 0 2px 2px; -webkit-border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px; } .openerp .oe_about .oe_bottom a { - color: #eeeeee; + color: #eee; } .openerp a.oe_form_uri:hover { text-decoration: underline; @@ -1226,7 +1224,7 @@ height: 100%; } .openerp .oe_application a { - color: #7c7bad; + color: #7C7BAD; } .openerp .oe_application > div { height: 100%; @@ -1287,7 +1285,7 @@ line-height: 30px; } .openerp .oe_view_manager table.oe_view_manager_header h2 a { - color: #7c7bad; + color: #7C7BAD; } .openerp .oe_view_manager table.oe_view_manager_header .oe_dropdown_menu { line-height: normal; @@ -1313,13 +1311,13 @@ text-decoration: none; } .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group .active { - background: #999999; + background: #999; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; } .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group .active a { - color: white; + color: #fff; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); } .openerp .oe_view_manager table.oe_view_manager_header .oe_view_manager_buttons { @@ -1415,13 +1413,13 @@ text-decoration: none; } .openerp .oe_pager_group .active { - background: #999999; + background: #999; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; } .openerp .oe_pager_group .active a { - color: white; + color: #fff; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); } .openerp .oe_list_pager.oe_list_pager_single_page .oe_pager_group { @@ -1517,11 +1515,11 @@ right: 0; height: 24px; padding: 0 7px 0 4px; - color: #cccccc; + color: #ccc; cursor: pointer; } .openerp .oe_searchview .oe_searchview_unfold_drawer:hover { - color: #999999; + color: #999; } .openerp .oe_searchview .oe_searchview_unfold_drawer:before { position: absolute; @@ -1532,7 +1530,7 @@ display: inline-block; content: ""; vertical-align: top; - border-top: 5px solid #4c4c4c; + border-top: 5px solid #4C4C4C; border-left: 5px solid transparent; border-right: 5px solid transparent; filter: alpha(opacity=50); @@ -1618,7 +1616,7 @@ .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value { border-left: 1px solid #afafb6; text-shadow: 0 1px 1px white; - color: #4c4c4c; + color: #4C4C4C; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value:last-child { padding-right: 16px; @@ -1668,7 +1666,7 @@ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); } .openerp .oe_searchview .oe_searchview_drawer > div { - border-top: 1px solid #cccccc; + border-top: 1px solid #ccc; margin: 0; padding: 8px; } @@ -1678,7 +1676,7 @@ } .openerp .oe_searchview .oe_searchview_drawer h3 { margin: 8px 4px 4px 0px; - color: #7c7bad; + color: #7C7BAD; font-size: 13px; } .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * { @@ -1908,8 +1906,8 @@ display: inline-block; } .openerp .oe_form_invalid input, .openerp .oe_form_invalid select, .openerp .oe_form_invalid textarea { - background-color: #ff6666 !important; - border: 1px solid #dd0000 !important; + background-color: #F66 !important; + border: 1px solid #D00 !important; } .openerp .oe_view_manager_current .oe_form_editable .oe_highlight { color: #404040; @@ -2003,7 +2001,7 @@ } .openerp .oe_application .oe_form_sheetbg { background: url(/web/static/src/img/form_sheetbg.png); - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #ddd; } .openerp .oe_application .oe_form_sheetbg .oe_subtotal_footer label { font-weight: bold; @@ -2063,7 +2061,7 @@ padding: 16px 16px 48px; } .openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol { - color: #aaaaaa; + color: #aaa; max-width: 650px; } .openerp .oe_form div.oe_form_configuration label { @@ -2104,8 +2102,8 @@ font-weight: normal !important; } .openerp .oe_form .oe_form_box_info { - background: #ffee99; - border-bottom: 1px solid #ccbb66; + background: #fe9; + border-bottom: 1px solid #cb6; padding: 4px; } .openerp .oe_form .oe_form_box_info > p { @@ -2113,7 +2111,7 @@ } .openerp .oe_form .oe_form_box_warning { background: #bd362f; - border-bottom: 1px solid #990000; + border-bottom: 1px solid #900; padding: 4px; } .openerp .oe_form .oe_form_box_warning * { @@ -2127,7 +2125,7 @@ margin: 2px; } .openerp .oe_form td.oe_form_group_cell_label { - border-right: 1px solid #dddddd; + border-right: 1px solid #ddd; padding: 2px 0px; } .openerp .oe_form td.oe_form_group_cell_label label { @@ -2152,7 +2150,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkgreen; + color: darkGreen; vertical-align: top; position: relative; top: -4px; @@ -2165,13 +2163,13 @@ font-weight: bold; font-size: 20px; margin: 15px 0px 10px 0px; - color: #7c7bad; + color: #7C7BAD; } .openerp .oe_horizontal_separator:empty { height: 5px; } .openerp .oe_vertical_separator { - border-left: 1px solid #666666; + border-left: 1px solid #666; padding: 0 4px 0 4px; } .openerp .oe_form_field_progressbar { @@ -2185,7 +2183,7 @@ -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; - border: 1px solid #999999; + border: 1px solid #999; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -2266,8 +2264,8 @@ font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; } .openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] { - background: #e5e5e5 !important; - color: #666666; + background: #E5E5E5 !important; + color: #666; } .openerp .oe_form textarea[disabled] { border: none; @@ -2281,7 +2279,7 @@ color: #4c4c4c; } .openerp .oe_form textarea.oe_inline[disabled] { - border-left: 8px solid #eeeeee; + border-left: 8px solid #eee; } .openerp .oe_form .oe_form_field_url button img { vertical-align: top; @@ -2301,11 +2299,11 @@ display: inline-block; } .openerp .oe_form .oe_form_required input:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required select:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required textarea:not([disabled]):not([readonly]) { - background-color: #d2d2ff !important; + background-color: #D2D2FF !important; } .openerp .oe_form .oe_form_invalid input, .openerp .oe_form .oe_form_invalid select, .openerp .oe_form .oe_form_invalid textarea { - background-color: #ff6666 !important; - border: 1px solid #dd0000 !important; + background-color: #F66 !important; + border: 1px solid #D00 !important; } .openerp .oe_form .oe_input_icon { cursor: pointer; @@ -2395,7 +2393,7 @@ width: 100%; display: none; text-align: center; - color: #eeeeee; + color: #eee; background: rgba(37, 37, 37, 0.9); -moz-border-radius: 3px 3px 0 0; -webkit-border-radius: 3px 3px 0 0; @@ -2432,7 +2430,7 @@ .openerp .oe_fileupload .oe_add button.oe_attach { width: 24px; background: transparent; - color: #7c7bad; + color: #7C7BAD; box-shadow: none; border: none; text-shadow: none; @@ -2451,7 +2449,7 @@ cursor: pointer; } .openerp .oe_fileupload .oe_add .oe_attach_label { - color: #7c7bad; + color: #7C7BAD; margin-left: -3px; } .openerp .oe_fileupload .oe_attachments { @@ -2477,7 +2475,7 @@ background: white; } .openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(even) { - background: #f4f5fa; + background: #F4F5FA; } .openerp .oe_form_field_many2one { display: inline-block; @@ -2638,7 +2636,7 @@ background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } .openerp ul.oe_form_status_clickable li > .label { - color: #7c7bad; + color: #7C7BAD; } .openerp ul.oe_form_status_clickable li.oe_active:hover { background-color: #3a699f; @@ -2708,7 +2706,7 @@ background-color: #d2d2ff; } .openerp .oe_form_editable .oe_list_editable .oe_list_content td.oe_readonly { - background-color: #eeeeee; + background-color: #eee; } .openerp .oe_list_editable .oe_list_content td.oe_list_field_cell { padding: 4px 6px 3px; @@ -2745,7 +2743,7 @@ -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; - border: 1px solid #aaaaff; + border: 1px solid #aaf; margin: 0; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field select { @@ -2837,7 +2835,7 @@ } .openerp .oe_list_content > thead { border-bottom: 2px solid #cacaca; - background: #eeeeee; + background: #eee; vertical-align: top; } .openerp .oe_list_content td, .openerp .oe_list_content th { @@ -2856,7 +2854,7 @@ margin-top: 7px; border-width: 0 4px 4px; border-style: solid; - border-color: black transparent; + border-color: #000 transparent; visibility: hidden; } .openerp .oe_list_content th.sortup div:after { @@ -2873,7 +2871,7 @@ border-bottom: none; border-left: 4px solid transparent; border-right: 4px solid transparent; - border-top: 4px solid black; + border-top: 4px solid #000; visibility: visible; -moz-box-shadow: none; -webkit-box-shadow: none; @@ -2886,7 +2884,7 @@ } .openerp .oe_list_content > tbody > tr { height: 27px; - border-top: 1px solid #dddddd; + border-top: 1px solid #ddd; } .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell { padding: 3px 6px; @@ -2923,7 +2921,7 @@ .openerp .oe_list_content > tfoot { border-top: 2px solid #cacaca; border-bottom: 1px solid #cacaca; - background: #eeeeee; + background: #eee; font-weight: bold; } .openerp .oe_list_content .numeric { @@ -2954,7 +2952,7 @@ .openerp .oe_list_content td.oe_list_field_handle .oe_list_handle:before { font: 18px "entypoRegular"; content: "}"; - color: #e0e0e0; + color: #E0E0E0; } .openerp .oe_list_content .oe_list_field_progressbar progress { width: 100%; @@ -3066,8 +3064,8 @@ background: rgba(0, 0, 0, 0.3) !important; } .openerp .navbar-default .navbar-nav .dropdown > a .caret { - border-top-color: #777777 !important; - border-bottom-color: #777777 !important; + border-top-color: #777 !important; + border-bottom-color: #777 !important; } .openerp .navbar-nav li a { padding: 4px 32px 4px 12px; @@ -3144,7 +3142,7 @@ -webkit-margin-end: 0px; } .openerp pre { - background-color: white; + background-color: #FFFFFF; border: none; padding: 10px 0 3px 0; } @@ -3188,9 +3186,9 @@ -moz-border-radius: 15px; -webkit-border-radius: 15px; border-radius: 15px; - -moz-box-shadow: 0 0 5px 5px #999999; - -webkit-box-shadow: 0 0 5px 5px #999999; - box-shadow: 0 0 5px 5px #999999; + -moz-box-shadow: 0 0 5px 5px #999; + -webkit-box-shadow: 0 0 5px 5px #999; + box-shadow: 0 0 5px 5px #999; } div.ui-widget-overlay { @@ -3229,7 +3227,7 @@ div.ui-widget-overlay { background: #f0f0fa; } .ui-menu .ui-menu-item a.ui-state-hover, .ui-menu .ui-menu-item a.ui-state-active { - background: #7c7bad; + background: #7C7BAD; } .ui-corner-all { @@ -3243,7 +3241,7 @@ div.ui-widget-overlay { } body.oe_single_form { - background: #eeeeee url(/web/static/src/img/form_sheetbg.png); + background: #eee url(/web/static/src/img/form_sheetbg.png); height: 100%; } body.oe_single_form .oe_single_form_logo { @@ -3277,7 +3275,7 @@ body.oe_single_form .oe_single_form_container { width: 80px; } .openerp_ie .oe_form_field_boolean input { - background: white; + background: #fff; } .openerp_ie .db_option_table .oe_form_field_selection { width: auto; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 300669c0ed5..843e7c3b0d5 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -55,7 +55,7 @@ $sheet-padding: 16px background-image: -webkit-radial-gradient(circle, $gradient) background-image: -moz-radial-gradient($gradient) background-image: -ms-radial-gradient($gradient) - background-image: radial-gradient($gradient) + background-image: radial-gradient(circle, $gradient) @mixin radius($radius: 5px) -moz-border-radius: $radius diff --git a/addons/web_calendar/static/src/css/Makefile b/addons/web_calendar/static/src/css/Makefile deleted file mode 100755 index 96eee92d6ca..00000000000 --- a/addons/web_calendar/static/src/css/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -web_fullcalendar.css: web_fullcalendar.sass - sass --trace -t expanded web_fullcalendar.sass web_fullcalendar.css - - \ No newline at end of file diff --git a/addons/web_kanban/static/src/css/Makefile b/addons/web_kanban/static/src/css/Makefile deleted file mode 100644 index cae8f74448f..00000000000 --- a/addons/web_kanban/static/src/css/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -kanban.css: kanban.sass - sass -t expanded kanban.sass kanban.css - diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 6090f52dbf6..7ac57f0ecfc 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -1,4 +1,3 @@ -@charset "utf-8"; .openerp .oe_kanban_view { background: white; height: inherit; @@ -71,7 +70,7 @@ word-wrap: break-word; } .openerp .oe_kanban_view .oe_kanban_content .oe_star_on, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off { - color: #cccccc; + color: #ccc; text-shadow: 0 0 2px black; vertical-align: top; position: relative; @@ -88,7 +87,7 @@ } .openerp .oe_kanban_view .oe_kanban_button_new { color: white; - background: #dc5f59; + background: #DC5F59; } .openerp .oe_kanban_view .oe_kanban_groups { height: inherit; @@ -161,7 +160,7 @@ } .openerp .oe_kanban_view .oe_form .oe_kanban_column { padding: 0px; - background: white; + background: #ffffff; } .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column, .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column_cards { height: 100%; @@ -247,7 +246,7 @@ -box-shadow: none; } .openerp .oe_kanban_view .oe_kanban_quick_create input:focus { - border: 1px solid #a6a6fe; + border: 1px solid #A6A6FE; -moz-box-shadow: 0px 0px 7px rgba(0, 133, 255, 0.3) inset; -webkit-box-shadow: 0px 0px 7px rgba(0, 133, 255, 0.3) inset; -box-shadow: 0px 0px 7px rgba(0, 133, 255, 0.3) inset; @@ -320,15 +319,15 @@ -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } .openerp .oe_kanban_view .oe_kanban_box { - background: white; - border: 2px solid #cccccc; + background: #FFF; + border: 2px solid #CCC; border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; margin-bottom: 5px; } .openerp .oe_kanban_view .oe_kanban_box_header { - border-bottom: 1px solid #cccccc; + border-bottom: 1px solid #CCC; } .openerp .oe_kanban_view .oe_kanban_title { font-size: 95%; @@ -387,8 +386,8 @@ border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; - color: black; - text-shadow: 0 1px white; + color: #000000; + text-shadow: 0 1px #fff; padding: 0 4px; font-size: 85%; margin: 1px; @@ -413,10 +412,10 @@ cursor: move; } .openerp .oe_kanban_view .oe_kanban_color_border { - border-color: #cccccc; + border-color: #CCCCCC; } .openerp .oe_kanban_view .oe_kanban_color_border { - border-color: #cccccc; + border-color: #CCCCCC; } .openerp .oe_kanban_view .oe_kanban_tooltip ul, .openerp .oe_kanban_view ul.oe_kanban_tooltip { padding: 0 0 4px 0; @@ -448,10 +447,10 @@ border-radius: 4px; } .openerp .oe_kanban_view .oe_kanban_card:not(.ui-sortable-helper):hover, .openerp .oe_kanban_view .oe_kanban_quick_create:not(.ui-sortable-helper):hover { - border: 1px solid #7c7bad; - -moz-box-shadow: 0 0 4px #7c7bad; - -webkit-box-shadow: 0 0 4px #7c7bad; - -box-shadow: 0 0 4px #7c7bad; + border: 1px solid #7C7BAD; + -moz-box-shadow: 0 0 4px #7C7BAD; + -webkit-box-shadow: 0 0 4px #7C7BAD; + -box-shadow: 0 0 4px #7C7BAD; } .openerp .oe_kanban_view .oe_kanban_card:not(.ui-sortable-helper):hover .oe_dropdown_kanban > span, .openerp .oe_kanban_view .oe_kanban_quick_create:not(.ui-sortable-helper):hover .oe_dropdown_kanban > span { visibility: visible; @@ -486,9 +485,9 @@ .openerp .oe_kanban_view .oe_kanban_footer_left > span { margin-top: 2px; display: inline-block; - background: #e6e6e6; - border: 1px solid #b9b9b9; - color: #666666; + background: #E6E6E6; + border: 1px solid #B9B9B9; + color: #666; padding: 0 2px; line-height: 16px; -moz-border-radius: 3px; @@ -530,10 +529,10 @@ -webkit-border-radius: 6px; border-radius: 6px; background-position: center center; - background-image: -webkit-radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%); - background-image: -moz-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%); - background-image: -ms-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%); - background-image: radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%); + background-image: -webkit-radial-gradient(circle, #eee 0%, #ccc 40%, #bbb 100%); + background-image: -moz-radial-gradient(#eee 0%, #ccc 40%, #bbb 100%); + background-image: -ms-radial-gradient(#eee 0%, #ccc 40%, #bbb 100%); + background-image: radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%); } .openerp .oe_kanban_view .oe_kanban_status_green { background: green; @@ -541,7 +540,7 @@ background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44aa44 40%, #339933 100%); background-image: -moz-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%); background-image: -ms-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%); - background-image: radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%); + background-image: radial-gradient(circle, #55dd55 0%, #44aa44 40%, #339933 100%); } .openerp .oe_kanban_view .oe_kanban_status_red { background: red; @@ -549,10 +548,10 @@ background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%); background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%); background-image: -ms-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%); - background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%); + background-image: radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%); } .openerp .oe_kanban_view .oe_kanban_text_red { - color: #a61300; + color: #A61300; font-weight: bold; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -604,52 +603,52 @@ border: 1px solid gray !important; } .openerp .oe_kanban_view .oe_kanban_colorpicker li:first-child a { - border: 1px solid #cccccc; + border: 1px solid #ccc; } .openerp .oe_kanban_view .oe_kanban_color_0 { - background-color: white; + background-color: #FFFFFF; color: #5a5a5a; } .openerp .oe_kanban_view .oe_kanban_color_1 { - background-color: #cccccc; + background-color: #CCCCCC; color: #424242; } .openerp .oe_kanban_view .oe_kanban_color_2 { - background-color: #ffc7c7; + background-color: #FFC7C7; color: #7a3737; } .openerp .oe_kanban_view .oe_kanban_color_3 { - background-color: #fff1c7; + background-color: #FFF1C7; color: #756832; } .openerp .oe_kanban_view .oe_kanban_color_4 { - background-color: #e3ffc7; + background-color: #E3FFC7; color: #5d6937; } .openerp .oe_kanban_view .oe_kanban_color_5 { - background-color: #c7ffd5; + background-color: #C7FFD5; color: #1a7759; } .openerp .oe_kanban_view .oe_kanban_color_6 { - background-color: #c7ffff; + background-color: #C7FFFF; color: #1a5d83; } .openerp .oe_kanban_view .oe_kanban_color_7 { - background-color: #c7d5ff; + background-color: #C7D5FF; color: #3b3e75; } .openerp .oe_kanban_view .oe_kanban_color_8 { - background-color: #e3c7ff; + background-color: #E3C7FF; color: #4c3668; } .openerp .oe_kanban_view .oe_kanban_color_9 { - background-color: #ffc7f1; + background-color: #FFC7F1; color: #6d2c70; } .openerp .oe_form .oe_kanban_view .oe_kanban_column, .openerp .oe_form .oe_kanban_view .oe_kanban_group_header { padding: 0px; - background: white; + background: #ffffff; } .openerp .oe_popup_form .oe_kanban_buttons .oe_highlight { diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 8d2174bc22e..bf232b9e736 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -15,7 +15,7 @@ background-image: -webkit-radial-gradient(circle, $gradient) background-image: -moz-radial-gradient($gradient) background-image: -ms-radial-gradient($gradient) - background-image: radial-gradient($gradient) + background-image: radial-gradient(circle, $gradient) @mixin radius($radius: 5px) -moz-border-radius: $radius diff --git a/addons/website/static/src/css/Makefile b/addons/website/static/src/css/Makefile deleted file mode 100644 index 18ce9e4154e..00000000000 --- a/addons/website/static/src/css/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -sass: - sass -t expanded --compass --unix-newlines --watch website.sass:website.css& - sass -t expanded --compass --unix-newlines --watch editor.sass:editor.css& - sass -t expanded --compass --unix-newlines --watch snippets.sass:snippets.css& diff --git a/addons/website_blog/static/src/css/Makefile b/addons/website_blog/static/src/css/Makefile deleted file mode 100644 index fdfe9f98879..00000000000 --- a/addons/website_blog/static/src/css/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -sass: - sass --compass --unix-newlines -t expanded website_blog.sass:website_blog.css diff --git a/addons/website_payment/static/src/css/Makefile b/addons/website_payment/static/src/css/Makefile deleted file mode 100644 index 7f7f16d3616..00000000000 --- a/addons/website_payment/static/src/css/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -sass: - sass --trace -t expanded website_payment.sass:website_payment.css diff --git a/addons/website_sale/static/src/css/Makefile b/addons/website_sale/static/src/css/Makefile deleted file mode 100644 index 69799f86913..00000000000 --- a/addons/website_sale/static/src/css/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -sass: - sass -t expanded --unix-newlines --watch website_sale.sass:website_sale.css& - sass -t expanded --unix-newlines --watch website_mail.sass:website_mail.css& diff --git a/openerp/addons/base/static/src/css/Makefile b/openerp/addons/base/static/src/css/Makefile deleted file mode 100644 index cf91573f741..00000000000 --- a/openerp/addons/base/static/src/css/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -sass: - sass -t expanded --compass --watch --unix-newlines *.sass