Self hosted FLOSS fitness/workout, nutrition and weight tracker
Lint CSS files
Roland4e054583e3b9
diff --git a/.github/linters/.stylelintrc.json b/.github/linters/.stylelintrc.jsonnew file mode 100644index 000000000..13d3c0203--- /dev/null+++ b/.github/linters/.stylelintrc.json@@ -0,0 +1,6 @@+{+ "extends": "stylelint-config-standard",+ "rules": {+ "no-descending-specificity": null+ }+}diff --git a/wger/core/static/css/bootstrap-custom.css b/wger/core/static/css/bootstrap-custom.cssindex 42bf95979..cec17a0fb 100644--- a/wger/core/static/css/bootstrap-custom.css+++ b/wger/core/static/css/bootstrap-custom.css@@ -21,61 +21,57 @@***************************************************************/-html {font-family: "Open Sans Light", Arial, Helvetica, sans-serif;-webkit-text-size-adjust: 100%;- -ms-text-size-adjust: 100%;+ -ms-text-size-adjust: 100%;}-body {- font-family: "Open Sans Light", Arial, Helvetica, sans-serif;- background-color: #204A87;+ font-family: "Open Sans Light", Arial, Helvetica, sans-serif;+ background-color: #204a87;}@media (min-width: 992px) {- #main-content{- min-height: 40em;- }+ #main-content {+ min-height: 40em;+ }}.navbar {- margin-bottom: 0px;+ margin-bottom: 0;}-.close{- float:right;- opacity: 0.2;- font-weight: bold;+.close {+ float: right;+ opacity: 0.2;+ font-weight: bold;}--.carousel a:hover, .carousel a:focus {- background-color: transparent;+.carousel a:hover,+.carousel a:focus {+ background-color: transparent;}.wger-list-group-item {- background-color: #F5F5F5;+ background-color: #f5f5f5;}.page-header {- margin-top: 10px;+ margin-top: 10px;}-.application-name {- text-shadow: 2px 3px 3px #292929;- font-family: "Open Sans Bold",Arial,Helvetica,sans-serif;- font-weight: 300;- font-size: 180%;- color: #FFF;- width: 50%;- text-align: center;- margin-top: 0.2em;+ text-shadow: 2px 3px 3px #292929;+ font-family: "Open Sans Bold", Arial, Helvetica, sans-serif;+ font-weight: 300;+ font-size: 180%;+ color: #fff;+ width: 50%;+ text-align: center;+ margin-top: 0.2em;}-/*************************************************************** Off Canvas menu*@@ -83,94 +79,91 @@ body {**************************************************************/html,body {- overflow-x: hidden; /* Prevent scroll on narrow devices */+ overflow-x: hidden; /* Prevent scroll on narrow devices */}#main-template {- overflow-x: hidden;+ overflow-x: hidden;}.sidebar-offcanvas #main-navbar-navigation {- border-color: transparent;- margin-left: -27px;+ border-color: transparent;+ margin-left: -27px;}.row-offcanvas #nav {- overflow-y: scroll;- overflow-x: hidden;- position: absolute;- background-color: #E7E7E7;- padding-left: 1em;- margin-left: -15px;- border-right: 1px solid #888a85;- border-bottom: 1px solid #888a85;- width: 100%;- z-index: 99;+ overflow-y: scroll;+ overflow-x: hidden;+ position: absolute;+ background-color: #e7e7e7;+ padding-left: 1em;+ margin-left: -15px;+ border-right: 1px solid #888a85;+ border-bottom: 1px solid #888a85;+ width: 100%;+ z-index: 99;}@media screen and (max-width: 767px) {- .row-offcanvas {- position: relative;- -webkit-transition: all .25s ease-out;- -moz-transition: all .25s ease-out;- transition: all .25s ease-out;- }-- .row-offcanvas-right {- right: 0;- }-- .row-offcanvas-left {- left: 0;- }-- .row-offcanvas-right- .sidebar-offcanvas {- right: -70%;- }+ .row-offcanvas {+ position: relative;+ -webkit-transition: all 0.25s ease-out;+ -moz-transition: all 0.25s ease-out;+ transition: all 0.25s ease-out;+ }++ .row-offcanvas-right {+ right: 0;+ }++ .row-offcanvas-left {+ left: 0;+ }++ .sidebar-offcanvas {+ position: absolute;+ top: 0;+ width: 70%;+ }- .row-offcanvas-left- .sidebar-offcanvas {- left: -70%;- }+ .row-offcanvas-right .sidebar-offcanvas {+ right: -70%;+ }- .row-offcanvas-right.active {- right: 70%;- }+ .row-offcanvas-left .sidebar-offcanvas {+ left: -70%;+ }- .row-offcanvas-left.active {- left: 70%;- }+ .row-offcanvas-right.active {+ right: 70%;+ }- .sidebar-offcanvas {- position: absolute;- top: 0;- width: 70%;- }+ .row-offcanvas-left.active {+ left: 70%;+ }- /* Increase left padding */- .navbar-nav .open .dropdown-menu .dropdown-header,- .navbar-nav .open .dropdown-menu > li > a {- padding: 5px 15px 5px 35px;- }+ /* Increase left padding */+ .navbar-nav .open .dropdown-menu .dropdown-header,+ .navbar-nav .open .dropdown-menu > li > a {+ padding: 5px 15px 5px 35px;+ }}-/*************************************************************** Alerts**************************************************************/-.label, .badge {- font-weight: normal;+.label,+.badge {+ font-weight: normal;}-/** Make the 'close' button on alerts more prominent*/.alert .close {- opacity: 0.8;- text-decoration: none;+ opacity: 0.8;+ text-decoration: none;}/**************************************************************@@ -180,11 +173,13 @@ body {overflow: hidden;text-overflow: ellipsis;}+.btn-default {color: #333;background-color: #eeeeec;border-color: #ccc;}+.btn-default:hover,.btn-default:focus,.btn-default:active,@@ -194,11 +189,13 @@ body {background-color: #babdb6;border-color: #888a85;}+.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default {background-image: none;}+.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,@@ -217,6 +214,7 @@ fieldset[disabled] .btn-default.active {background-color: #babdb6;border-color: #ccc;}+.btn-default .badge {color: #fff;background-color: #babdb6;@@ -225,24 +223,26 @@ fieldset[disabled] .btn-default.active {/*************************************************************** Headers in sidebar**************************************************************/- #main-sidebar h4, #main-sidebar .h4,- #main-sidebar h5, #main-sidebar .h5,- #main-sidebar h6, #main-sidebar .h6 {- margin-top: 0px;+#main-sidebar h4,+#main-sidebar .h4,+#main-sidebar h5,+#main-sidebar .h5,+#main-sidebar h6,+#main-sidebar .h6 {+ margin-top: 0;}-- /**************************************************************+/*************************************************************** Fix issue with body shifting** Opening modal dialogs shifted the whole body by 15px to the left.* While this appears to be https://github.com/twbs/bootstrap/issues/9855* it doesn't seem to be fixed here. When it does, these fixes can be removed**************************************************************/- body.modal-open {- padding-right: 0 !important;-+body.modal-open {+ padding-right: 0 !important;}+/*body.modal {overflow-y: hidden;diff --git a/wger/core/static/css/metricsgraphics-custom.css b/wger/core/static/css/metricsgraphics-custom.cssindex 6fa2feb48..175a0710d 100644--- a/wger/core/static/css/metricsgraphics-custom.css+++ b/wger/core/static/css/metricsgraphics-custom.css@@ -5,5 +5,5 @@.mg-x-axis text,.mg-y-axis text,.mg-histogram .axis text {- font-size: 1.3rem;-}\ No newline at end of file+ font-size: 1.3rem;+}diff --git a/wger/core/static/css/workout-manager-common.css b/wger/core/static/css/workout-manager-common.cssindex a73817407..ec8fd74d4 100644--- a/wger/core/static/css/workout-manager-common.css+++ b/wger/core/static/css/workout-manager-common.css@@ -21,370 +21,369 @@***************************************************************/--/*************************************************************** Font definitions**************************************************************//* font-face kit by Fonts2u - http://www.fonts2u.com */@font-face {- font-family:"Open Sans Light";- src:url("/static/fonts/OpenSans-Light.eot?") format("eot"),- url("/static/fonts/OpenSans-Light.woff") format("woff"),- url("/static/fonts/OpenSans-Light.ttf") format("truetype"),- url("/static/fonts/OpenSans-Light.svg#OpenSans-Light") format("svg");- font-weight:normal;- font-style:normal;+ font-family: "Open Sans Light";+ src:+ url("/static/fonts/OpenSans-Light.eot?") format("eot"),+ url("/static/fonts/OpenSans-Light.woff") format("woff"),+ url("/static/fonts/OpenSans-Light.ttf") format("truetype"),+ url("/static/fonts/OpenSans-Light.svg#OpenSans-Light") format("svg");+ font-weight: normal;+ font-style: normal;}-@font-face {- font-family:"Open Sans";- src:url("/static/fonts/OpenSans-Regular.eot?") format("eot"),- url("/static/fonts/OpenSans-Regular.woff") format("woff"),- url("/static/fonts/OpenSans-Regular.ttf") format("truetype"),- url("/static/fonts/OpenSans-Regular.svg#OpenSans") format("svg");- font-weight:normal;- font-style:normal;+ font-family: "Open Sans";+ src:+ url("/static/fonts/OpenSans-Regular.eot?") format("eot"),+ url("/static/fonts/OpenSans-Regular.woff") format("woff"),+ url("/static/fonts/OpenSans-Regular.ttf") format("truetype"),+ url("/static/fonts/OpenSans-Regular.svg#OpenSans") format("svg");+ font-weight: normal;+ font-style: normal;}-@font-face {- font-family:"Open Sans Bold";- src:url("/static/fonts/OpenSans-Bold.eot?") format("eot"),- url("/static/fonts/OpenSans-Bold.woff") format("woff"),- url("/static/fonts/OpenSans-Bold.ttf") format("truetype"),- url("/static/fonts/OpenSans-Bold.svg#OpenSans-Bold") format("svg");- font-weight:normal;- font-style:normal;+ font-family: "Open Sans Bold";+ src:+ url("/static/fonts/OpenSans-Bold.eot?") format("eot"),+ url("/static/fonts/OpenSans-Bold.woff") format("woff"),+ url("/static/fonts/OpenSans-Bold.ttf") format("truetype"),+ url("/static/fonts/OpenSans-Bold.svg#OpenSans-Bold") format("svg");+ font-weight: normal;+ font-style: normal;}--/*************************************************************** Styling for the SVG elements on the weight chart**************************************************************/-.axis path, .axis line {- fill: none;- stroke: #000;- shape-rendering: crispEdges;+.axis path,+.axis line {+ fill: none;+ stroke: #000;+ shape-rendering: crispEdges;}.area {- fill: lightsteelblue;+ fill: lightsteelblue;}.line {- fill: none;- stroke: steelblue;- stroke-width: 1.5px;+ fill: none;+ stroke: steelblue;+ stroke-width: 1.5px;}.dot {- fill: white;- stroke: steelblue;- stroke-width: 1.5px;+ fill: white;+ stroke: steelblue;+ stroke-width: 1.5px;}-circle:hover{- fill: #204a87;- stroke: #204a87;+circle {+ cursor: pointer;}-circle{- cursor: pointer;+circle:hover {+ fill: #204a87;+ stroke: #204a87;}.brush .extent {stroke: #fff;- fill-opacity: .125;+ fill-opacity: 0.125;shape-rendering: crispEdges;}/* Color series from d3.scale.category10() */-circle.color-1f77b4:hover-{- fill: #1f77b4;+circle.color-1f77b4:hover {+ fill: #1f77b4;}-circle.color-ff7f0e:hover-{- fill: #ff7f0e;+circle.color-ff7f0e:hover {+ fill: #ff7f0e;}-circle.color-2ca02c:hover-{- fill: #2ca02c;+circle.color-2ca02c:hover {+ fill: #2ca02c;}-circle.color-d62728:hover-{- fill: #d62728;+circle.color-d62728:hover {+ fill: #d62728;}-circle.color-9467bd:hover-{- fill: #9467bd;+circle.color-9467bd:hover {+ fill: #9467bd;}-circle.color-8c564b:hover-{- fill: #8c564b;+circle.color-8c564b:hover {+ fill: #8c564b;}-circle.color-e377c2:hover-{- fill: #e377c2;+circle.color-e377c2:hover {+ fill: #e377c2;}-circle.color-7f7f7f:hover-{- fill: #7f7f7f;+circle.color-7f7f7f:hover {+ fill: #7f7f7f;}-circle.color-bcbd22:hover-{- fill: #bcbd22;+circle.color-bcbd22:hover {+ fill: #bcbd22;}-circle.color-17becf:hover-{- fill: #17becf;+circle.color-17becf:hover {+ fill: #17becf;}-/*************************************************************** Muscle overview**************************************************************/-.muscle-list, .exercise-overview{- list-style-type: none;- margin-left: 0px;+.muscle-list,+.exercise-overview {+ list-style-type: none;+ margin-left: 0;}-.muscle-list .muscle, .exercise-overview .exercise{- line-height:2em;- margin-left: 0px;- padding-left: 0.3em;- cursor: pointer;+.muscle-list .muscle,+.exercise-overview .exercise {+ line-height: 2em;+ margin-left: 0;+ padding-left: 0.3em;+ cursor: pointer;}-.muscle-list .muscle-inactive{- background-color: transparent;- font-weight: normal;- border: 1px solid transparent;- box-shadow: none;- border-radius: 0px;+.muscle-list .muscle-inactive {+ background-color: transparent;+ font-weight: normal;+ border: 1px solid transparent;+ box-shadow: none;+ border-radius: 0;}-.muscle-list .muscle-active{- font-weight: bold;- background-color: #eeeeec;- border: 1px solid #babdb6;- box-shadow: inset 0 0 4px #d3d7cf;- border-radius: 3px;+.muscle-list .muscle-active {+ font-weight: bold;+ background-color: #eeeeec;+ border: 1px solid #babdb6;+ box-shadow: inset 0 0 4px #d3d7cf;+ border-radius: 3px;}--.muscle-list .muscle{- line-height:2em;- margin-left: 0px;- padding-left: 0.3em;- cursor: pointer;+.muscle-list .muscle {+ line-height: 2em;+ margin-left: 0;+ padding-left: 0.3em;+ cursor: pointer;}-/*************************************************************** Image gallery for exercises**************************************************************/.image-gallery {- overflow: hidden;- margin: 10px;+ overflow: hidden;+ margin: 10px;}.image-box {- float: left;- position: relative;- width: 20%;- padding-bottom: 20%;+ float: left;+ position: relative;+ width: 20%;+ padding-bottom: 20%;}+.boxInner {- position: absolute;- left: 10px;- right: 10px;- top: 10px;- bottom: 10px;- overflow: hidden;- text-align: center;+ position: absolute;+ left: 10px;+ right: 10px;+ top: 10px;+ bottom: 10px;+ overflow: hidden;+ text-align: center;}+.boxInner img.gallery-image {- max-height:100%;- max-width:100%;+ max-height: 100%;+ max-width: 100%;}++.titleBox {+ font-size: 80%;+}+.boxInner .titleBox {- position: absolute;- bottom: 0;- left: 0;- right: 0;- margin-bottom: -60px;- background: #000;- background: rgba(0, 0, 0, 0.8);- color: #FFF;- padding: 10px;- text-align: center;- -webkit-transition: all 0.3s ease-out;- -moz-transition: all 0.3s ease-out;- -o-transition: all 0.3s ease-out;- transition: all 0.3s ease-out;+ position: absolute;+ bottom: 0;+ left: 0;+ right: 0;+ margin-bottom: -60px;+ background: #000;+ background: rgba(0, 0, 0, 0.8);+ color: #fff;+ padding: 10px;+ text-align: center;+ -webkit-transition: all 0.3s ease-out;+ -moz-transition: all 0.3s ease-out;+ -o-transition: all 0.3s ease-out;+ transition: all 0.3s ease-out;+}++body .boxInner:hover .titleBox,+body.touch .boxInner.touchFocus .titleBox {+ margin-bottom: 0;}-body .boxInner:hover .titleBox, body.touch .boxInner.touchFocus .titleBox {- margin-bottom: 0;++.titleBox a {+ color: white;+ text-shadow: none;}-.titleBox{- font-size: 80%;+@media only screen and (max-width: 480px) {+ /* Smartphone view: 1 tile */+ .image-box {+ width: 100%;+ padding-bottom: 100%;+ }}-.titleBox a {- color: white;-- text-shadow: none;-}-@media only screen and (max-width : 480px) {- /* Smartphone view: 1 tile */- .image-box {- width: 100%;- padding-bottom: 100%;- }-}-@media only screen and (max-width : 650px) and (min-width : 481px) {- /* Tablet view: 2 tiles */- .image-box {- width: 50%;- padding-bottom: 50%;- }-}-@media only screen and (max-width : 1050px) and (min-width : 651px) {- /* Small desktop / ipad view: 3 tiles */- .image-box {- width: 33.3%;- padding-bottom: 33.3%;- }-}-@media only screen and (max-width : 1290px) and (min-width : 1051px) {- /* Medium desktop: 3 tiles */- .image-box {- width: 33.3%;- padding-bottom: 33.3%;- }-}-@media only screen and (min-width : 1290px) {- /* Big desktop: 3 tiles */- .image-box {- width: 33.3%;- padding-bottom: 33.3%;- }+@media only screen and (max-width: 650px) and (min-width: 481px) {+ /* Tablet view: 2 tiles */+ .image-box {+ width: 50%;+ padding-bottom: 50%;+ }+}++@media only screen and (max-width: 1050px) and (min-width: 651px) {+ /* Small desktop / ipad view: 3 tiles */+ .image-box {+ width: 33.3%;+ padding-bottom: 33.3%;+ }+}++@media only screen and (max-width: 1290px) and (min-width: 1051px) {+ /* Medium desktop: 3 tiles */+ .image-box {+ width: 33.3%;+ padding-bottom: 33.3%;+ }+}++@media only screen and (min-width: 1290px) {+ /* Big desktop: 3 tiles */+ .image-box {+ width: 33.3%;+ padding-bottom: 33.3%;+ }}/*************************************************************** Weight log calendar**************************************************************/-table.month td{- height: 4em;- text-align: center;-}-table.month td {- width: 14.285%;+ width: 14.285%;+ height: 4em;+ text-align: center;}-table.month th.month{- text-align: center;- background-color: #eeeeec;+table.month th.month {+ text-align: center;+ background-color: #eeeeec;}-table.month a.calendar-link{- height:100%;- line-height: 1;+table.month a.calendar-link {+ height: 100%;+ line-height: 1;}table.month td.session-bad {- background-color: #F2DEDE;+ background-color: #f2dede;}+table.month td.session-bad:hover {- background-color: #C9302C;+ background-color: #c9302c;}table.month td.session-neutral {- background-color: #F5F5F5;+ background-color: #f5f5f5;}+table.month td.session-neutral:hover {- background-color: #babdb6;+ background-color: #babdb6;}table.month td.session-good {- background-color: #dff0d8;+ background-color: #dff0d8;}table.month td.session-good:hover {- background-color: #449D44;+ background-color: #449d44;}-/** Autocompleter*/.autocomplete-wrapper {- margin: 44px auto 44px;- max-width: 600px;+ margin: 44px auto 44px;+ max-width: 600px;}.autocomplete-wrapper label {- display: block;- margin-bottom: .75em;- color: #3f4e5e;- font-size: 1.25em;+ display: block;+ margin-bottom: 0.75em;+ color: #3f4e5e;+ font-size: 1.25em;}+.autocomplete-wrapper .text-field {- padding: 0 15px;- width: 100%;- height: 40px;- border: 1px solid #CBD3DD;- font-size: 1.125em;+ padding: 0 15px;+ width: 100%;+ height: 40px;+ border: 1px solid #cbd3dd;+ font-size: 1.125em;}+.autocomplete-wrapper ::-webkit-input-placeholder,-.autocomplete-wrapper :-moz-placeholder,.autocomplete-wrapper ::-moz-placeholder,+.autocomplete-wrapper :-moz-placeholder,.autocomplete-wrapper :-ms-input-placeholder {- color: #CBD3DD;- font-style: italic;- font-size: 18px;+ color: #cbd3dd;+ font-style: italic;+ font-size: 18px;}+.autocomplete-suggestions {- overflow: auto;- border: 1px solid #CBD3DD;- background: #FFF; }+ overflow: auto;+ border: 1px solid #cbd3dd;+ background: #fff;+}.autocomplete-suggestion {- overflow: hidden;- padding: 5px 15px;- white-space: nowrap;+ overflow: hidden;+ padding: 5px 15px;+ white-space: nowrap;}.autocomplete-selected {- background: #F0F0F0;+ background: #f0f0f0;}.autocomplete-suggestions strong {- color: #3465a4;- font-weight: bold;+ color: #3465a4;+ font-weight: bold;}.autocomplete-group {- background-color: #d3d7cf;+ background-color: #d3d7cf;}+.autocomplete-group strong {- color: black;- font-weight: bold;+ color: black;+ font-weight: bold;}diff --git a/wger/core/static/css/workout-manager-mobile.css b/wger/core/static/css/workout-manager-mobile.cssindex 3a2771c31..3c475f706 100644--- a/wger/core/static/css/workout-manager-mobile.css+++ b/wger/core/static/css/workout-manager-mobile.css@@ -22,73 +22,65 @@**************************************************************/body {- background-color: white;+ background-color: white;+ padding-top: 50px;}-body { padding-top: 50px; }----/** Set the sizes for the background where the muscles are shown on the exercise view page*/-div.muscle-background-{- width: 150px;- height: 276px;- background-size: 150px;- background-repeat: no-repeat;+div.muscle-background {+ width: 150px;+ height: 276px;+ background-size: 150px;+ background-repeat: no-repeat;}-/*************************************************************** Muscle overview**************************************************************/-.muscle-list, .exercise-overview{- padding-left: 0px;+.muscle-list,+.exercise-overview {+ padding-left: 0;}-/*************************************************************** Headers**************************************************************/h1 {- font-size:220%;+ font-size: 220%;}h2 {- font-size:180%;+ font-size: 180%;}h3 {- font-size:150%;+ font-size: 150%;}h4 {- font-size:133.33%;+ font-size: 133.33%;}h5 {- font-size:116.67%;+ font-size: 116.67%;}h6 {- font-size:100%;+ font-size: 100%;}-h1,h2,h3,h4,h5,h6 {- font-family: "Open Sans Light", Arial, Helvetica, sans-serif;- font-weight: 300;+ font-family: "Open Sans Light", Arial, Helvetica, sans-serif;+ font-weight: 300;}-/*************************************************************** Header**************************************************************/@@ -96,138 +88,133 @@ h6 {/** Add a shadow to the application name*/-header h1{- text-shadow: 2px 3px 3px #292929;- font-family: "Open Sans Bold", Arial, Helvetica, sans-serif;- font-weight: 300;+header h1 {+ text-shadow: 2px 3px 3px #292929;+ font-family: "Open Sans Bold", Arial, Helvetica, sans-serif;+ font-weight: 300;}-/*************************************************************** Form errors**************************************************************/-.form-error, input.form-error{- color: rgb(136, 0, 0);+.form-error,+input.form-error {+ color: rgb(136, 0, 0);}-.form-error .ui-input-text{- border-color: rgb(136, 0, 0);+.form-error .ui-input-text {+ border-color: rgb(136, 0, 0);}-/*************************************************************** Success, info and other alert boxes**************************************************************/.success {- background: #b7f774;+ background: #b7f774;}.warning {- background: rgb(252, 175, 62);- text-shadow: none;+ background: rgb(252, 175, 62);+ text-shadow: none;}/*************************************************************** Other classes**************************************************************/.float-left {- float:left;- display:inline;+ float: left;+ display: inline;}-.align-right-{- text-align: right;+.align-right {+ text-align: right;}--/*************************************************************** Gym mode pages**************************************************************/-div#timer-container ul, div#timer-container h2{- padding:0;- margin:0;+div#timer-container ul,+div#timer-container h2 {+ padding: 0;+ margin: 0;}-div#timer-container a.wide_link{- padding-left: 0px;- padding-right: 0px;- padding-top: 0.7em;- padding-bottom: 0.7em;+div#timer-container a.wide_link {+ padding-left: 0;+ padding-right: 0;+ padding-top: 0.7em;+ padding-bottom: 0.7em;+ width: 95%;}div#timer-container ul#workout-timer li {- float:left;- list-style:none;- position:relative;-+ float: left;+ list-style: none;+ position: relative;}-div#timer-container{- padding:13px;- clear:both;- overflow:hidden;- margin:0 auto;- display:block;+div#timer-container {+ padding: 13px;+ clear: both;+ overflow: hidden;+ margin: 0 auto;+ display: block;}-div#timer-container canvas, div#timer-container div.filler_div{- height: 150px;- margin-top: 1em;- margin-bottom: 30px;+div#timer-container canvas,+div#timer-container div.filler_div {+ height: 150px;+ margin-top: 1em;+ margin-bottom: 30px;}-div#timer-container canvas{- width: 150px;+div#timer-container canvas {+ width: 150px;}-div#timer-container div.sub_header{- position: absolute;- bottom: 65px;- width: 95%;-}-div#timer-container div.sub_header a{- width: 90%;+div#timer-container div.sub_header {+ position: absolute;+ bottom: 65px;+ width: 95%;}-div#timer-container div.sub_header h2{- font-size: 300%;+div#timer-container div.sub_header a {+ width: 90%;}-div#timer-container a.wide_link{- width: 95%;+div#timer-container div.sub_header h2 {+ font-size: 300%;}-div#timer-container .bottom_buttons{- position: absolute;- bottom: 12px;- width: 100%;+div#timer-container .bottom_buttons {+ position: absolute;+ bottom: 12px;+ width: 100%;}-div#timer-container a.bottom_button{- position: absolute;- bottom: 12px;+div#timer-container a.bottom_button {+ position: absolute;+ bottom: 12px;}-div#timer-container div.progress-bar{- position: absolute;- bottom: 0px;-- width: 99%;- height: 6px;- border-radius: 3px;- background-color: #eeeeec;- border: 1px solid gray;+div#timer-container div.progress-bar {+ position: absolute;+ bottom: 0;+ width: 99%;+ height: 6px;+ border-radius: 3px;+ background-color: #eeeeec;+ border: 1px solid gray;}-div#timer-container div.progress-bar span{- height: 6px;- border-radius: 3px;- border: 1px solid gray;- position: absolute;- bottom: -1px;- left: -1px;- background-color: #204A87;- /*background-color: rgb(170, 170, 170);*/+div#timer-container div.progress-bar span {+ height: 6px;+ border-radius: 3px;+ border: 1px solid gray;+ position: absolute;+ bottom: -1px;+ left: -1px;+ background-color: #204a87;++ /* background-color: rgb(170, 170, 170); */}diff --git a/wger/core/static/css/workout-manager.css b/wger/core/static/css/workout-manager.cssindex 07d5371aa..695738e0a 100644--- a/wger/core/static/css/workout-manager.css+++ b/wger/core/static/css/workout-manager.css@@ -21,143 +21,112 @@***************************************************************/-#main-footer{- background: none repeat scroll 0% 0% #EEE;- border-top: 1px solid #E5E5E5;- border-bottom: 1px solid #000;- padding-top: 1em;- padding-bottom: 1em;+#main-footer {+ background: none repeat scroll 0% 0% #eee;+ border-top: 1px solid #e5e5e5;+ border-bottom: 1px solid #000;+ padding-top: 1em;+ padding-bottom: 1em;}-#main{- background-color: #FFF;+#main {+ background-color: #fff;}-/** Images in links are vertically aligned*/--a img{- vertical-align: middle;+a img {+ vertical-align: middle;}/** "invisible" elements, simply hidden (they still take all the space)*/-.invisible{- display: none;+.invisible {+ display: none;}-.align-right-{- text-align: right;+.align-right {+ text-align: right;}-.sortable-settings-{- border: 1px solid black;+.sortable-settings {+ border: 1px solid black;}-.sortable-settings-drag-{- padding-left: 1em;- padding-right: 1em;- background-color: #babdb6;- border-bottom:1px solid black;+.sortable-settings-drag {+ padding-left: 1em;+ padding-right: 1em;+ background-color: #babdb6;+ border-bottom: 1px solid black;}/** Set a more appropriate cursor to the drag'n'drop handle on the* workout view*/-.dragndrop-handle{- cursor:move+.dragndrop-handle {+ cursor: move;}-/**************************************************************- * Mouse hover options- **************************************************************//*- * Hide the edit options (edit, delete) on tables, only show them when the mouse is over the row+ * Set the sizes for the background where the muscles are shown on the exercise view page*/-.editoptions-{- visibility: hidden;+div.muscle-background {+ width: 180px;+ height: 276px;+ background-size: 150px;+ background-repeat: no-repeat;}-tr:hover .editoptions, tbody tr:hover td .editoptions, ul:hover .editoptions-{- visibility: visible;-}--/*- * Deactivate the default background color on hover+ * Set an additional padding to the generated DIV on the edit set page*/-.editoptions a:hover,-.ui-tabs-nav a:hover,-.ui-tabs-nav a:focus,-.ajax-exercise-select a:hover,-.no-hover a:hover,-.no-hover:hover {- background-color: transparent;+#exercise-search-log {+ padding-left: 1em;}+/**************************************************************+ * Workout log+ **************************************************************//*- * Images inside a link are set to greyscale till mouseover+ * Workout log entry page needs the horizontal space*/-/*-a img-{- filter: grayscale(100%);- -webkit-filter: grayscale(100%);- -moz-filter: grayscale(100%);- -ms-filter: grayscale(100%);- -o-filter: grayscale(100%);+.workout-log-table .narrow-input {+ width: 7em;}-a:hover img-{- filter: grayscale(0%);- -webkit-filter: grayscale(0%);- -moz-filter: grayscale(0%);- -ms-filter: grayscale(0%);- -o-filter: grayscale(0%);-}-*/+/**************************************************************+ * Mouse hover options+ **************************************************************//*- * Set the sizes for the background where the muscles are shown on the exercise view page+ * Hide the edit options (edit, delete) on tables, only show them when the mouse is over the row*/-div.muscle-background-{- width: 180px;- height: 276px;- background-size: 150px;- background-repeat: no-repeat;+.editoptions {+ visibility: hidden;}-/*- * Set an additional padding to the generated DIV on the edit set page- */-#exercise-search-log{- padding-left: 1em;+ul:hover .editoptions,+tr:hover .editoptions,+tbody tr:hover td .editoptions {+ visibility: visible;}--/**************************************************************- * Workout log- **************************************************************//*- * Workout log entry page needs the horizontal space+ * Deactivate the default background color on hover*/-.workout-log-table .narrow-input {- width: 7em;+.editoptions a:hover,+.ui-tabs-nav a:hover,+.ui-tabs-nav a:focus,+.ajax-exercise-select a:hover,+.no-hover a:hover,+.no-hover:hover {+ background-color: transparent;}-/*************************************************************** Header**************************************************************/@@ -165,130 +134,130 @@ div.muscle-background/** Add a shadow to the application name*/-header h1{- text-shadow: 2px 3px 3px #292929;- font-family: "Open Sans Bold", Arial, Helvetica, sans-serif;- font-weight: 300;+header h1 {+ text-shadow: 2px 3px 3px #292929;+ font-family: "Open Sans Bold", Arial, Helvetica, sans-serif;+ font-weight: 300;}header a,-header a:hover,-header a:focus{- color:white;- font-size:90%;+header a:hover,+header a:focus {+ color: white;+ font-size: 90%;}-header span.name{- text-shadow: 2px 3px 3px #292929;- font-family: "Open Sans Bold", Arial, Helvetica, sans-serif;- font-weight: 300;- font-size: 350%;- color: white;+header span.name {+ text-shadow: 2px 3px 3px #292929;+ font-family: "Open Sans Bold", Arial, Helvetica, sans-serif;+ font-weight: 300;+ font-size: 350%;+ color: white;}--header span.regular{- text-shadow: 2px 3px 3px #292929;- font-family: "Open Sans Light", Arial, Helvetica, sans-serif;- font-weight: 300;- font-size: 350%;- color: white;+header span.regular {+ text-shadow: 2px 3px 3px #292929;+ font-family: "Open Sans Light", Arial, Helvetica, sans-serif;+ font-weight: 300;+ font-size: 350%;+ color: white;}/** Make more space for the page title*/-#page-title{- margin-top: 0.5em;+#page-title {+ margin-top: 0.5em;}-#content-wrapper{- padding-top: 0.8em;+#content-wrapper {+ padding-top: 0.8em;}-/** Links in warning boxes get a different style, the default blue doesn't match* well with orange*/-div.success a, div.success a:hover, div.success a:active,-div.warning a, div.warning a:hover, div.warning a:active,-div.info a, div.info a:hover, div.info a:active{- color: black;- text-decoration: underline;- background-color: transparent;+div.warning a,+div.success a,+div.info a,+div.success a:hover,+div.success a:active,+div.warning a:hover,+div.warning a:active,+div.info a:hover,+div.info a:active {+ color: black;+ text-decoration: underline;+ background-color: transparent;}-/*************************************************************** Autocompleter**************************************************************/+/** Category heading for the ajax autocompleter*/.ui-autocomplete-category {- margin:0;- text-align: center;- zoom: 1;- width: 100%;- font-weight: bold;- background-color: #D3D7CF;- border-bottom: 1px solid #888a85;+ margin: 0;+ text-align: center;+ zoom: 1;+ width: 100%;+ font-weight: bold;+ background-color: #d3d7cf;+ border-bottom: 1px solid #888a85;}/** Give the result list from the autocompleter a maximum size*/.ui-autocomplete {- max-height: 500px;- max-width: 500px;- overflow-y: auto;- overflow-x: hidden; /* prevent horizontal scrollbar */+ max-height: 500px;+ max-width: 500px;+ overflow-y: auto;+ overflow-x: hidden; /* prevent horizontal scrollbar */}/** Give odd child's a different background colour (thanks CSS3!)*/-.ui-autocomplete li.ui-menu-item:nth-child(odd)-{- background: #eeeeec;+.ui-autocomplete li.ui-menu-item:nth-child(odd) {+ background: #eeeeec;}-/*************************************************************** extra-bold fonts**************************************************************/-.extra-bold{- font-family: "Open Sans Bold", Arial, Helvetica, sans-serif;- font-weight: 300;+.extra-bold {+ font-family: "Open Sans Bold", Arial, Helvetica, sans-serif;+ font-weight: 300;}/*************************************************************** Set edit window**************************************************************/-#slider{- width: 91%;- float: right;- margin-right: 1em;+#slider {+ width: 91%;+ float: right;+ margin-right: 1em;}-/*************************************************************** Carousel on the feature page**************************************************************/-#feature-carousel .carousel-caption-{- background-color: rgba(0, 0, 0, 0.75);- position: relative;- left: auto;- right: auto;- bottom: auto;+#feature-carousel .carousel-caption {+ background-color: rgba(0, 0, 0, 0.75);+ position: relative;+ left: auto;+ right: auto;+ bottom: auto;}/*************************************************************** 'Your ...' shoutouts on the feature page**************************************************************/#shoutout h2:first-child {- margin-top: 0;-}\ No newline at end of file+ margin-top: 0;+}diff --git a/wger/software/static/css/agency.css b/wger/software/static/css/agency.cssindex e60990d64..7c15bebf6 100644--- a/wger/software/static/css/agency.css+++ b/wger/software/static/css/agency.css@@ -1,50 +1,62 @@-/*!+/** Start Bootstrap - Agency v3.3.7 (http://startbootstrap.com/template-overviews/agency)* Copyright 2013-2016 Start Bootstrap* Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap/blob/gh-pages/LICENSE)*/@font-face {- font-family:"Open Sans Light";- src:url("/static/fonts/OpenSans-Light.eot?") format("eot"),- url("/static/fonts/OpenSans-Light.woff") format("woff"),- url("/static/fonts/OpenSans-Light.ttf") format("truetype"),- url("/static/fonts/OpenSans-Light.svg#OpenSans-Light") format("svg");- font-weight:normal;- font-style:normal;+ font-family: "Open Sans Light";+ src:+ url("/static/fonts/OpenSans-Light.eot?") format("eot"),+ url("/static/fonts/OpenSans-Light.woff") format("woff"),+ url("/static/fonts/OpenSans-Light.ttf") format("truetype"),+ url("/static/fonts/OpenSans-Light.svg#OpenSans-Light") format("svg");+ font-weight: normal;+ font-style: normal;}@font-face {- font-family:"Open Sans Bold";- src:url("/static/fonts/OpenSans-Bold.eot?") format("eot"),- url("/static/fonts/OpenSans-Bold.woff") format("woff"),- url("/static/fonts/OpenSans-Bold.ttf") format("truetype"),- url("/static/fonts/OpenSans-Bold.svg#OpenSans-Bold") format("svg");- font-weight:normal;- font-style:normal;+ font-family: "Open Sans Bold";+ src:+ url("/static/fonts/OpenSans-Bold.eot?") format("eot"),+ url("/static/fonts/OpenSans-Bold.woff") format("woff"),+ url("/static/fonts/OpenSans-Bold.ttf") format("truetype"),+ url("/static/fonts/OpenSans-Bold.svg#OpenSans-Bold") format("svg");+ font-weight: normal;+ font-style: normal;}-body {overflow-x: hidden;- /*font-family: "Roboto Slab", "Helvetica Neue", Helvetica, Arial, sans-serif;*/++ /* font-family: "Roboto Slab", "Helvetica Neue", Helvetica, Arial, sans-serif; */font-family: "Open Sans Light", Arial, Helvetica, sans-serif;}+.text-muted {- color: #777777;+ color: #777;}+.text-light {color: white;}+.text-primary {color: #204a87;}+p {font-size: 14px;line-height: 1.75;}+p.large {font-size: 16px;}++a {+ color: #204a87;+}+a,a:hover,a:focus,@@ -52,44 +64,49 @@ a:active,a.active {outline: none;}-a {- color: #204a87;-}+a:hover,a:focus,a:active,a.active {color: #1a3c6e;}+h1,h2,h3,h4,h5,h6 {- /*font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;*/+ /* font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; */font-family: "Open Sans Bold", Arial, Helvetica, sans-serif;text-transform: uppercase;font-weight: 700;}+.img-centered {margin: 0 auto;}+.bg-light-gray {- background-color: #eeeeee;+ background-color: #eee;}+.bg-darkest-gray {- background-color: #222222;+ background-color: #222;}+.btn-primary {color: white;background-color: #204a87;border-color: #204a87;- /*font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;*/++ /* font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; */font-family: "Open Sans Light", Arial, Helvetica, sans-serif;text-transform: uppercase;font-weight: 700;}+.btn-primary:hover,.btn-primary:focus,.btn-primary:active,@@ -99,11 +116,13 @@ h6 {background-color: #1a3c6e;border-color: #1a3c6e;}+.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary {background-image: none;}+.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,@@ -122,10 +141,12 @@ fieldset[disabled] .btn-primary.active {background-color: #204a87;border-color: #204a87;}+.btn-primary .badge {color: #204a87;background-color: white;}+.btn-xl {color: white;background-color: #204a87;@@ -137,6 +158,7 @@ fieldset[disabled] .btn-primary.active {font-size: 18px;padding: 20px 40px;}+.btn-xl:hover,.btn-xl:focus,.btn-xl:active,@@ -146,11 +168,13 @@ fieldset[disabled] .btn-primary.active {background-color: #1a3c6e;border-color: #1a3c6e;}+.btn-xl:active,.btn-xl.active,.open .dropdown-toggle.btn-xl {background-image: none;}+.btn-xl.disabled,.btn-xl[disabled],fieldset[disabled] .btn-xl,@@ -169,27 +193,33 @@ fieldset[disabled] .btn-xl.active {background-color: #204a87;border-color: #204a87;}+.btn-xl .badge {color: #204a87;background-color: white;}+.navbar-custom {- background-color: #222222;+ background-color: #222;border-color: transparent;}+.navbar-custom .navbar-brand {color: #204a87;font-family: "Open Sans Light", Arial, Helvetica, sans-serif;}+.navbar-custom .navbar-brand:hover,.navbar-custom .navbar-brand:focus,.navbar-custom .navbar-brand:active,.navbar-custom .navbar-brand.active {color: #1a3c6e;}+.navbar-custom .navbar-collapse {border-color: rgba(255, 255, 255, 0.02);}+.navbar-custom .navbar-toggle {background-color: #204a87;border-color: #204a87;@@ -198,10 +228,12 @@ fieldset[disabled] .btn-xl.active {color: white;font-size: 12px;}+.navbar-custom .navbar-toggle:hover,.navbar-custom .navbar-toggle:focus {background-color: #204a87;}+.navbar-custom .nav li a {font-family: "Open Sans Light", Arial, Helvetica, sans-serif;text-transform: uppercase;@@ -209,21 +241,25 @@ fieldset[disabled] .btn-xl.active {letter-spacing: 1px;color: white;}+.navbar-custom .nav li a:hover,.navbar-custom .nav li a:focus {color: #204a87;outline: none;}+.navbar-custom .navbar-nav > .active > a {border-radius: 0;color: white;background-color: #204a87;}+.navbar-custom .navbar-nav > .active > a:hover,.navbar-custom .navbar-nav > .active > a:focus {color: white;background-color: #1a3c6e;}+@media (min-width: 768px) {.navbar-custom {background-color: transparent;@@ -233,27 +269,32 @@ fieldset[disabled] .btn-xl.active {transition: padding 0.3s;border: none;}+.navbar-custom .navbar-brand {font-size: 2em;-webkit-transition: all 0.3s;-moz-transition: all 0.3s;transition: all 0.3s;}+.navbar-custom .navbar-nav > .active > a {border-radius: 3px;}}+@media (min-width: 768px) {.navbar-custom.affix {- background-color: #222222;+ background-color: #222;padding: 10px 0;}+.navbar-custom.affix .navbar-brand {font-size: 1.5em;}}+header {- background-image: linear-gradient(rgba(0, 0, 0, 0.5),rgba(0, 0, 0, 0.5)), url('../images/main.jpg');+ background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url('../images/main.jpg');background-repeat: no-repeat;background-attachment: scroll;background-position: center center;@@ -264,10 +305,12 @@ header {text-align: center;color: white;}+header .intro-text {padding-top: 100px;padding-bottom: 50px;}+header .intro-text .intro-lead-in {font-family: "Open Sans Light", Arial, Helvetica, sans-serif;font-style: italic;@@ -275,6 +318,7 @@ header .intro-text .intro-lead-in {line-height: 22px;margin-bottom: 25px;}+header .intro-text .intro-heading {font-family: "Open Sans Light", Arial, Helvetica, sans-serif;text-transform: uppercase;@@ -283,11 +327,13 @@ header .intro-text .intro-heading {line-height: 50px;margin-bottom: 25px;}+@media (min-width: 768px) {header .intro-text {padding-top: 300px;padding-bottom: 200px;}+header .intro-text .intro-lead-in {font-family: "Open Sans Light", Arial, Helvetica, sans-serif;font-style: italic;@@ -295,6 +341,7 @@ header .intro-text .intro-heading {line-height: 40px;margin-bottom: 25px;}+header .intro-text .intro-heading {font-family: "Open Sans Bold", Arial, Helvetica, sans-serif;text-transform: uppercase;@@ -304,14 +351,17 @@ header .intro-text .intro-heading {margin-bottom: 50px;}}+section {padding: 100px 0;}+section h2.section-heading {font-size: 40px;margin-top: 0;margin-bottom: 15px;}+section h3.section-subheading {font-size: 16px;font-family: "Open Sans Light", Arial, Helvetica, sans-serif;@@ -320,25 +370,30 @@ section h3.section-subheading {font-weight: 400;margin-bottom: 75px;}+@media (min-width: 768px) {section {padding: 150px 0;}}+.service-heading {margin: 15px 0;text-transform: none;}+#portfolio .portfolio-item {margin: 0 0 15px;right: 0;}+#portfolio .portfolio-item .portfolio-link {display: block;position: relative;max-width: 400px;margin: 0 auto;}+#portfolio .portfolio-item .portfolio-link .portfolio-hover {background: rgba(254, 209, 54, 0.9);position: absolute;@@ -349,9 +404,11 @@ section h3.section-subheading {-webkit-transition: all ease 0.5s;-moz-transition: all ease 0.5s;}+#portfolio .portfolio-item .portfolio-link .portfolio-hover:hover {opacity: 1;}+#portfolio .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content {position: absolute;width: 100%;@@ -362,13 +419,16 @@ section h3.section-subheading {margin-top: -12px;color: white;}+#portfolio .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content i {margin-top: -12px;}+#portfolio .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content h3,#portfolio .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content h4 {margin: 0;}+#portfolio .portfolio-item .portfolio-caption {max-width: 400px;margin: 0 auto;@@ -376,30 +436,36 @@ section h3.section-subheading {text-align: center;padding: 25px;}+#portfolio .portfolio-item .portfolio-caption h4 {text-transform: none;margin: 0;}+#portfolio .portfolio-item .portfolio-caption p {font-family: "Open Sans Light", Arial, Helvetica, sans-serif;font-style: italic;font-size: 16px;margin: 0;}+#portfolio * {z-index: 2;}+@media (min-width: 767px) {#portfolio .portfolio-item {margin: 0 0 30px;}}+.timeline {list-style: none;padding: 0;position: relative;}-.timeline:before {++.timeline::before {top: 0;bottom: 0;position: absolute;@@ -409,19 +475,23 @@ section h3.section-subheading {left: 40px;margin-left: -1.5px;}+.timeline > li {margin-bottom: 50px;position: relative;min-height: 50px;}-.timeline > li:before,-.timeline > li:after {++.timeline > li::before,+.timeline > li::after {content: " ";display: table;}-.timeline > li:after {++.timeline > li::after {clear: both;}+.timeline > li .timeline-panel {width: 100%;float: right;@@ -429,18 +499,21 @@ section h3.section-subheading {position: relative;text-align: left;}-.timeline > li .timeline-panel:before {++.timeline > li .timeline-panel::before {border-left-width: 0;border-right-width: 15px;left: -15px;right: auto;}-.timeline > li .timeline-panel:after {++.timeline > li .timeline-panel::after {border-left-width: 0;border-right-width: 14px;left: -14px;right: auto;}+.timeline > li .timeline-image {left: 0;margin-left: 0;@@ -454,197 +527,241 @@ section h3.section-subheading {border: 7px solid #d3d7cf;text-align: center;}+.timeline > li .timeline-image h4 {font-size: 10px;margin-top: 12px;line-height: 14px;}+.timeline > li.timeline-inverted > .timeline-panel {float: right;text-align: left;padding: 0 20px 0 100px;}-.timeline > li.timeline-inverted > .timeline-panel:before {++.timeline > li.timeline-inverted > .timeline-panel::before {border-left-width: 0;border-right-width: 15px;left: -15px;right: auto;}-.timeline > li.timeline-inverted > .timeline-panel:after {++.timeline > li.timeline-inverted > .timeline-panel::after {border-left-width: 0;border-right-width: 14px;left: -14px;right: auto;}+.timeline > li:last-child {margin-bottom: 0;}+.timeline .timeline-heading h4 {margin-top: 0;color: inherit;}+.timeline .timeline-heading h4.subheading {text-transform: none;}+.timeline .timeline-body > p,.timeline .timeline-body > ul {margin-bottom: 0;}+@media (min-width: 768px) {- .timeline:before {+ .timeline::before {left: 50%;}+.timeline > li {margin-bottom: 100px;min-height: 100px;}+.timeline > li .timeline-panel {width: 41%;float: left;padding: 0 20px 20px 30px;text-align: right;}+.timeline > li .timeline-image {width: 100px;height: 100px;left: 50%;margin-left: -50px;}+.timeline > li .timeline-image h4 {font-size: 13px;margin-top: 16px;line-height: 18px;}+.timeline > li.timeline-inverted > .timeline-panel {float: right;text-align: left;padding: 0 30px 20px 20px;}}+@media (min-width: 992px) {.timeline > li {min-height: 150px;}+.timeline > li .timeline-panel {padding: 0 20px 20px;}+.timeline > li .timeline-image {width: 150px;height: 150px;margin-left: -75px;}+.timeline > li .timeline-image h4 {font-size: 18px;margin-top: 30px;line-height: 26px;}+.timeline > li.timeline-inverted > .timeline-panel {padding: 0 20px 20px;}}+@media (min-width: 1200px) {.timeline > li {min-height: 170px;}+.timeline > li .timeline-panel {padding: 0 20px 20px 100px;}+.timeline > li .timeline-image {width: 170px;height: 170px;margin-left: -85px;}+.timeline > li .timeline-image h4 {margin-top: 40px;}+.timeline > li.timeline-inverted > .timeline-panel {padding: 0 100px 20px 20px;}}+.team-member {text-align: center;margin-bottom: 50px;}+.team-member img {margin: 0 auto;border: 7px solid white;}+.team-member h4 {margin-top: 25px;margin-bottom: 0;text-transform: none;}+.team-member p {margin-top: 0;}+aside.clients img {margin: 50px auto;}+section#contact {- background-color: #222222;+ background-color: #222;background-image: url('../img/map-image.png');background-position: center;background-repeat: no-repeat;}+section#contact .section-heading {color: white;}+section#contact .form-group {margin-bottom: 25px;}+section#contact .form-group input,section#contact .form-group textarea {padding: 20px;}+section#contact .form-group input.form-control {height: auto;}+section#contact .form-group textarea.form-control {height: 236px;}+section#contact .form-control:focus {border-color: #204a87;box-shadow: none;}+section#contact ::-webkit-input-placeholder {font-family: "Open Sans Light", Arial, Helvetica, sans-serif;text-transform: uppercase;font-weight: 700;- color: #eeeeee;+ color: #eee;}+section#contact :-moz-placeholder {/* Firefox 18- */font-family: "Open Sans Light", Arial, Helvetica, sans-serif;text-transform: uppercase;font-weight: 700;- color: #eeeeee;+ color: #eee;}+section#contact ::-moz-placeholder {/* Firefox 19+ */font-family: "Open Sans Light", Arial, Helvetica, sans-serif;text-transform: uppercase;font-weight: 700;- color: #eeeeee;+ color: #eee;}+section#contact :-ms-input-placeholder {font-family: "Open Sans Light", Arial, Helvetica, sans-serif;text-transform: uppercase;font-weight: 700;- color: #eeeeee;+ color: #eee;}+section#contact .text-danger {color: #e74c3c;}+footer {padding: 25px 0;text-align: center;}+footer span.copyright {line-height: 40px;font-family: "Open Sans Light", Arial, Helvetica, sans-serif;text-transform: uppercase;text-transform: none;}+footer ul.quicklinks {margin-bottom: 0;line-height: 40px;@@ -653,12 +770,14 @@ footer ul.quicklinks {text-transform: none;}footer ul.quicklinks a { color: white; }+ul.social-buttons {margin-bottom: 0;}+ul.social-buttons li a {display: block;- background-color: #222222;+ background-color: #222;height: 40px;width: 40px;border-radius: 100%;@@ -670,22 +789,26 @@ ul.social-buttons li a {-moz-transition: all 0.3s;transition: all 0.3s;}+ul.social-buttons li a:hover,ul.social-buttons li a:focus,ul.social-buttons li a:active {background-color: #204a87;}+.btn:focus,.btn:active,.btn.active,.btn:active:focus {outline: none;}+.portfolio-modal .modal-dialog {margin: 0;height: 100%;width: auto;}+.portfolio-modal .modal-content {border-radius: 0;background-clip: border-box;@@ -696,26 +819,32 @@ ul.social-buttons li a:active {padding: 100px 0;text-align: center;}+.portfolio-modal .modal-content h2 {margin-bottom: 15px;font-size: 3em;}+.portfolio-modal .modal-content p {margin-bottom: 30px;}+.portfolio-modal .modal-content p.item-intro {margin: 20px 0 30px;font-family: "Open Sans Light", Arial, Helvetica, sans-serif;font-style: italic;font-size: 16px;}+.portfolio-modal .modal-content ul.list-inline {margin-bottom: 30px;margin-top: 0;}+.portfolio-modal .modal-content img {margin-bottom: 30px;}+.portfolio-modal .close-modal {position: absolute;width: 75px;@@ -725,50 +854,59 @@ ul.social-buttons li a:active {right: 25px;cursor: pointer;}+.portfolio-modal .close-modal:hover {opacity: 0.3;}+.portfolio-modal .close-modal .lr {height: 75px;width: 1px;margin-left: 35px;- background-color: #222222;+ background-color: #222;transform: rotate(45deg);-ms-transform: rotate(45deg);+/* IE 9 */-webkit-transform: rotate(45deg);+/* Safari and Chrome */z-index: 1051;}+.portfolio-modal .close-modal .lr .rl {height: 75px;width: 1px;- background-color: #222222;+ background-color: #222;transform: rotate(90deg);-ms-transform: rotate(90deg);+/* IE 9 */-webkit-transform: rotate(90deg);+/* Safari and Chrome */z-index: 1052;}+.portfolio-modal .modal-backdrop {opacity: 0;display: none;}+::-moz-selection {text-shadow: none;background: #204a87;}+::selection {text-shadow: none;background: #204a87;}+img::selection {background: transparent;}+img::-moz-selection {background: transparent;}-body {- webkit-tap-highlight-color: #204a87;-}