app/assets/stylesheets/application2.scss in cg_app_base-1.0.52 vs app/assets/stylesheets/application2.scss in cg_app_base-1.0.54

- old
+ new

@@ -17,38 +17,119 @@ color: #333; label { font-size: 14px !important; } + #modal #checkerMail label.control-label { + display: none !important; + } } -tr.text-muted a { color: #18354c !important; } -tr.text-primary a { color: #428bca !important; } -tr.text-warning a { color: #efac4f !important; } -tr.text-danger a { color: #940004 !important; } -tr.text-success a { color: #5cb85c !important; } -tr.text-info a { color: #9564e2 !important; } -tr.text-muted a { color: #999999 !important; } -tr.text-pink a { color: #c44a83 !important; } -tr.text-banana a { color: #fcd052 !important; } -tr.text-darkOrange a { color:#f56e00 !important;} -tr.text-darkColor a { color: #2b2d30 !important; } -tr.text-fb a { color: #3d579d !important; } +.page-header { + min-height: 66px; -.label-muted { background-color: #18354c !important; } -.label-primary { background-color: #428bca !important; } -.label-warning { background-color: #efac4f !important; } -.label-danger { background-color: #940004 !important; } -.label-success { background-color: #5cb85c !important; } -.label-info { background-color: #9564e2 !important; } -.label-muted { background-color: #999999 !important; } -.label-pink { background-color: #c44a83 !important; } -.label-banana { background-color: #fcd052 !important; } -.label-darkOrange { background-color:#f56e00 !important;} -.label-darkColor { background-color: #2b2d30 !important; } -.label-fb { background-color: #3d579d !important; } + > h1 { + font-size: 24px; + } +} +tr.text-muted a { + color: #18354c !important; +} + +tr.text-primary a { + color: #428bca !important; +} + +tr.text-warning a { + color: #efac4f !important; +} + +tr.text-danger a { + color: #940004 !important; +} + +tr.text-success a { + color: #5cb85c !important; +} + +tr.text-info a { + color: #9564e2 !important; +} + +tr.text-muted a { + color: #999999 !important; +} + +tr.text-pink a { + color: #c44a83 !important; +} + +tr.text-banana a { + color: #fcd052 !important; +} + +tr.text-darkOrange a { + color: #f56e00 !important; +} + +tr.text-darkColor a { + color: #2b2d30 !important; +} + +tr.text-fb a { + color: #3d579d !important; +} + +.label-muted { + background-color: #18354c !important; +} + +.label-primary { + background-color: #428bca !important; +} + +.label-warning { + background-color: #efac4f !important; +} + +.label-danger { + background-color: #940004 !important; +} + +.label-success { + background-color: #5cb85c !important; +} + +.label-info { + background-color: #9564e2 !important; +} + +.label-muted { + background-color: #999999 !important; +} + +.label-pink { + background-color: #c44a83 !important; +} + +.label-banana { + background-color: #fcd052 !important; +} + +.label-darkOrange { + background-color: #f56e00 !important; +} + +.label-darkColor { + background-color: #2b2d30 !important; +} + +.label-fb { + background-color: #3d579d !important; +} + .label { font-size: 100% !important; } .quote_highlight { @@ -62,10 +143,17 @@ .nav-tabs, .nav-pills { margin-top: 5px; margin-bottom: 5px; } +.row-eq-height { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; +} + header .navbar { margin: 0; padding: 0 0px; background-color: #f34541; border: none; @@ -81,10 +169,12 @@ overflow: visible; } .main-nav-opened #main-nav-bg { width: 175px; + background-color: #FBFBFB !important; + border-right: 0px solid #ffffff !important; } .main-nav-opened #content { margin-left: 175px; } @@ -149,13 +239,12 @@ border-radius: 0; } #content { margin-left: 175px; - background: #fbfbfb; + background: #ffffff; min-width: 276px; - background: #fbfbfb; } /* end of navigation side */ .box .box-header { @@ -397,10 +486,18 @@ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); } +.box .box-content-no-border { + padding: 10px; + margin-bottom: 0px; + border: 0px solid #dddddd; + background: white; + display: block; +} + .date-box-content { padding: 0; margin: 0px; background: white; display: block; @@ -518,11 +615,11 @@ cursor: default; border: none; } .datepicker table tr td.old, .datepicker table tr td.new { - color: rgba(0,0,0,0.85); + color: rgba(0, 0, 0, 0.85); opacity: 0.4; } .datepicker table tr td.admin { background: none !important; @@ -829,12 +926,12 @@ } } div.invoiceTitle, span.invoiceTitle { text-align: right !important; - border: 0px solid rgba(255,255,255,1) !important; - background-color: rgba(255,255,255,1) !important; + border: 0px solid rgba(255, 255, 255, 1) !important; + background-color: rgba(255, 255, 255, 1) !important; } .border-cod { border: 1px solid #d9534f !important; } @@ -842,14 +939,14 @@ .box-cod { background-color: #d9534f !important; } div.invoiceBkg, span.invoiceBkg { - border-top: 0px solid rgba(255,255,255,1) !important; - border-bottom: 0px solid rgba(255,255,255,1) !important; - border-right: 0px solid rgba(255,255,255,1) !important; - background-color: rgba(255,255,255,1) !important; + border-top: 0px solid rgba(255, 255, 255, 1) !important; + border-bottom: 0px solid rgba(255, 255, 255, 1) !important; + border-right: 0px solid rgba(255, 255, 255, 1) !important; + background-color: rgba(255, 255, 255, 1) !important; } #contracts { > tbody { > tr.odd:hover { @@ -868,11 +965,11 @@ .to-be-deleted { background-color: red; } .alert { - margin-top:20px; + margin-top: 20px; width: 100%; position: relative; } .remove { @@ -1007,19 +1104,32 @@ .searchblock { background-color: #0163AC; padding: 14px; } +.searchblock label { + color: #ffffff; + font-size: 0.9em !important; + font-weight: 400; + line-height: 2em; +} + /* navigation onglets */ .nav > li > a { position: relative; display: block; - padding: 10px 15px; - font-size: 1.1em; + padding: 7px 9px; + font-size: 1em; } +/* historiqueux */ + +.timeline li .title, .timeline li .title small { + font-family: 'Roboto Condensed', sans-serif; +} + @media screen and (min-width: 768px) { #modalstatus { float: right; margin-right: 13px; @@ -1178,21 +1288,21 @@ margin-top: 0px; } .dd-handle { text-transform: uppercase; - background-color: rgba(255,255,255,1); + background-color: rgba(255, 255, 255, 1); display: inline-block; width: 100%; padding: 6px; margin: 2px 0; font-size: 75%; font-weight: 400; &:hover { color: #000000; - background-color: rgba(240,240,240,1); + background-color: rgba(240, 240, 240, 1); -webkit-transition: all 500ms ease 0.1s; -moz-transition: all 500ms ease 0.1s; -o-transition: all 500ms ease 0.1s; transition: all 500ms ease 0.1s; } @@ -1241,29 +1351,16 @@ /* projections zone */ #projections { - .autoheight { - height: auto; - } - .fullheight { - height: 100%; - } - .fix-height155 { - min-height: 155px; - } - .fix-height275 { - min-height: 275px; - } .bigtitle { font-size: 1.2em; font-weight: bold; } .title { - margin-left: 6px; margin-top: 6px; a { color: rgba(30, 30, 30, 1.0); @@ -1325,39 +1422,82 @@ } table { width: 100%; + .table { + width: 100%; + } + thead { - background-color: rgba(30, 30, 30, 1.0); + background-color: rgba(30, 30, 30, 0.7); + color: #ffffff; + + > tr { + border-bottom: 1px solid #dbdbdb; + + > th { + font-size: 60%; + font-weight: 400; + border: none; + float: left; + } + } } tbody { - } - tr { - width: 100%; - } + > tr { + width: 100%; + margin: 0; + > td { + margin: 0; + border: 0; + > table { + margin: 0; + padding: 0; + //width: 100%; + > tr { + //width: 100%; + > td { + //width: 100% !important; + > tr { + border: 0px solid #ffffff; + //width: 100%; - th.bigtitleblack { - color: rgba(255, 255, 255, 1.0); - text-align: left; - border: none; + > td { + font-size: 0.8em; + } + } + } + } + } + } + } } - th { - font-size: 70%; - font-weight: 400; - text-align: left; - border: none; + .blockForecast { + } - td { - font-size: 0.8em; + .odds { + background-color: #d7d7d7 !important; + //border-top: 2px solid #5B5B5B !important; + //border-bottom: 2px solid #5B5B5B !important; } + .even { + background-color: #ebebeb !important; + //border-top: 2px solid #5B5B5B !important; + //border-bottom: 2px solid #5B5B5B !important; + } } + .label { + color: #ffffff; + font-size: 70% !important; + display: inline-block; + } .bigtitlewhite { color: rgba(0, 0, 0, 1.0); text-align: center; font-size: 0.83em; @@ -1386,12 +1526,11 @@ } .projectionsbox { margin: 0 0 8px 0; width: 100%; - min-height: 250px; - //min-width: 150px; + height: 100%; float: left; max-width: 277.8px; overflow: hidden; } @@ -1632,11 +1771,11 @@ margin: 0px !important; padding: 3px !important; } p.titletable { - font-size: 115%; + font-size: 108%; text-align: center; margin: 0px; padding: 0px; bottom: 0px; } @@ -1644,13 +1783,17 @@ .table thead > tr > th, .table thead > tr > td, .table tbody > tr > th, .table tbody > tr > td, .table tfoot > tr > th, .table tfoot > tr > td { padding: 3px; line-height: 1.428571429; vertical-align: top; border-top: 1px solid #dddddd; - font-size: 0.88em; + font-size: 0.8em; text-overflow: ellipsis; } +#projections .table thead > tr > th, #projections .table thead > tr > td, #projections .table tbody > tr > th, #projections .table tbody > tr > td, #projections .table tfoot > tr > th, #projections .table tfoot > tr > td { + font-size: 0.845em; + width: 50%; +} @media print { .no-print, .no-print * { display: none !important; } @@ -1670,6 +1813,51 @@ border-left: 1px solid rgba(30, 30, 30, 0.2); } .white-space-normal { white-space: normal !important; +} + +.row-eq-height { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; +} + +.col-special { + position: relative; + min-height: 1px; + margin: 0 2px 2px 0; + float: left; + width: 19.12%; + + &:first-child { + margin-left: 15px !important; + } + &:last-child { + margin-right: 15px !important; + } +} + +/* survey */ +#surveyGrid { + + table { + + tr { + + td { + + > a { + cursor: pointer !important; + + &:hover { + color: #940004; + text-decoration: none; + } + } + } + } + } + } \ No newline at end of file