diff --git a/static/src/app/army/army-member/army-member.component.css b/static/src/app/army/army-member/army-member.component.css index 1c61059..ebb18ab 100644 --- a/static/src/app/army/army-member/army-member.component.css +++ b/static/src/app/army/army-member/army-member.component.css @@ -8,7 +8,7 @@ background-image: url('../../../assets/bg.jpg'); background-size: cover; background-attachment: fixed; - background-position: center; + background-position: top; background-repeat: no-repeat; } @@ -27,8 +27,7 @@ .return-button { position: absolute; - display: block; - width: auto; + padding-left: 5px; } .table { diff --git a/static/src/app/army/army.component.css b/static/src/app/army/army.component.css index f1ae200..2501ffd 100644 --- a/static/src/app/army/army.component.css +++ b/static/src/app/army/army.component.css @@ -8,7 +8,7 @@ background-image: url('../../assets/bg.jpg'); background-size: cover; background-attachment: fixed; - background-position: center; + background-position: top; background-repeat: no-repeat; } diff --git a/static/src/app/login/login.component.css b/static/src/app/login/login.component.css index 827e519..db7dcd7 100644 --- a/static/src/app/login/login.component.css +++ b/static/src/app/login/login.component.css @@ -4,6 +4,14 @@ margin: 0 auto; } +.form-signin > .row { + width: 400px; +} + +.form-signin-heading { + text-align: center; +} + .form-signin .form-signin-heading, .form-signin .checkbox, #inputEmail { margin-bottom: 10px; } @@ -38,39 +46,8 @@ border-top-right-radius: 0; } -.account-wall { - margin-top: 20px; - padding: 40px 0px 20px 0px; - background-color: #f7f7f7; - -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3); - box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3); -} - -.login-title { - color: #555; - font-size: 18px; - font-weight: 400; - display: block; -} - -.profile-img { - width: 96px; - height: 96px; - margin: 0 auto 10px; - display: block; - -moz-border-radius: 50%; - -webkit-border-radius: 50%; - border-radius: 50%; -} - -.need-help { - margin-top: 10px; -} - -.new-account { - display: block; - margin-top: 10px; +button { + width: 100%; } /* Loading Animation */ diff --git a/static/src/app/login/login.component.html b/static/src/app/login/login.component.html index 2b588bd..f590447 100644 --- a/static/src/app/login/login.component.html +++ b/static/src/app/login/login.component.html @@ -1,7 +1,6 @@
- -
- +
+ @@ -9,15 +8,12 @@ -
-
- -
diff --git a/static/src/app/pub/decoration-overview/decoration-overview.component.css b/static/src/app/pub/decoration-overview/decoration-overview.component.css index a9d6aeb..f95a071 100644 --- a/static/src/app/pub/decoration-overview/decoration-overview.component.css +++ b/static/src/app/pub/decoration-overview/decoration-overview.component.css @@ -8,7 +8,7 @@ background-image: url('../../../assets/bg.jpg'); background-size: cover; background-attachment: fixed; - background-position: center; + background-position: top; background-repeat: no-repeat; } diff --git a/static/src/app/pub/rank-overview/rank-overview.component.css b/static/src/app/pub/rank-overview/rank-overview.component.css index 93ac49d..10972bf 100644 --- a/static/src/app/pub/rank-overview/rank-overview.component.css +++ b/static/src/app/pub/rank-overview/rank-overview.component.css @@ -8,7 +8,7 @@ background-image: url('../../../assets/bg.jpg'); background-size: cover; background-attachment: fixed; - background-position: center; + background-position: top; background-repeat: no-repeat; } diff --git a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css index 12f2a36..96a4486 100644 --- a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css +++ b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css @@ -30,21 +30,25 @@ } .campaign-entry { - border: 1px solid #dadada; + border: 1px solid #222222; min-width: 120px; width: 20%; - padding: 15px; + max-height: 4em; + padding: 10px 0; text-align: center; cursor: pointer; font-size: 16px; float: left; - color: #333333; + background: #424242; + color: #9d9d9d; } .active { - background: #e7e7e7; + background: #222222; + color: white; + border-bottom: 3px solid #ffd740; } .campaign-entry:hover { - background: #f9f9f9; + border-bottom: 3px solid #ffd740; } diff --git a/static/src/app/statistic/stats.component.css b/static/src/app/statistic/stats.component.css index f6990b2..8216be1 100644 --- a/static/src/app/statistic/stats.component.css +++ b/static/src/app/statistic/stats.component.css @@ -16,6 +16,7 @@ position: fixed; top: calc(100vh - 35px); left: -10px; - background: white; + background: #424242; border: 1px solid #dadada; + box-shadow: #ffd740 0 0 3px; } diff --git a/static/src/app/statistic/war/war-list/war-list.component.css b/static/src/app/statistic/war/war-list/war-list.component.css index 71b370d..3468833 100644 --- a/static/src/app/statistic/war/war-list/war-list.component.css +++ b/static/src/app/statistic/war/war-list/war-list.component.css @@ -21,8 +21,8 @@ } .select-indicator { - width: 30px; - height: 30px; + width: 29px; + height: 29px; position: absolute; left: calc(100% + 11px); background: -moz-linear-gradient(45deg, white 50%, transparent 50%); diff --git a/static/src/assets/bg.jpg b/static/src/assets/bg.jpg index 73d703a..ff37a15 100644 Binary files a/static/src/assets/bg.jpg and b/static/src/assets/bg.jpg differ diff --git a/static/src/styles.css b/static/src/styles.css index 0e117c2..c7e162f 100644 --- a/static/src/styles.css +++ b/static/src/styles.css @@ -46,6 +46,7 @@ form { position: static; float: left; border-right: thin solid #dadada; + box-shadow: #dadada 1px 1px 6px; } #right {