From fc7e13e7bbbdbd0503094a5cb7318d6a02f1c157 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Sun, 15 Jan 2017 15:44:56 +0100 Subject: [PATCH 1/3] Add styling with base16. Solarized-dark for now. --- index.html | 1 + src/App.scss | 39 +------------------ src/App.vue | 4 +- src/components/attachment/attachment.vue | 9 ++--- src/components/conversation/conversation.vue | 4 +- .../favorite_button/favorite_button.vue | 5 +-- .../friends_timeline/friends_timeline.vue | 4 +- src/components/login_form/login_form.vue | 4 +- src/components/mentions/mentions.vue | 4 +- src/components/nav_panel/nav_panel.vue | 4 +- .../notifications/notifications.vue | 4 +- .../public_and_external_timeline.vue | 4 +- .../public_timeline/public_timeline.vue | 4 +- src/components/status/status.vue | 4 +- src/components/timeline/timeline.vue | 17 +++++++- .../user_card_content/user_card_content.vue | 2 +- src/components/user_panel/user_panel.vue | 2 +- static/css/theme.css | 38 ++++++++++++++++++ 18 files changed, 83 insertions(+), 70 deletions(-) create mode 100644 static/css/theme.css diff --git a/index.html b/index.html index ec831c415f..6224224f7e 100644 --- a/index.html +++ b/index.html @@ -5,6 +5,7 @@ Pleroma +
diff --git a/src/App.scss b/src/App.scss index ced2d06990..377c629731 100644 --- a/src/App.scss +++ b/src/App.scss @@ -1,6 +1,5 @@ @import './_variables.scss'; #app { - background-color: $main-color; background-size: cover; background-attachment: fixed; background-repeat: no-repeat; @@ -28,7 +27,6 @@ body { a { text-decoration: none; - color: $main-color; } .container { @@ -55,7 +53,6 @@ a { } nav { - background: black; width: 100%; align-items: center; position: fixed; @@ -72,27 +69,6 @@ main-router { flex: 1; } -.status:hover { - background-color: $darkened-background; -} - -.new-status-notification { - font-size: 1.1em; - background-color: $darkened-background; - border-bottom-color: darken($darkened-background, 5%); - border-bottom-style: solid; - border-bottom-width: 1px; - - &:hover { - background-color: darken($darkened-background, 5%); - } - - p { - margin: 0px; - padding: 10px; - } -} - .status.compact { color: rgba(0, 0, 0, 0.42); font-weight: 300; @@ -108,7 +84,6 @@ main-router { .panel { display: flex; flex-direction: column; - background-color: $main-background; margin: 0.5em; border-radius: 0.5em; @@ -117,7 +92,6 @@ main-router { .panel-heading { border-radius: 0.5em 0.5em 0 0; background-size: cover; - background-color: bisque; padding-top: 0.3em; padding-bottom: 0.3em; text-align: center; @@ -125,12 +99,12 @@ main-router { } .panel-footer { - background-color: bisque; border-radius: 0 0 0.5em 0.5em; } .panel-body > p { - margin: 1em; + padding: 1em; + margin: 0; } @@ -176,10 +150,6 @@ main-router { font-weight: lighter; margin: 0; } - - span { - color: $main-color; - } } .fa { @@ -200,17 +170,12 @@ status-text-container { display: block; } -attention { - color: $main-color; -} - .status-el { line-height: 18px; .notify { .avatar { border-width: 3px; - border-color: $main-color; border-style: solid; } } diff --git a/src/App.vue b/src/App.vue index 2cd6d07939..18a8ad150f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@