nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6631 from svbergerem/white-color-theme

Browse source 
White color theme
This commit is contained in:
Jonne Haß 2016-01-12 16:35:04 +01:00
commit aa6e4ec0d2
14 changed files with 68 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -96,6 +96,7 @@ Contributions are very welcome, the hard work is done!
* Add permalink icon to stream elements [#6457](https://github.com/diaspora/diaspora/pull/6457) * Add permalink icon to stream elements [#6457](https://github.com/diaspora/diaspora/pull/6457)
* Move reshare count to interactions for stream elements [#6487](https://github.com/diaspora/diaspora/pull/6487) * Move reshare count to interactions for stream elements [#6487](https://github.com/diaspora/diaspora/pull/6487)
* Posts of ignored users are now visible on that profile page [#6617](https://github.com/diaspora/diaspora/pull/6617) * Posts of ignored users are now visible on that profile page [#6617](https://github.com/diaspora/diaspora/pull/6617)
* Add white color theme [#6631](https://github.com/diaspora/diaspora/pull/6631)
# 0.5.7.0 # 0.5.7.0

6
app/assets/stylesheets/color-variables.scss
View file

@ -23,8 +23,8 @@ $light-green: lighten($green, 20%);
$red: #a80000; $red: #a80000;
$blue: #3f8fba; $blue: #3f8fba;
$sidebars-background: #f0f0f0; $sidebars-background: #f0f0f0 !default;
$sidebars-sub-background: darken($sidebars-background, 12%); $sidebars-sub-background: darken($sidebars-background, 12%) !default;
$left-navbar-drawer-background: darken($sidebars-background, 6%); $left-navbar-drawer-background: darken($sidebars-background, 6%);
$card-shadow: 0 1px 2px 0 rgba(0, 0, 0, .16), 0 2px 10px 0 rgba(0, 0, 0, .12); $card-shadow: 0 1px 2px 0 rgba(0, 0, 0, .16), 0 2px 10px 0 rgba(0, 0, 0, .12) !default;

2
app/assets/stylesheets/color_themes/_color_theme_override.scss
View file

@ -24,7 +24,7 @@ body {
} }
} }
#left-navbar .hoverable:hover { background-color: $main-color-essence; } .left-navbar .hoverable:hover { background-color: $main-color-essence; }
.poll_form .progress .bar { background-color: $main-color-dark; } .poll_form .progress .bar { background-color: $main-color-dark; }

26
app/assets/stylesheets/color_themes/_color_theme_override_origwhite.scss Normal file
View file

@ -0,0 +1,26 @@
body {
#main_stream .stream_element {
border: 0;
border-bottom: 1px solid $border-grey;
margin-bottom: 10px;
}
.profile_header > div {
border-bottom: 1px solid $border-grey;
}
.left-navbar .hoverable { border-bottom: 0; }
.profile-sidebar,
.left-navbar-fixed-background,
&.page-tags .left-navbar-fixed-background,
.left-navbar {
border-right: 1px solid $border-grey;
}
.right-sidebar-fixed-background,
.right-sidebar-fixed-background,
.rightbar {
border-left: 1px solid $sidebars-background;
}
}

14
app/assets/stylesheets/color_themes/original_white/_style.scss Normal file
View file

@ -0,0 +1,14 @@
// Main color(s)
$main-color: #585858;
$background: #fff;
// Shades
$main-color-dark: darken($main-color, 15%);
// Variables
$header-background-color: $main-color-dark;
$sidebars-background: $background;
$sidebars-sub-background: $background;
$card-shadow: none;
@import 'color_themes/color_theme_override_origwhite';

3
app/assets/stylesheets/color_themes/original_white/desktop.scss Normal file
View file

@ -0,0 +1,3 @@
@import 'color-variables';
@import 'style';
@import 'application';

3
app/assets/stylesheets/color_themes/original_white/mobile.scss Normal file
View file

@ -0,0 +1,3 @@
@import 'color-variables';
@import 'style';
@import 'mobile/mobile';

6
app/assets/stylesheets/navbar_left.scss
View file

@ -1,18 +1,18 @@
/* Fixed backgrounds are a common practice to avoid height issues */ /* Fixed backgrounds are a common practice to avoid height issues */
#left-navbar-fixed-sub-background { .left-navbar-fixed-sub-background {
background: $sidebars-sub-background; background: $sidebars-sub-background;
position: fixed; position: fixed;
height: 100%; height: 100%;
} }
#left-navbar-fixed-background { .left-navbar-fixed-background {
background: $sidebars-background; background: $sidebars-background;
border-right: 1px solid $light-grey; border-right: 1px solid $light-grey;
position: fixed; position: fixed;
height: 100%; height: 100%;
} }
#left-navbar { .left-navbar {
background: $sidebars-background; background: $sidebars-background;
border-right: 1px solid $light-grey; border-right: 1px solid $light-grey;
a { a {

6
app/assets/stylesheets/navbar_right.scss
View file

@ -1,11 +1,11 @@
#right-sidebar-fixed-background { .right-sidebar-fixed-background {
height: 100%; height: 100%;
border-left: 1px solid $light-grey; border-left: 1px solid $light-grey;
background: $sidebars-background; background: $sidebars-background;
position: fixed; position: fixed;
right: 0; right: 0;
} }
#right-sidebar-fixed-sub-background { .right-sidebar-fixed-sub-background {
height: 100%; height: 100%;
background: $sidebars-sub-background; background: $sidebars-sub-background;
position: fixed; position: fixed;
@ -89,7 +89,7 @@
} }
@media screen and (min-width: 1200px) { @media screen and (min-width: 1200px) {
#right-sidebar-fixed-background { .right-sidebar-fixed-background {
margin-right: 8.33333%; /* Only for LARGE screens, same as lg-offset-1 class, BS3 does not provide right side offsetting */ margin-right: 8.33333%; /* Only for LARGE screens, same as lg-offset-1 class, BS3 does not provide right side offsetting */
} }
} }

2
app/assets/stylesheets/tag.scss
View file

@ -24,8 +24,8 @@ h1.tag {
} }
.page-tags { .page-tags {
background-color: $sidebars-background; background-color: $sidebars-background;
.left-navbar-fixed-background { border-right: 0; }
#tags_show { #tags_show {
#left-navbar-fixed-background { border-right: none; }
.col-md-3 { .col-md-3 {
h4 { margin: 25px 0 15px; } h4 { margin: 25px 0 15px; }
.side_stream #people_stream { .side_stream #people_stream {

2
app/views/people/show.html.haml
View file

@ -14,7 +14,7 @@
.container-fluid#profile_container .container-fluid#profile_container
.row .row
.col-md-3 .col-md-3
#profile .profile-sidebar#profile
-# here be JS -# here be JS
.col-md-9 .col-md-9

10
app/views/streams/main_stream.html.haml
View file

@ -22,9 +22,9 @@
%div.container-fluid %div.container-fluid
.row .row
#left-navbar-fixed-sub-background.col-lg-1.visible-lg .left-navbar-fixed-sub-background.col-lg-1.visible-lg
#left-navbar-fixed-background.col-lg-offset-1.col-lg-2.col-md-3.hidden-sm.hidden-xs .left-navbar-fixed-background.col-lg-offset-1.col-lg-2.col-md-3.hidden-sm.hidden-xs
#left-navbar.col-lg-offset-1.col-lg-2.col-md-3 .left-navbar.col-lg-offset-1.col-lg-2.col-md-3
#home_user_badge #home_user_badge
= owner_image_link = owner_image_link
%h4 %h4
@ -48,8 +48,8 @@
#aspect_stream_container.stream_container #aspect_stream_container.stream_container
= render 'aspects/aspect_stream', stream: @stream = render 'aspects/aspect_stream', stream: @stream
#right-sidebar-fixed-sub-background.col-lg-3.visible-lg .right-sidebar-fixed-sub-background.col-lg-3.visible-lg
#right-sidebar-fixed-background.col-md-3.col-lg-2.hidden-sm.hidden-xs .right-sidebar-fixed-background.col-md-3.col-lg-2.hidden-sm.hidden-xs
.col-md-3.col-lg-2.hidden-xs.hidden-sm.rightbar .col-md-3.col-lg-2.hidden-xs.hidden-sm.rightbar
#selected_aspect_contacts.section #selected_aspect_contacts.section
.title .title

6
app/views/tags/show.haml
View file

@ -10,8 +10,8 @@
.container-fluid#tags_show .container-fluid#tags_show
.row .row
.col-lg-1.visible-lg#left-navbar-fixed-sub-background .col-lg-1.visible-lg.left-navbar-fixed-sub-background
.col-lg-offset-1.col-lg-3.col-md-4.hidden-sm.hidden-xs#left-navbar-fixed-background .col-lg-offset-1.col-lg-3.col-md-4.hidden-sm.hidden-xs.left-navbar-fixed-background
.col-lg-offset-1.col-lg-3.col-md-4 .col-lg-offset-1.col-lg-3.col-md-4
%h4 %h4
= t('.tagged_people', count: @stream.tagged_people_count, tag: @stream.display_tag_name) = t('.tagged_people', count: @stream.tagged_people_count, tag: @stream.display_tag_name)
@ -34,7 +34,7 @@
%span.loader.hidden %span.loader.hidden
.spinner .spinner
.col-lg-1.visible-lg#right-sidebar-fixed-sub-background .col-lg-1.visible-lg.right-sidebar-fixed-sub-background
%a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"} %a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
⇧ ⇧

1
config/color_themes.yml
View file

@ -1,5 +1,6 @@
available: available:
original: "Original Dark" original: "Original Dark"
original_white: "Original White Background"
dark_green: "Dark Green" dark_green: "Dark Green"
magenta: "Magenta" magenta: "Magenta"
egyptian_blue: "Egyptian Blue" egyptian_blue: "Egyptian Blue"