diff --git a/src/Squidex/Views/Account/Login.cshtml b/src/Squidex/Views/Account/Login.cshtml index d040bcace..a445609ff 100644 --- a/src/Squidex/Views/Account/Login.cshtml +++ b/src/Squidex/Views/Account/Login.cshtml @@ -5,7 +5,8 @@ @{ var type = Model.IsLogin ? "Login" : "Signup"; - + + ViewBag.Theme = "white"; ViewBag.Title = type; } @@ -44,7 +45,7 @@
} diff --git a/src/Squidex/Views/_Layout.cshtml b/src/Squidex/Views/_Layout.cshtml index 77a5636e0..da0794914 100644 --- a/src/Squidex/Views/_Layout.cshtml +++ b/src/Squidex/Views/_Layout.cshtml @@ -17,7 +17,7 @@ @RenderSection("header") } - + @RenderBody() diff --git a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.scss b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.scss index 81a97db4e..446243a46 100644 --- a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.scss +++ b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.scss @@ -7,15 +7,7 @@ } &-icon { - & { - @include transition(color .3s ease); - cursor: pointer; - color: $color-theme-error; - } - - &:hover { - color: darken($color-theme-error, 10%); - } + @include build-icon($color-theme-error); } } diff --git a/src/Squidex/app/features/administration/pages/users/users-page.component.html b/src/Squidex/app/features/administration/pages/users/users-page.component.html index 246831ce3..38a8a716f 100644 --- a/src/Squidex/app/features/administration/pages/users/users-page.component.html +++ b/src/Squidex/app/features/administration/pages/users/users-page.component.html @@ -9,12 +9,14 @@ + +
- +
- diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.html b/src/Squidex/app/features/assets/pages/assets-page.component.html index a56dc0230..ecfb2e77c 100644 --- a/src/Squidex/app/features/assets/pages/assets-page.component.html +++ b/src/Squidex/app/features/assets/pages/assets-page.component.html @@ -9,9 +9,10 @@ +
- +
diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-page.component.html index e2c2855c5..e609a3f72 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.html +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.html @@ -9,16 +9,18 @@ + +
- +
- diff --git a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html index ef54a71d7..d904a25b9 100644 --- a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html +++ b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html @@ -10,9 +10,11 @@ -
+
+ +
- +
diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html index 66958ec70..7003842af 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html +++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html @@ -11,12 +11,15 @@
+ + +
- +
diff --git a/src/Squidex/app/shell/pages/home/home-page.component.html b/src/Squidex/app/shell/pages/home/home-page.component.html index 7713e2003..8104b473e 100644 --- a/src/Squidex/app/shell/pages/home/home-page.component.html +++ b/src/Squidex/app/shell/pages/home/home-page.component.html @@ -4,7 +4,7 @@
-
@@ -14,16 +14,11 @@ The login button will open a new popup. Once you are logged in successfull we will redirect you to the squidex management portal.
+ +
-
-
-
- -
-
- Proudly made by Qaisar Ahmad & Sebastian Stehle, 2016-2017 -
-
+
+ Proudly made by Qaisar Ahmad & Sebastian Stehle, 2016-2017
\ No newline at end of file diff --git a/src/Squidex/app/shell/pages/home/home-page.component.scss b/src/Squidex/app/shell/pages/home/home-page.component.scss index 2473fbf0a..e89e4c4a1 100644 --- a/src/Squidex/app/shell/pages/home/home-page.component.scss +++ b/src/Squidex/app/shell/pages/home/home-page.component.scss @@ -3,69 +3,56 @@ $color-footer: #f7f8fa; -.card-footer { - background: $color-footer; - padding-left: 5rem; - padding-top: 1.5rem; - padding-bottom: 1.5rem; - position: relative; - border-top: 0; - font-size: .8rem; -} +.card { + & { + position: relative; + } -.card-block { - padding: 4rem 1rem; -} + &-block { + padding: 4rem 1rem 3rem; + } -.icon-info { - @include absolute(2rem, auto, auto, 2rem); - color: $color-text-decent; - font-weight: normal; - font-size: 1.4rem; + &-footer { + background: $color-footer; + padding-left: 8rem; + padding-top: 1.5rem; + padding-bottom: 1.5rem; + position: relative; + border-top: 0; + font-size: .8rem; + } } -.logo { - height: 1.4rem; - margin-top: 1rem; - margin-bottom: 1rem; +.login-arms { + @include absolute(auto, auto, -60px, -120px); + height: 200px; + width: 200px; + border: 0; + background: url('data:image/png;base64,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'); } -.login { - &-area { - max-width: 40rem; - margin: 4rem auto 0; - padding: 0 1rem; - } - - &-button { - & { - @include border-radius(1.5rem); - cursor: pointer; - border: 0; - margin-top: 4rem; - height: 3rem; - padding-left: 1.4rem; - padding-right: 1.4rem; - text-transform: uppercase; - } - } - - &-icon { - text-align: center; - } +.login-area { + max-width: 30rem; + margin: 1rem auto 0; + padding: 0 1rem; +} - &-button-text { - vertical-align: middle; - } +.login-button { + margin-top: 2rem; +} - &-hint { - font-style: italic; - } +.icon-info { + @include absolute(2rem, auto, auto, 6rem); + color: $color-text-decent; + font-weight: normal; + font-size: 1.4rem; } .proudly-made { - line-height: 3.4rem; - font-size: .8rem; - font-style: normal; color: $color-text-decent; + line-height: 1.5rem; + text-align: center; + font-size: .9rem; + font-style: normal; + margin: 2rem 6rem; } \ No newline at end of file diff --git a/src/Squidex/app/theme/_bootstrap.scss b/src/Squidex/app/theme/_bootstrap.scss index 3ee261c18..63f248b3d 100644 --- a/src/Squidex/app/theme/_bootstrap.scss +++ b/src/Squidex/app/theme/_bootstrap.scss @@ -3,10 +3,6 @@ @import './../../node_modules/bootstrap/scss/mixins/_buttons'; -body { - background: $color-background; -} - .col-right { text-align: right; } @@ -168,6 +164,20 @@ body { } } +.icon { + &-github { + color: $color-extern-github-icon; + } + + &-google { + color: $color-extern-google-icon; + } + + &-microsoft { + color: $color-extern-microsoft-icon; + } +} + .btn { &-github { @include button-variant($color-dark-foreground, $color-extern-github, $color-extern-github); diff --git a/src/Squidex/app/theme/_common.scss b/src/Squidex/app/theme/_common.scss index 5f45eb60d..49cb100be 100644 --- a/src/Squidex/app/theme/_common.scss +++ b/src/Squidex/app/theme/_common.scss @@ -2,9 +2,15 @@ @import '_vars'; body { - background: $color-background; - padding-top: $size-navbar-height; - padding-left: 0; + & { + background: $color-background; + padding-top: $size-navbar-height; + padding-left: 0; + } + + &.white { + background: $color-dark-foreground; + } } h1 { diff --git a/src/Squidex/app/theme/_mixins.scss b/src/Squidex/app/theme/_mixins.scss index fda34d516..5cac51017 100644 --- a/src/Squidex/app/theme/_mixins.scss +++ b/src/Squidex/app/theme/_mixins.scss @@ -1,3 +1,15 @@ +@mixin build-icon($color) { + & { + @include transition(color .3s ease); + color: $color; + } + + &:hover, + &:focus { + color: darken($color, 10%); + } +} + @mixin clearfix() { &::after { content: ''; diff --git a/src/Squidex/app/theme/_static.scss b/src/Squidex/app/theme/_static.scss index 242cc4ac5..02d3487c3 100644 --- a/src/Squidex/app/theme/_static.scss +++ b/src/Squidex/app/theme/_static.scss @@ -87,14 +87,26 @@ noscript { } } - .icon-microsoft { - &::before { - color: $color-dark-foreground; + .btn-external { + & { + text-align: left; + text-transform: none; + line-height: 1.8rem; + } + + &:hover, + &:focus { + .icon-external { + color: $color-dark-foreground; + } } } - .btn-external { - text-align: left; + .icon-external { + margin-right: .5rem; + font-size: 1.3rem; + font-weight: normal; + vertical-align: middle; } .form-group { diff --git a/src/Squidex/app/theme/_vars.scss b/src/Squidex/app/theme/_vars.scss index 19793fd42..968d6952a 100644 --- a/src/Squidex/app/theme/_vars.scss +++ b/src/Squidex/app/theme/_vars.scss @@ -13,8 +13,12 @@ $color-input: #dbe4eb; $color-disabled: #eef1f4; $color-extern-google: #d34836; -$color-extern-microsoft: #0063b1; -$color-extern-github: #3c4146; +$color-extern-google-icon: #b02c1b; +$color-extern-microsoft: #004185; +$color-extern-microsoft-icon: #1b67b7; +$color-extern-github: #191919; +$color-extern-github-icon: #4a4a4a; + $color-theme-blue: #438cef; $color-theme-blue-dark: #3d7dd5;